Merge branch 'pengyouhao_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin

src/views/mallManagement/activityOrder/detail.vue

@@ -98,8 +98,8 @@
 			        v-for="(it, idx) in item.answer"
 			        :key="idx"
 			        @click="clickOption(index, idx)">
-			        <el-image class="image" :src="returnUrl(it)" mode="aspectFill"></el-image>
-			        <div class="text">{{it.option_value}}</div>
+			        <el-image v-if="item.answerType != 2" class="image" :src="returnUrl(it)" mode="aspectFill"></el-image>
+			        <div class="text" v-if="item.answerType != 3">{{it.option_value}}</div>
 			      </div>
 			    </div>
 			    <div class="text-list" v-else>
@@ -117,9 +117,13 @@
 			    <div class="label"><span v-if="item.isRequire">*</span>{{item.question}}</div>
 				<el-input type="text" v-model="item.inputValue" show-word-limit :maxlength="item.answer[0].option_limit" :disabled="formType!=0" :placeholder="`请输入${item.question}`"></el-input>
 			  </div>
+			  <div class="input-container" v-else-if="item.type == 4">
+			    <div class="label"><span v-if="item.isRequire">*</span>{{item.question}}</div><br/>
+				<ImageUpload :fileList="item.inputValue" :limit="Number(item.answer[0].option_limit)" :isEdit="formType==0" :fileType="['image']"/>
+			  </div>
 			  <div class="input-container" v-else>
 			    <div class="label"><span v-if="item.isRequire">*</span>{{item.question}}</div><br/>
-				<ImageUpload :fileList="item.inputValue" :limit="1" :isEdit="formType==0" :fileType="['image','video']"/>
+			  	<ImageUpload :fileList="item.inputValue" :limit="Number(item.answer[0].option_limit)" :isEdit="formType==0" :fileType="['video']"/>
 			  </div>
 			</div>
 		</el-card>
@@ -245,7 +249,24 @@
 						active: {id: res.data.promotionQuestionnaireId}
 					})
 					this.status = res.data.status
-					this.getActiveDetail(res.data.promotionQuestionnaireId,res.data.items)
+					res.data.items.forEach(item=>{
+						item.answer = JSON.parse(item.answer)
+						
+						item.answer.forEach(it => {
+							if(item.type == 3){
+								item.inputValue = it.option_value
+							}else if(item.type == 4 || item.type == 5){
+								let img = []
+								it.option_value.forEach(t=>{
+									img.push({url: t})
+								})
+								console.log(it.option_value,img)
+								item.inputValue = img
+							}
+						})
+					})
+					this.activeItems = res.data.items
+					// this.getActiveDetail(res.data.promotionQuestionnaireId,res.data.items)
 				})
 			},
 			getActiveList(){
@@ -273,18 +294,6 @@
 										}
 									})
 								})
-								// let data = JSON.parse(items[index].answer)
-								// console.log(data[ind]?.option_value,it.option_value)
-								// if(data[ind]?.active && data[ind]?.option_value == it.option_value){
-								// 	it.active = true;
-								// }else{
-								// 	it.active = false;
-								// }
-								// if(items[index].type == 3){
-								// 	item.inputValue = data[ind]?.option_value
-								// }else if(item.type == 4 || item.type == 5){
-								// 	item.inputValue = [{url: data[ind]?.option_value}]
-								// }
 							})
 						}else{
 							if(item.type == 4 || item.type == 5){
@@ -340,7 +349,7 @@
 							for(let index = 0; index < activeItems.length; index++) {
 							  // 单选题多选题
 							  if ((activeItems[index].type == 1 || activeItems[index].type == 2)) {
-							    activeItems[index].answer = activeItems[index].answer.filter(o => o.active);
+							    // activeItems[index].answer = activeItems[index].answer.filter(o => o.active);
 							    activeItems[index].answer = JSON.stringify(activeItems[index].answer);
 							    items.push(activeItems[index]);
 							  }
@@ -352,7 +361,11 @@
 							  }
 							  // 图片视频
 							  if (activeItems[index].type == 4 || activeItems[index].type == 5) {
-							    activeItems[index].answer[0].option_value = activeItems[index].inputValue.length>0?activeItems[index].inputValue[0].url:'';
+								  let option_value = []
+								  activeItems[index].inputValue.forEach(item=>{
+									  option_value.push(item.url)
+								  })
+							    activeItems[index].answer[0].option_value = option_value
 							    activeItems[index].answer = JSON.stringify(activeItems[index].answer);
 							    items.push(activeItems[index]);
 							  }

src/views/mallManagement/settlement/index.vue

@@ -81,6 +81,36 @@ export default {
     exportList: orderSharePageExport,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
+			if (item.jname === 'orderId') {
+				defaultData.render = (h, { row, index, column }) => {
+					return (
+						<div style="padding:0 6px;cursor: pointer;" class={{ 'text-view': true, 'text-view-copy': column.isCopy }}>
+							<span style="color:#008dd4;" onClick={() => {
+									this.$router.push({
+										name: "order_detail",
+										params: {
+										  pageName: row.orderId,
+										  pageType: 'detail',
+										  pageCode: row.orderId
+										},
+										query: {
+										  id: row.orderId,
+										  orderId: row.orderId
+										}
+									})
+							}}>{row.orderId}</span>
+							{(column.isCopy && row.orderId) ? (
+								<i
+									style="color:#008dd4;"
+									class={['el-icon-document-copy', column.columnCopyClass]}
+									data-clipboard-text={row[column.columnAttributes.prop]}
+								></i>
+							) : null}
+						</div>
+					)
+				}
+				defaultData.columnAttributes.width = 200
+			}
       return defaultData
     },
     // 监听勾选变化

src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -327,7 +327,7 @@
     </div>
 
     <div v-show="step == 'four'">
-      <el-form ref="step4Form" :model="step4Form" :rules="step4FormRules" label-width="100px" label-position="right">
+      <el-form ref="step4Form" :model="step4Form" :rules="step4FormRules" label-width="120px" label-position="right">
         <h4>说明：将按照T+N天自动把销售订单“待结算”状态转为“可提现”状态，T为订单支付成功的日期。</h4>
         <h5>自动结算频率</h5>
         <el-form-item label="N等于" prop="dayNum">
@@ -340,6 +340,12 @@
           <el-time-picker v-model="step4Form.hourTime" value-format="HH:mm:ss" placeholder="选择执行时间">
           </el-time-picker>
         </el-form-item>
+		<el-form-item label="手续费承担方式" prop="isShareTax" class="is-required">
+		  <el-radio-group v-model="step4Form.isShareTax">
+		      <el-radio :label="false">商户承担</el-radio>
+		      <el-radio :label="true">各自承担</el-radio>
+		  </el-radio-group>
+		</el-form-item>
       </el-form>
     </div>
 
@@ -578,7 +584,8 @@ export default {
       },
       step4Form: {
         dayNum: '',
-        hourTime: ''
+        hourTime: '',
+		isShareTax: false
       },
       step4FormRules: {
         dayNum: [
@@ -681,6 +688,7 @@ export default {
 
         this.step4Form.dayNum = res.data.dayNum
         this.step4Form.hourTime = res.data.hourTime
+				this.step4Form.isShareTax = res.data.isShareTax
       })
     },
 
@@ -887,6 +895,7 @@ export default {
             companyWechatId: this.companyWechatId,
             dayNum: this.step4Form.dayNum,
             hourTime: this.step4Form.hourTime,
+						isShareTax: this.step4Form.isShareTax
           }
           editAccount(params).then(res => {
             this.$successMsg('保存成功');