Ohio-HYF il y a 2 ans
Parent
commit
800166e3c4
74 fichiers modifiés avec 548 ajouts et 96 suppressions
  1. 13 1
      App.vue
  2. 4 2
      components/htz-image-upload/htz-image-upload.vue
  3. 2 2
      components/mys_navBar/mysNavBar.vue
  4. 2 2
      components/request.js
  5. 2 2
      components/requesttoken111.js
  6. 14 11
      pages/mycenter/myincome.vue
  7. 8 3
      pages/mycenter/myincome/applywithdraw.vue
  8. 86 4
      pages/mycenter/myinformation/bindaccount.vue
  9. 84 2
      pages/tasksquare/bindinfo.vue
  10. 8 1
      pages/tasksquare/tasksquare.vue
  11. 14 4
      pages/workspace/datarecord.vue
  12. 25 17
      pages/workspace/deliveryInformation.vue
  13. 1 0
      pages/workspace/linkrecord.vue
  14. 1 0
      pages/workspace/scriptrecord.vue
  15. 21 4
      pages/workspace/sketchrecord.vue
  16. 1 1
      pages/workspace/taskdetail.vue
  17. 195 16
      pages/workspace/uploaddata.vue
  18. 2 2
      pages/workspace/uploadlink.vue
  19. 19 9
      pages/workspace/uploadscript.vue
  20. 46 13
      pages/workspace/uploadsketch.vue
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/htz-image-upload/htz-image-upload.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/mosowe-canvas-image/mosowe-canvas-image.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/mys-tip_1.0.01/a_tip/aTip.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/mys_navBar/mysNavBar.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/z-swiper/index.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/userinfo.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/message.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/mycenter.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myincome.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myincome/applywithdraw.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/addlocation.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/bindaccount.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/myaccount.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/mybank.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/myinformation.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/mylocation.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/personinfo.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/mytask/mytask.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/bindinfo.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/cooperation.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/guide.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/information.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/search.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/specialTask/information.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/specialTask/specialTaskDetail.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/success.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/taskdetail.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/tasksquare.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/test/test.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/applyInformation.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/datarecord.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/deliveryInformation.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/editaddress.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/linkrecord.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/scriptrecord.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/sketchrecord.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/taskdetail.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/uploaddata.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/uploadlink.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/uploadscript.js.map
  64. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/uploadsketch.js.map
  65. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/workspace.js.map
  66. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  67. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  68. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  69. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  70. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  71. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  72. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  73. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map
  74. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map

+ 13 - 1
App.vue

@@ -32,7 +32,7 @@
 		font-family: uniicons;
 		src: url("/static/uni.ttf");
 	}
-
+	
 	/* #endif */
 	.home {
 		width: 97%;
@@ -40,6 +40,18 @@
 		/* padding-top: 23%; */
 	}
 
+	/deep/ textarea{
+		width: auto;
+	}
+	
+	p {
+		word-break: break-all;
+	}
+
+	text {
+		word-break: break-all;
+	}
+
 	/deep/.uni-forms-item__inner {
 		padding-bottom: 0rpx !important;
 		margin-bottom: 30rpx !important;

+ 4 - 2
components/htz-image-upload/htz-image-upload.vue

@@ -573,8 +573,10 @@
 	}
 
 	.htz-image-upload-Item {
-		width: 160rpx;
-		height: 160rpx;
+		/* width: 160rpx;
+		height: 160rpx; */
+		width: 205rpx;
+		height: 205rpx;
 		margin: 13rpx;
 		border-radius: 10rpx;
 		position: relative;

+ 2 - 2
components/mys_navBar/mysNavBar.vue

@@ -356,7 +356,7 @@
 		position: absolute;
 		width: 750upx;
 		height: 88upx;
-		z-index: 10;
+		z-index: 1010;
 		top: 0;
 		background-color: transparent;
 		/* #ifdef MP */
@@ -381,7 +381,7 @@
 		flex-direction: row;
 		background-color: transparent;
 		position: absolute;
-		z-index: 10;
+		z-index: 1010;
 		top: 0;
 	}
 

+ 2 - 2
components/request.js

@@ -2,9 +2,9 @@
 
 export default {
 	config: {
-		// baseUrl: "http://localhost:8200",	//本地开发
+		baseUrl: "http://localhost:8200",	//本地开发
 		// baseUrl: "http://172.27.185.236:8200",	//本地开发	
-		baseUrl: "https://talent.younggee.com:8201",  //默认的公共域名
+		// baseUrl: "https://talent.younggee.com:8201",  //默认的公共域名
 		},
 	// 获取用户 token
 	// let userToken = uni.getStorageSync('userInfo')

+ 2 - 2
components/requesttoken111.js

@@ -2,9 +2,9 @@
 //通用uni-app网络请求
 export default {
 	config: {
-		// baseUrl: "http://localhost:8200", //本地开发
+		baseUrl: "http://localhost:8200", //本地开发
 		// baseUrl: "http://172.27.185.236:8200",	//本地开发		
-		baseUrl: "https://talent.younggee.com:8201",  //默认的公共域名
+		// baseUrl: "https://talent.younggee.com:8201",  //默认的公共域名
 
 		header: {
 			'Content-Type': 'application/json;charset=UTF-8', //默认get方式

+ 14 - 11
pages/mycenter/myincome.vue

@@ -32,7 +32,7 @@
 							<view>
 								<p>任务ID:{{item.task_id}}</p>
 								<p>{{item.project_name}}</p>
-								<p>商品价值:{{item.product_price}}元</p>
+								<p>商品价值:{{item.show_product_price}}元</p>
 								<p>粉丝量:{{item.RecruitStrategy.show_followers_low}}-{{item.RecruitStrategy.show_followers_up}}
 								</p>
 								<p>稿费:{{item.RecruitStrategy.show_fee_form}} {{item.show_task_reward}}</p>
@@ -53,7 +53,7 @@
 						<view>
 							<p>任务ID:{{item.task_id}}</p>
 							<p>{{item.project_name}}</p>
-							<p>商品价值:{{item.product_price}}元</p>
+							<p>商品价值:{{item.show_product_price}}元</p>
 							<p>粉丝量:{{item.RecruitStrategy.show_followers_low}}-{{item.RecruitStrategy.show_followers_up}}
 							</p>
 							<p>稿费:{{item.RecruitStrategy.show_fee_form}} {{item.show_task_reward}}</p>
@@ -73,7 +73,7 @@
 						<view>
 							<p>任务ID:{{item.task_id}}</p>
 							<p>{{item.project_name}}</p>
-							<p>商品价值:{{item.product_price}}元</p>
+							<p>商品价值:{{item.show_product_price}}元</p>
 							<p>粉丝量:{{item.RecruitStrategy.show_followers_low}}-{{item.RecruitStrategy.show_followers_up}}
 							</p>
 							<p>稿费:{{item.RecruitStrategy.show_fee_form}} {{item.show_task_reward}}</p>
@@ -327,6 +327,7 @@
 						if (res.data.data.can_withdraw_task_info_list != null) {
 							this.list1 = res.data.data.can_withdraw_task_info_list
 							for (let i = 0; i < this.list1.length; i++) {
+								this.list1[i].show_product_price = money(this.list1[i].product_price)
 								this.list1[i].show_task_reward = money(this.list1[i].task_reward)
 								this.list1[i].show_settle_amount = money(this.list1[i].settle_amount)
 								this.list1[i].RecruitStrategy.show_followers_low = fansview(this.list1[i]
@@ -349,6 +350,7 @@
 						if (res.data.data.withdrawed_task_info_list != null) {
 							this.list2 = res.data.data.withdrawed_task_info_list
 							for (let i = 0; i < this.list2.length; i++) {
+								this.list2[i].show_product_price = money(this.list2[i].product_price)
 								this.list2[i].show_task_reward = money(this.list2[i].task_reward)
 								this.list2[i].show_settle_amount = money(this.list2[i].settle_amount)
 								this.list2[i].RecruitStrategy.show_followers_low = fansview(this.list2[i]
@@ -371,6 +373,7 @@
 						if (res.data.data.withdrawing_task_info_list != null) {
 							this.list3 = res.data.data.withdrawing_task_info_list
 							for (let i = 0; i < this.list3.length; i++) {
+								this.list3[i].show_product_price = money(this.list3[i].product_price)
 								this.list3[i].show_task_reward = money(this.list3[i].task_reward)
 								this.list3[i].show_settle_amount = money(this.list3[i].settle_amount)
 								this.list3[i].RecruitStrategy.show_followers_low = fansview(this.list3[i]
@@ -452,7 +455,7 @@
 	.menu {
 		display: flex;
 		align-items: center;
-		justify-content: space-around;
+		justify-content: space-between;
 	}
 
 	.menu-item p {
@@ -513,12 +516,11 @@
 	}
 
 	.show-income3 {
-		margin: 0 3%;
+		margin: 0 50rpx;
 	}
 
 	.show-income3 p {
 		margin-top: 50rpx;
-		margin-left: 20rpx;
 	}
 
 	.income-list {
@@ -529,8 +531,6 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-
-		margin-right: 20rpx;
 	}
 
 	.income-list-cell-left {
@@ -542,6 +542,7 @@
 	.income-list-cell-right p {
 		color: #F0D232;
 		font-size: 35rpx;
+		margin-right: 50rpx;
 	}
 
 	// .income-list-cell2 {
@@ -549,6 +550,7 @@
 	// }
 
 	.income-list-checkbox {
+		width: 50rpx;
 		transform: scale(0.7)
 	}
 
@@ -563,7 +565,7 @@
 		justify-content: space-between;
 		align-items: center;
 
-		padding: 2% 5%;
+		padding: 2% 50rpx;
 		position: fixed;
 		width: 90%;
 		bottom: 0rpx;
@@ -575,15 +577,16 @@
 
 	.all-check-box {
 		display: flex;
+		margin-left: -20rpx;
 	}
 
 	.right-btn {
-		width: 200rpx;
+		width: 150rpx;
 		text-align: center;
 		color: #000;
 		background-color: #F0D232;
 		border-radius: 15rpx;
 		font-size: 32rpx;
-		line-height: 200%;
+		line-height: 180%;
 	}
 </style>

+ 8 - 3
pages/mycenter/myincome/applywithdraw.vue

@@ -13,7 +13,8 @@
 						<p>{{formData.bank_card_number}}</p>
 					</view>
 					<view style="display: flex;align-items: center;justify-content: center;" @click="toModifyBank()">
-						<p>前往修改/绑定</p>
+						<p v-if="!binded">前往绑定</p>
+						<p v-else>前往修改</p>
 						<image class="show-body1-icon" :src="picture.icon_right"></image>
 					</view>
 				</view>
@@ -63,6 +64,7 @@
 		},
 		data() {
 			return {
+				binded: false,
 				navH: getApp().globalData.navHeight,
 				picture: {
 					icon_person: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-person.png',
@@ -142,7 +144,10 @@
 					.then(res => {
 						console.log(res)
 						if (res.data.data != null) {
+							this.binded = true
 							this.formData = res.data.data
+						}else{
+							this.binded = false
 						}
 					})
 			},
@@ -151,7 +156,7 @@
 						task_id_list: this.taskIdList,
 						total_amount: this.totalAmount,
 						real_amount: this.realAmount,
-						bank_type: this.bankType,
+						bank_type: 2,
 					})
 					.then(res => {
 						console.log(res)
@@ -208,7 +213,7 @@
 
 
 	.tips {
-		margin: 30rpx;
+		margin: 30rpx 0;
 		padding: 30rpx 20rpx;
 		background-color: #eaeaea;
 		border-radius: 15rpx;

+ 86 - 4
pages/mycenter/myinformation/bindaccount.vue

@@ -14,16 +14,23 @@
 					<view>
 						<uni-forms :modelValue="formData" ref="form" validate-trigger="bind" err-show-type="undertext">
 							<uni-forms-item name="name" required label="昵称">
-								<uni-easyinput type="text" v-model="formData.platform_nickname" placeholder="请填写账号昵称">
+								<uni-easyinput type="text" v-model="formData.platform_nickname" style="width:400rpx" placeholder="请填写账号昵称">
 								</uni-easyinput>
 							</uni-forms-item>
 							<uni-forms-item name="numberfans" required label="粉丝数">
-								<uni-easyinput type="number" v-model="formData.fans_count" placeholder="请填写粉丝数量">
+								<uni-easyinput type="number" v-model="fansCount" placeholder="请填写粉丝数量"
+									v-if="fansCountInfo === 1" style="width:400rpx" @input="onInput1">
 								</uni-easyinput>
+								<uni-easyinput type="digit" v-model="fansCount" placeholder="请填写粉丝数量" v-else
+									style="width:400rpx" @input="onInput">
+								</uni-easyinput>
+								<picker @change="bindPickerChange" :value="index" :range="fansRange" range-key="label">
+									<view>{{ fansLabel }}</view>
+								</picker>
 							</uni-forms-item>
 							<uni-forms-item name="home_link" required label=" " label-width='10'>
 								<uni-easyinput class="home-link" type="text" v-model="formData.home_page_url"
-									placeholder="请填写个人主页链接">
+									style="width:650rpx" placeholder="请填写个人主页链接">
 								</uni-easyinput>
 							</uni-forms-item>
 							<view style="margin-top: 40rpx;">
@@ -32,7 +39,6 @@
 										v-model="imageData" @chooseSuccess="ceshiChooseSuccess">
 									</htz-image-upload>
 								</uni-forms-item>
-
 							</view>
 						</uni-forms>
 						<view class="heng-line"></view>
@@ -72,6 +78,25 @@
 					fans_count: '',
 					home_page_url: '',
 				},
+
+				index: 0,
+				fansLabel: "个",
+				fansCount: 0,
+				fansCountInfo: 1,
+				fansRange: [{
+						value: 1,
+						label: '个'
+					},
+					{
+						value: 10000,
+						label: '万'
+					},
+					{
+						value: 100000000,
+						label: '亿'
+					}
+				],
+
 				mysNavConfig: {
 					/* 开启单页显示首页图标 */
 					isHome: true,
@@ -147,6 +172,24 @@
 									this.formData.fans_count = this.account[i].fans_count
 									this.formData.home_page_url = this.account[i].home_page_url
 									this.imageData.push(this.account[i].home_page_capture_url);
+
+									if (this.formData.fans_count >= 100000000) {
+										this.index = 2
+										this.fansCountInfo = this.fansRange[this.index].value;			
+										this.fansLabel = this.fansRange[this.index].label;	
+										this.fansCount = (this.formData.fans_count / 100000000).toFixed(1)
+									} else if (this.formData.fans_count >= 10000) {
+										console.log(this.formData.fans_count)
+										this.index = 1
+										this.fansCountInfo = this.fansRange[this.index].value;			
+										this.fansLabel = this.fansRange[this.index].label;		
+										this.fansCount = (this.formData.fans_count / 10000).toFixed(1)
+									} else {
+										this.index = 0
+										this.fansCountInfo = this.fansRange[this.index].value;			
+										this.fansLabel = this.fansRange[this.index].label;	
+										this.fansCount = this.formData.fans_count
+									}
 								}
 							}
 						}
@@ -166,6 +209,15 @@
 					})
 					return
 				}
+				let fans
+				this.formData.fans_count = this.fansCount * this.fansCountInfo
+				if (parseInt(this.formData.fans_count) === 0) {
+					uni.showToast({
+						title: '请填写粉丝量数量',
+						icon: 'none'
+					})
+					return
+				}
 				let that = this
 				uni.showModal({
 					title: '提示',
@@ -241,6 +293,13 @@
 			exit() {
 				uni.navigateBack()
 			},
+			// 粉丝量量级选择
+			bindPickerChange: function(e) {
+				this.index = e.detail.value;
+				this.fansLabel = this.fansRange[this.index].label
+				this.fansCountInfo = this.fansRange[this.index].value
+				console.log(this.fansCountInfo, this.fansLabel)
+			},
 			ceshiChooseSuccess(tempFilePaths, e) { //选择图片返回
 				console.log('ceshiChooseSuccess', tempFilePaths, e);
 				if (e == 0) {
@@ -327,6 +386,23 @@
 					return v.toString(16);
 				});
 			},
+			onInput(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.fansCount = e
+				})
+			},
+			onInput1(e) {
+				console.log(e)
+				e = e.replace(/\D/g, '')
+				// e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.fansCount = e
+				})
+			}
 		},
 	}
 </script>
@@ -352,6 +428,12 @@
 		padding: 5px 0;
 		/* height: 36px; */
 	}
+
+	/deep/ .uni-forms-item__content {
+		display: flex !important;
+		align-items: center !important;
+		justify-content: space-between;
+	}
 </style>
 <style lang="scss" scoped>
 	.card {

+ 84 - 2
pages/tasksquare/bindinfo.vue

@@ -80,11 +80,18 @@
 						</uni-easyinput>
 					</uni-forms-item>
 					<uni-forms-item name="numberfans" required label="粉丝数">
-						<uni-easyinput type="number" v-model="formData.fans_count" placeholder="请填写粉丝数量">
+						<uni-easyinput type="number" v-model="fansCount" placeholder="请填写粉丝数量"
+							v-if="fansCountInfo === 1" @input="onInput1">
 						</uni-easyinput>
+						<uni-easyinput type="digit" v-model="fansCount" placeholder="请填写粉丝数量" v-else
+							 @input="onInput">
+						</uni-easyinput>
+						<picker @change="bindPickerChange" :value="index3" :range="fansRange" range-key="label">
+							<view>{{ fansLabel }}</view>
+						</picker>
 					</uni-forms-item>
 					<uni-forms-item name="home_link" required label=" " label-width='10'>
-						<uni-easyinput class="home-link" type="text" v-model="formData.home_page_url"
+						<uni-easyinput class="home-link" type="text" v-model="formData.home_page_url" style="width:650rpx"
 							placeholder="请填写个人主页链接">
 						</uni-easyinput>
 					</uni-forms-item>
@@ -155,6 +162,25 @@
 					fans_count: '',
 					home_page_url: '',
 				},
+				
+				index3: 0,
+				fansLabel: "个",
+				fansCount: 0,
+				fansCountInfo: 1,
+				fansRange: [{
+						value: 1,
+						label: '个'
+					},
+					{
+						value: 10000,
+						label: '万'
+					},
+					{
+						value: 100000000,
+						label: '亿'
+					}
+				],
+
 				index: 0,
 				index1: 0,
 				Xage: '请选择',
@@ -335,6 +361,24 @@
 										this.formData.fans_count = this.account[i].fans_count
 										this.formData.home_page_url = this.account[i].home_page_url
 										this.imageData.push(this.account[i].home_page_capture_url);
+										
+										if (this.formData.fans_count >= 100000000) {
+											this.index3 = 2
+											this.fansCountInfo = this.fansRange[this.index3].value;			
+											this.fansLabel = this.fansRange[this.index3].label;	
+											this.fansCount = (this.formData.fans_count / 100000000).toFixed(1)
+										} else if (this.formData.fans_count >= 10000) {
+											console.log(this.formData.fans_count)
+											this.index3 = 1
+											this.fansCountInfo = this.fansRange[this.index3].value;			
+											this.fansLabel = this.fansRange[this.index3].label;		
+											this.fansCount = (this.formData.fans_count / 10000).toFixed(1)
+										} else {
+											this.index3 = 0
+											this.fansCountInfo = this.fansRange[this.index3].value;			
+											this.fansLabel = this.fansRange[this.index3].label;	
+											this.fansCount = this.formData.fans_count
+										}
 									}
 								}
 							}
@@ -386,6 +430,15 @@
 			 */
 			submitForm(form) {
 				// console.log(this.formData);
+				let fans
+				this.formData.fans_count = this.fansCount * this.fansCountInfo
+				if (parseInt(this.formData.fans_count) === 0) {
+					uni.showToast({
+						title: '请填写粉丝量数量',
+						icon: 'none'
+					})
+					return
+				}
 				this.$refs.form.validate().then(res => {
 
 					const iphoneReg1 = /^1[0-9]{10}$/
@@ -756,6 +809,30 @@
 					this.regionIndex1[2] = e.detail.value;
 				}
 			},
+			// 粉丝量量级选择
+			bindPickerChange: function(e) {
+				this.index3 = e.detail.value;
+				this.fansLabel = this.fansRange[this.index3].label
+				this.fansCountInfo = this.fansRange[this.index3].value
+				console.log(this.fansCountInfo, this.fansLabel)
+			},
+			onInput(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.fansCount = e
+				})
+			},
+			onInput1(e) {
+				console.log(e)
+				e = e.replace(/\D/g, '')
+				// e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.fansCount = e
+				})
+			}
 		},
 		created() {
 			let provinceArr = [];
@@ -797,6 +874,11 @@
 		border-bottom: none !important;
 		margin-bottom: 0 !important;
 	}
+	/deep/ .uni-forms-item__content {
+		display: flex !important;
+		align-items: center !important;
+		justify-content: space-between;
+	}
 </style>
 <style lang="scss" scoped>
 	@charset "UTF-8";

+ 8 - 1
pages/tasksquare/tasksquare.vue

@@ -160,6 +160,10 @@
 </template>
 <script>
 	import aTip from "@/components/mys-tip_1.0.01/a_tip/aTip";
+	import {
+		money,
+		fansview
+	} from '@/components/utils.js';
 	import request from '@/components/request.js';
 	/* 默认首页路径 */
 	const homePath = "/pages/pupu/pupudao";
@@ -384,7 +388,8 @@
 						// 封面图片
 						res.data.data.ProjectInfos[i].ProductInfo = JSON.parse(res.data.data.ProjectInfos[i]
 							.product_snap);
-
+						res.data.data.ProjectInfos[i].ProductInfo.ProductPrice = money(res.data.data
+							.ProjectInfos[i].ProductInfo.ProductPrice)
 						// 封面图片
 						let ProductPhoto = JSON.parse(res.data.data.ProjectInfos[i].product_photo_snap);
 						for (let j = 0; j < ProductPhoto.length; ++j) {
@@ -458,6 +463,8 @@
 						for (var i = 0; i < res.data.data.ProjectInfos.length; i++) {
 							res.data.data.ProjectInfos[i].ProductInfo = JSON.parse(res.data.data.ProjectInfos[i]
 								.product_snap);
+							res.data.data.ProjectInfos[i].ProductInfo.ProductPrice = money(res.data.data
+								.ProjectInfos[i].ProductInfo.ProductPrice)
 
 							// 封面图片
 							let ProductPhoto = JSON.parse(res.data.data.ProjectInfos[i].product_photo_snap);

+ 14 - 4
pages/workspace/datarecord.vue

@@ -9,19 +9,19 @@
 				<p style="margin-bottom: 10rpx;">上传时间:{{item.create_at}}</p>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">小眼睛阅读数/播放量</view>
-					<view style="width: 100rpx;border: 1rpx;">{{item.play_number}}</view>
+					<view style="border: 1rpx;">{{item.show_play_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">点赞数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{item.like_number}}</view>
+					<view style="border: 1rpx;">{{item.show_like_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">收藏数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{item.collect_number}}</view>
+					<view style="border: 1rpx;">{{item.show_collect_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">评论数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{item.comment_number}}</view>
+					<view style="border: 1rpx;">{{item.show_comment_number}}</view>
 				</view>
 				<!-- 图片 -->
 
@@ -36,11 +36,15 @@
 				<p>{{item.revise_opinion}}</p>
 			</view>
 		</view>
+		<view style="height: 100rpx;width: 100%;"></view>
 	</view>
 </template>
 
 <script>
 	import mvBar from "@/components/mys_navBar/mysNavBar";
+	import {
+		fansview
+	} from '@/components/utils.js';
 	export default {
 		components: {
 			mvBar,
@@ -97,6 +101,12 @@
 					.then(res => {
 						console.log(res)
 						this.List = res.data.data
+						for (let i = 0; i < this.List.length; ++i) {
+							this.List[i].show_play_number = fansview(this.List[i].play_number)
+							this.List[i].show_like_number = fansview(this.List[i].like_number)
+							this.List[i].show_collect_number = fansview(this.List[i].collect_number)
+							this.List[i].show_comment_number = fansview(this.List[i].comment_number)
+						}
 					})
 			},
 		}

+ 25 - 17
pages/workspace/deliveryInformation.vue

@@ -23,29 +23,34 @@
 				</view> -->
 			</view>
 
-			<view class="logistics1" style="margin: 0 27%;">
-				<p style="margin-bottom: 10rpx;">物流公司:{{logistics.company_name}}</p>
+			<view class="logistics1">
+				<view>
+					<p style="margin-bottom: 10rpx;">物流公司:{{logistics.company_name}}</p>
+					<span style="display: flex;align-items: center;">
+						<p>物流单号:{{logistics.logistics_number}}</p>
+						<image :src="icon_copy" mode="" style="width: 40rpx;height: 40rpx;"
+							@click="handleCopy(logistics.logistics_number)" />
+					</span>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="projectForm == 2" class="logistics1" style="margin: 0;">
+			<view>
 				<span style="display: flex;align-items: center;">
-					<p>物流单号:{{logistics.logistics_number}}</p>
+					<p>券码信息:{{logistics.coupon_code_information}}</p>
 					<image :src="icon_copy" mode="" style="width: 40rpx;height: 40rpx;"
-						@click="handleCopy(logistics.logistics_number)" />
+						@click="handleCopy(logistics.coupon_code_information)" />
 				</span>
 			</view>
 		</view>
 
-		<view v-if="projectForm == 2" style="margin: 0 27%;">
-			<span style="display: flex;align-items: center;">
-				<p>券码信息:{{logistics.coupon_code_information}}</p>
-				<image :src="icon_copy" mode="" style="width: 40rpx;height: 40rpx;"
-					@click="handleCopy(logistics.coupon_code_information)" />
-			</span>
-		</view>
-
-		<view v-if="projectForm == 3" style="margin: 0 10%;">
-			<p style="margin-bottom: 30rpx;">探店时间</p>
-			<p>{{logistics.explorestore_starttime}} &nbsp;&nbsp;至&nbsp;&nbsp;{{logistics.explorestore_endtime}}</p>
+		<view v-if="projectForm == 3" class="logistics1" style="margin: 0;">
+			<view>
+				<p style="margin-bottom: 30rpx;">探店时间</p>
+				<p>{{logistics.explorestore_starttime}} &nbsp;&nbsp;至&nbsp;&nbsp;{{logistics.explorestore_endtime}}</p>
+			</view>
 		</view>
-
 	</view>
 </template>
 
@@ -184,7 +189,10 @@
 	}
 
 	.logistics1 {
-		margin-left: 15%;
 		margin-top: 50rpx;
+		display: flex;
+		flex-flow: column;
+		align-items: center;
+		justify-content: center;
 	}
 </style>

+ 1 - 0
pages/workspace/linkrecord.vue

@@ -19,6 +19,7 @@
 				<p>{{item.revise_opinion}}</p>
 			</view>
 		</view>
+		<view style="height: 100rpx;width: 100%;"></view>
 	</view>
 </template>
 

+ 1 - 0
pages/workspace/scriptrecord.vue

@@ -16,6 +16,7 @@
 				<text>{{item.revise_opinion}}</text>
 			</view>
 		</view>
+		<view style="height: 100rpx;width: 100%;"></view>
 	</view>
 </template>
 

+ 21 - 4
pages/workspace/sketchrecord.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="position: relative;">
+	<view style="position: relative">
 		<!-- 胶囊 -->
 		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
 		<view :style="{marginTop:navH}"></view>
@@ -8,9 +8,12 @@
 			<view style="margin: 20rpx;">
 				<p style="margin-bottom: 10rpx;">上传时间:{{item.create_at}}</p>
 				<!-- 图片 -->
-				<view style="display: flex;" v-if="item.type == 1">
-					<view v-for="photo in item.Photo">
-						<image :src="photo.photo_url" mode="aspectFill" style="width: 150rpx;height: 150rpx;"></image>
+				<view v-if="item.type == 1">
+					<view class="image-list">
+						<!-- 图文 -->
+						<view class="image-item" v-for="photo in item.Photo">
+							<image :src="photo.photo_url" mode="aspectFill" style="width: 100%;height: 100%;"></image>
+						</view>
 					</view>
 				</view>
 				<!-- 视频 -->
@@ -26,6 +29,7 @@
 				<text>{{item.revise_opinion}}</text>
 			</view>
 		</view>
+		<view style="height: 100rpx;width: 100%;"></view>
 	</view>
 </template>
 
@@ -103,4 +107,17 @@
 		width: 100%;
 		border-bottom: 1rpx solid #dadada;
 	}
+	
+	.image-list {
+		margin: 0 2.5rpx;
+		display: flex;
+		flex-wrap: wrap;
+		// justify-content: space-between;
+	}
+	
+	.image-item {
+		width: 220rpx;
+		height: 220rpx;
+		margin: 10rpx 7.5rpx;
+	}
 </style>

+ 1 - 1
pages/workspace/taskdetail.vue

@@ -748,7 +748,7 @@
 							.fee_form ===
 							2 ?
 							'固定稿费 ' +
-							this.task.task_reward : '创作者自报价 ' + this.task.task_reward)
+							money(this.task.task_reward) : '创作者自报价 ' + money(this.task.task_reward))
 					}
 
 

+ 195 - 16
pages/workspace/uploaddata.vue

@@ -15,24 +15,44 @@
 			<view style="margin: 40rpx;">
 				<uni-forms :modelValue="formData" validate-trigger="bind" err-show-type="undertext" label-width="150">
 					<uni-forms-item name="play_number" label="小眼睛阅读数/播放量">
-						<uni-easyinput type="digit" maxlength=10 :inputBorder="false" v-model="formData.play_number"
-							placeholder="输入">
+						<uni-easyinput type="number" v-model="playsCount" :inputBorder="false" placeholder="输入"
+							v-if="playsCountInfo === 1" @input="onInput1">
 						</uni-easyinput>
+						<uni-easyinput type="digit" v-model="playsCount" :inputBorder="false" placeholder="输入" v-else @input="onInput2">
+						</uni-easyinput>
+						<picker @change="bindPickerChange1" :value="index" :range="Range" range-key="label">
+							<view>{{ playsLabel }}</view>
+						</picker>
 					</uni-forms-item>
 					<uni-forms-item name="like_number" label="点赞数">
-						<uni-easyinput type="digit" maxlength=10 :inputBorder="false" v-model="formData.like_number"
-							placeholder="输入">
+						<uni-easyinput type="number" v-model="likesCount" :inputBorder="false" placeholder="输入"
+							v-if="likesCountInfo === 1" @input="onInput3">
+						</uni-easyinput>
+						<uni-easyinput type="digit" v-model="likesCount" :inputBorder="false" placeholder="输入" v-else @input="onInput4">
 						</uni-easyinput>
+						<picker @change="bindPickerChange2" :value="index2" :range="Range" range-key="label">
+							<view>{{ likesLabel }}</view>
+						</picker>
 					</uni-forms-item>
 					<uni-forms-item name="collect_number" label="收藏数">
-						<uni-easyinput type="digit" maxlength=10 :inputBorder="false" v-model="formData.collect_number"
-							placeholder="输入">
+						<uni-easyinput type="number" v-model="collectsCount" :inputBorder="false" placeholder="输入"
+							v-if="collectsCountInfo === 1" @input="onInput5">
 						</uni-easyinput>
+						<uni-easyinput type="digit" v-model="collectsCount" :inputBorder="false" placeholder="输入" v-else @input="onInput6">
+						</uni-easyinput>
+						<picker @change="bindPickerChange3" :value="index3" :range="Range" range-key="label">
+							<view>{{ collectsLabel }}</view>
+						</picker>
 					</uni-forms-item>
 					<uni-forms-item name="comment_number" label="评论数">
-						<uni-easyinput type="digit" maxlength=10 :inputBorder="false" v-model="formData.comment_number"
-							placeholder="输入">
+						<uni-easyinput type="number" v-model="commentsCount" :inputBorder="false" placeholder="输入"
+							v-if="commentsCountInfo === 1" @input="onInput7">
+						</uni-easyinput>
+						<uni-easyinput type="digit" v-model="commentsCount" :inputBorder="false" placeholder="输入" v-else @input="onInput8">
 						</uni-easyinput>
+						<picker @change="bindPickerChange4" :value="index4" :range="Range" range-key="label">
+							<view>{{ commentsLabel }}</view>
+						</picker>
 					</uni-forms-item>
 				</uni-forms>
 			</view>
@@ -54,19 +74,19 @@
 			<view style="margin: 20rpx;">
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">小眼睛阅读数/播放量</view>
-					<view style="width: 100rpx;border: 1rpx;">{{formData.show_play_number}}</view>
+					<view style="border: 1rpx;">{{formData.show_play_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">点赞数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{formData.show_like_number}}</view>
+					<view style="border: 1rpx;">{{formData.show_like_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">收藏数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{formData.show_collect_number}}</view>
+					<view style="border: 1rpx;">{{formData.show_collect_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">评论数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{formData.show_comment_number}}</view>
+					<view style="border: 1rpx;">{{formData.show_comment_number}}</view>
 				</view>
 				<!-- 图片 -->
 
@@ -110,6 +130,39 @@
 					show_collect_number: "",
 					show_commet_number: "",
 				},
+
+				index1: 0,
+				playsLabel: "个",
+				playsCount: 0,
+				playsCountInfo: 1,
+				index2: 0,
+				likesLabel: "个",
+				likesCount: 0,
+				likesCountInfo: 1,
+				index3: 0,
+				collectsLabel: "个",
+				collectsCount: 0,
+				collectsCountInfo: 1,
+				index4: 0,
+				commentsLabel: "个",
+				commentsCount: 0,
+				commentsCountInfo: 1,
+				Range: [{
+						value: 1,
+						label: '个'
+					},
+					{
+						value: 10000,
+						label: '万'
+					},
+					{
+						value: 100000000,
+						label: '亿'
+					}
+				],
+
+
+
 				// rules: {
 				// 	// 对play_number字段进行必填验证
 				// 	play_number: {
@@ -239,10 +292,34 @@
 
 			submit() {
 				// 校验
-				if (this.formData.play_number == "" || this.formData.like_number == "" || this.formData.collect_number ==
-					"" || this.formData.comment_number == "") {
+				this.formData.play_number = this.playsCount * this.playsCountInfo
+				if (parseInt(this.formData.plays_count) === 0) {
 					uni.showToast({
-						title: '请输入10位以内的数字',
+						title: '请输入正确数量',
+						icon: 'none'
+					})
+					return
+				}
+				this.formData.like_number = this.likesCount * this.likesCountInfo
+				if (parseInt(this.formData.likes_count) === 0) {
+					uni.showToast({
+						title: '请输入正确数量',
+						icon: 'none'
+					})
+					return
+				}
+				this.formData.collect_number = this.collectsCount * this.collectsCountInfo
+				if (parseInt(this.formData.collects_count) === 0) {
+					uni.showToast({
+						title: '请输入正确数量',
+						icon: 'none'
+					})
+					return
+				}
+				this.formData.comment_number = this.commentsCount * this.commentsCountInfo
+				if (parseInt(this.formData.comments_count) === 0) {
+					uni.showToast({
+						title: '请输入正确数量',
 						icon: 'none'
 					})
 					return
@@ -376,10 +453,112 @@
 					return v.toString(16);
 				});
 			},
+			// 量级选择
+			bindPickerChange1: function(e) {
+				this.index1 = e.detail.value;
+				this.playsLabel = this.Range[this.index1].label
+				this.playsCountInfo = this.Range[this.index1].value
+				console.log(this.playsCountInfo, this.playsLabel)
+			},
+			// 量级选择
+			bindPickerChange2: function(e) {
+				this.index2 = e.detail.value;
+				this.likesLabel = this.Range[this.index2].label
+				this.likesCountInfo = this.Range[this.index2].value
+				console.log(this.likesCountInfo, this.likesLabel)
+			},
+			// 量级选择
+			bindPickerChange3: function(e) {
+				this.index3 = e.detail.value;
+				this.collectsLabel = this.Range[this.index3].label
+				this.collectsCountInfo = this.Range[this.index3].value
+				console.log(this.collectsCountInfo, this.collectsLabel)
+			},
+			// 量级选择
+			bindPickerChange4: function(e) {
+				this.index4 = e.detail.value;
+				this.commentsLabel = this.Range[this.index4].label
+				this.commentsCountInfo = this.Range[this.index4].value
+				console.log(this.commentsCountInfo, this.commentsLabel)
+			},
+			onInput1(e) {
+				console.log(e)
+				e = e.replace(/\D/g, '')
+				// e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.playsCount = e
+				})
+			},
+			onInput2(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.playsCount = e
+				})
+			},
+			onInput3(e) {
+				console.log(e)
+				e = e.replace(/\D/g, '')
+				// e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.likesCount = e
+				})
+			},
+			onInput4(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.likesCount = e
+				})
+			},
+			onInput5(e) {
+				console.log(e)
+				e = e.replace(/\D/g, '')
+				// e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.collectsCount = e
+				})
+			},
+			onInput6(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.collectsCount = e
+				})
+			},
+			onInput7(e) {
+				console.log(e)
+				e = e.replace(/\D/g, '')
+				// e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.commentsCount = e
+				})
+			},
+			onInput8(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				this.$nextTick(() => {
+					this.commentsCount = e
+				})
+			}
 		}
 	}
 </script>
-
+<style>
+	/deep/ .uni-forms-item__content {
+		display: flex !important;
+		align-items: center !important;
+		justify-content: space-between;
+	}
+</style>
 <style lang="scss" scoped>
 	.signup {
 		box-shadow: 0rpx 5rpx 40rpx #ccc;

+ 2 - 2
pages/workspace/uploadlink.vue

@@ -36,8 +36,8 @@
 			<view style="margin: 20rpx;">
 				<!-- 图片 -->
 				<p>{{link_url}}</p>
-				<view style="display: flex;">
-					<image :src="imageData" mode="aspectFit"></image>
+				<view>
+					<image :src="imageData" mode="scaleToFill"></image>
 				</view>
 			</view>
 		</view>

+ 19 - 9
pages/workspace/uploadscript.vue

@@ -14,10 +14,12 @@
 
 		<view v-if="!loading && !onlyShow">
 			<!-- 多行输入框 -->
-			<uni-easyinput type="text" :inputBorder="false" v-model="title" placeholder="在此填写让人眼前一亮的标题吧"
-				:placeholderStyle="placeholderStyle">
-			</uni-easyinput>
-			<view style="padding: 40rpx 30rpx 150rpx;font-size: 16px">
+			<view>
+				<uni-easyinput type="text" :inputBorder="false" v-model="title" placeholder="在此填写让人眼前一亮的标题吧"
+					:placeholderStyle="placeholderStyle">
+				</uni-easyinput>
+			</view>
+			<view style="padding: 40rpx 30rpx 150rpx;font-size: 30rpx;">
 				<textarea v-model="text" maxlength="5000" auto-height="true" placeholder="在此编辑发布脚本/粘贴文字" />
 			</view>
 			<view class="signup">
@@ -25,10 +27,10 @@
 					提交脚本</button>
 			</view>
 		</view>
-		
-		<view v-if="onlyShow">
-			<p style="font-size: 16px">{{title}}</p>
-			<view style="padding: 40rpx 30rpx 150rpx;font-size: 12px">
+
+		<view v-if="onlyShow" style="width: 100%;">
+			<p style="font-size: 30rpx;padding: 20rpx 30rpx 0 ;">{{title}}</p>
+			<view style="padding: 40rpx 30rpx 150rpx;font-size: 30rpx;">
 				<text> {{text}}</text>
 			</view>
 		</view>
@@ -45,7 +47,7 @@
 			return {
 				onlyShow: false,
 				loading: true,
-				placeholderStyle: "font-size:16px",
+				placeholderStyle: "font-size: 30rpx;",
 				navH: getApp().globalData.navHeight,
 				taskId: "",
 				title: "",
@@ -166,6 +168,14 @@
 	}
 </script>
 
+<style>
+	/deep/ .uni-easyinput__content-input {
+		font-size: 30rpx !important;
+		padding: 20rpx 30rpx 0  !important;
+	}
+</style>
+
+
 <style lang="scss" scoped>
 	.signup {
 		box-shadow: 0rpx 5rpx 40rpx #ccc;

+ 46 - 13
pages/workspace/uploadsketch.vue

@@ -8,7 +8,7 @@
 				<image style="height: 60rpx;width: 60rpx;" src="../../static/img/icon-clock.png"></image>
 			</view>
 			<view style="display: flex;justify-content: center;">
-				<p style="font-size: 32rpx;">查看修改/反馈记录</p>
+				<p style="font-size: 30rpx;">查看修改/反馈记录</p>
 			</view>
 		</view>
 
@@ -39,7 +39,7 @@
 				:placeholderStyle="placeholderStyle">
 			</uni-easyinput>
 			<!-- 多行输入框 -->
-			<view style="padding: 40rpx 20rpx 150rpx;font-size: 16px">
+			<view style="padding: 40rpx 30rpx 150rpx;font-size: 30rpx;">
 				<textarea v-model="text" maxlength="2000" auto-height="true" placeholder="添加正文" />
 			</view>
 			<view class="signup">
@@ -50,19 +50,24 @@
 		</view>
 
 		<view v-if="!loading && onlyShow">
-			<view style="margin: 20rpx; 50rpx">
-				<!-- 图文 -->
-				<view style="display: flex;" v-if="activeRadio == '图文'">
-					<view v-for="photo in imageData">
-						<image :src="photo" mode="aspectFill" style="width: 150rpx;height: 150rpx;"></image>
+			<view v-if="activeRadio == '图文'">
+				<view class="image-list">
+					<!-- 图文 -->
+					<view class="image-item" v-for="photo in imageData">
+						<image :src="photo" mode="aspectFill" style="width: 100%;height: 100%;"
+							@click="handlePreviewImage1(photo)"></image>
 					</view>
 				</view>
-				<!-- 视频 -->
-				<view style="display: flex;" v-if="activeRadio == '视频'">
-					<video :src="videoData[0]"></video>
+			</view>
+			<!-- 视频 -->
+			<view style="display: flex;align-items: center;justify-content: center;" v-if="activeRadio == '视频'">
+				<video :src="videoData[0]"></video>
+			</view>
+			<view>
+				<p style="font-size: 30rpx;padding: 20rpx 30rpx 0 ;">{{title}}</p>
+				<view style="padding: 40rpx 30rpx 150rpx;font-size: 30rpx;">
+					<text style="font-size: 30rpx;"> {{text}}</text>
 				</view>
-				<p style="font-size: 16px">{{title}}</p>
-				<text style="font-size: 12px">{{text}}</text>
 			</view>
 		</view>
 	</view>
@@ -82,7 +87,7 @@
 			return {
 				onlyShow: false,
 				loading: true,
-				placeholderStyle: "font-size:16px",
+				placeholderStyle: "font-size: 30rpx;",
 				navH: getApp().globalData.navHeight,
 				taskId: "",
 				title: "",
@@ -131,6 +136,14 @@
 				this.activeRadio = e.detail.value;
 				console.log(this.activeRadio);
 			},
+			handlePreviewImage1(item) {
+				console.log("image src: ", item)
+				let that = this
+				wx.previewImage({
+					current: item, // 当前显示图片的http链接
+					urls: that.imageData // 需要预览的图片http链接列表
+				})
+			},
 			async getSketch() {
 				this.loading = true
 				uni.showLoading({
@@ -415,6 +428,13 @@
 	}
 </script>
 
+<style>
+	/deep/ .uni-easyinput__content-input {
+		font-size: 30rpx !important;
+		padding: 20rpx 30rpx 0 !important;
+	}
+</style>
+
 <style lang="scss" scoped>
 	.signup {
 		box-shadow: 0rpx 5rpx 40rpx #ccc;
@@ -428,6 +448,19 @@
 		z-index: 99;
 	}
 
+	.image-list {
+		margin: 0 22.5rpx;
+		display: flex;
+		flex-wrap: wrap;
+		// justify-content: space-between;
+	}
+
+	.image-item {
+		width: 220rpx;
+		height: 220rpx;
+		margin: 10rpx 7.5rpx;
+	}
+
 	.but1 {
 		width: 60%;
 		background-color: #f2d22d;

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/htz-image-upload/htz-image-upload.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/mosowe-canvas-image/mosowe-canvas-image.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/mys-tip_1.0.01/a_tip/aTip.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/mys_navBar/mysNavBar.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/z-swiper/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/userinfo.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/message.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/mycenter.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myincome.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myincome/applywithdraw.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/addlocation.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/bindaccount.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/myaccount.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/mybank.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/myinformation.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/mylocation.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/myinformation/personinfo.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/mytask/mytask.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/bindinfo.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/cooperation.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/guide.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/information.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/search.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/specialTask/information.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/specialTask/specialTaskDetail.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/success.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/taskdetail.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tasksquare/tasksquare.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/test/test.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/applyInformation.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/datarecord.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/deliveryInformation.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/editaddress.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/linkrecord.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/scriptrecord.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/sketchrecord.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/taskdetail.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/uploaddata.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/uploadlink.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/uploadscript.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/uploadsketch.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/workspace.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff