Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

wesley88
2 parents 96898da2 cfe2752f
Showing 36 changed files with 645 additions and 117 deletions
admin-web-master/src/api/newly.js
admin-web-master/src/components/Tinymce/components/EditorImage.vue
admin-web-master/src/components/add/addss.vue
admin-web-master/src/components/add/addyixiang.vue
admin-web-master/src/components/chakan/cd.vue
admin-web-master/src/utils/request.js
admin-web-master/src/views/business/businessList/index.vue
admin-web-master/src/views/customer/icReview/index.vue
admin-web-master/src/views/customer/rUser/index.vue
admin-web-master/src/views/customer/rsaManagement/index.vue
admin-web-master/src/views/customer/rsaReview/index.vue
admin-web-master/src/views/shopbus/settlement/addSettlement.vue
ceres-uniapp-master/config/api.js
ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
ceres-uniapp-master/pages_category_page1/goodsModule/evaluateList.vue
ceres-uniapp-master/pages_category_page1/procedure/procedure.vue
lvdao-miniapp/main.js
lvdao-miniapp/pages.json
lvdao-miniapp/pages/home/home.vue
lvdao-miniapp/pages/mycreated/actList.vue
@@ -405,6 +405,14 @@ export function cerePlatformMerchantadd(data) {
     data
   })
 }
+// 绑定添加
+export function bamngdingAdd(data) {
+  return request({
+    url: '/cerePlatformMerchant/addAgain',
+    method: 'post',
+    data
+  })
+}
 // 详情
 export function cerePlatformMerchantinfo(data) {
   return request({
 <template>
   <div class="upload-container">
     <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
-      上传图片
+      上传
     </el-button>
     <el-dialog :visible.sync="dialogVisible">
       <el-upload
@@ -11,17 +11,15 @@
         :on-remove="handleRemove"
         :on-success="handleSuccess"
         :before-upload="beforeUpload"
-   class="editor-slide-upload upload-container"
-        :action="action"
+        class="editor-slide-upload"
+        action="https://httpbin.org/post"
         list-type="picture-card"
-         accept="image/jpeg,image/png,image/gif"
       >
         <el-button size="small" type="primary">
           点击上传
         </el-button>
       </el-upload>
-      <el-button @click="dialogVisible = false"  class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">
+      <el-button @click="dialogVisible = false">
         取消
       </el-button>
       <el-button type="primary" @click="handleSubmit">
@@ -32,7 +30,7 @@
 </template>
 <script>
-import { upUrl } from '@/utils/request'
+// import { getToken } from 'api/qiniu'
 export default {
   name: 'EditorSlideUpload',
@@ -46,8 +44,7 @@ export default {
     return {
       dialogVisible: false,
       listObj: {},
-      fileList: [],
-      action:upUrl
+      fileList: []
     }
   },
   methods: {
@@ -70,7 +67,7 @@ export default {
       const objKeyArr = Object.keys(this.listObj)
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
         if (this.listObj[objKeyArr[i]].uid === uid) {
-          this.listObj[objKeyArr[i]].url = this.$baseURL+response.data
+          this.listObj[objKeyArr[i]].url = response.files.file
           this.listObj[objKeyArr[i]].hasSuccess = true
           return
         }
@@ -107,13 +104,8 @@ export default {
 <style lang="scss" scoped>
 .editor-slide-upload {
   margin-bottom: 20px;
-  // ::v-deep .el-upload--picture-card {
-  //   width: 100%;
-  // }
-}
-.upload-container {
-  // display: flex;
-  // justify-content: center; /* 水平居中 */
-  // align-items: center; /* 垂直居中 */
+  ::v-deep .el-upload--picture-card {
+    width: 100%;
+  }
 }
 </style>
@@ -3,7 +3,7 @@
     <el-form :model="formInline" :rules="rulesHetong" ref="heForm" label-width="130px" class="demo-ruleForm">
       <el-form-item label="用户名" prop="username">
-        <el-input v-model="formInline.username" placeholder="请输入"></el-input>
+        <el-input v-model="formInline.username" placeholder="请输入" :disabled="this.moren==1?true:false"></el-input>
       </el-form-item>
       <el-form-item label="姓名" prop="name">
@@ -12,7 +12,7 @@
       <el-form-item label="手机号" prop="phone">
-        <el-input v-model="formInline.phone" placeholder="请输入"></el-input>
+        <el-input v-model="formInline.phone" maxlength="11" placeholder="请输入" :disabled="this.moren==1?true:false"></el-input>
       </el-form-item>
       <el-form-item label="性别" prop="sex">
@@ -94,7 +94,7 @@
   import {
     cerePlatformMerchantadd,
 	cerePlatformMerchantedit,
-	
+	bamngdingAdd
   } from '@/api/newly.js'
   export default {
@@ -198,6 +198,7 @@
 	        info: {
 	            immediate: true,
 	            handler(newVal) {
+					console.log(newVal,'newVal')
 	                if (Object.keys(newVal).length > 0) {
 	                    this.formInline = newVal
 						this.moren = 1 
@@ -242,13 +243,40 @@
 				  state:'1',
 				  applyTime: this.updateCurrentTime()
 				}).then(res => {
-				  if (res.code == 200) {
+				  if (res.code == 200 && res.message !='手机号已被注册') {
 				    this.$message({
 				      message: '添加成功',
 				      type: 'success'
 				    })
 				    this.$emit('removeonaction', '1')
-				  } else {
+				  } else if(res.code == 200 && res.message =='手机号已被注册'){
+					 this.$confirm('是否绑定线上商家？', '提示', {
+					        confirmButtonText: '确定',
+					        cancelButtonText: '取消',
+					        type: 'warning'
+					    }).then(() => {
+					        bamngdingAdd({
+					            ...this.formInline,
+					            checkState: '2',
+					            state: '1',
+					            applyTime: this.updateCurrentTime()
+					        }).then(response => {
+					            if (response.code == '200') {
+					                this.$message({
+					                    message: '绑定成功',
+					                    type: 'success'
+					                });
+					                this.$emit('removeonaction', '1');
+					            }
+					        })
+					    }).catch(() => {
+					        // 用户点击取消，不做任何操作
+					        this.$message({
+					            message: '已取消绑定',
+					            type: 'info'
+					        });
+					    });
+				  }else {
 				    this.$message({
 				      message: res.msg,
 				      type: 'error'
@@ -218,7 +218,7 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
-                      <div class="duiqi">{{info.cereBasicInformationShop.belongingGreenwaySection || '无'}}</div>
+                      <div class="duiqi">{{getLvdaoNameByCode(info.cereBasicInformationShop.belongingGreenwaySection)|| '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
@@ -282,7 +282,7 @@
                   <!-- <img  v-for="item in info.cereBasicInformationShop.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> -->
                 </el-form-item>
                 <el-form-item label="其他视频" prop="otherImageVideos"  >
-                  <div class="duiqi" :class="info.cereBasicInformationShop.otherImageVideos?'greens':''" @click ="info.cereBasicInformationShop.otherImageVideos?openfile($baseURL+info.cereBasicInformationShop.otherImageVideos):''">{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}</div>
+                  <div class="duiqi" :class="info.cereBasicInformationShop.otherImageVideos?'greens':''" @click ="info.cereBasicInformationShop.otherImageVideos?openfile(info.cereBasicInformationShop.otherImageVideos):''">{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}</div>
                   <!-- <div class="duiqi" v-for="item in info.cereBasicInformationShop.otherImageVideos.split(',')">{{$baseURL+item}}</div> -->
                 </el-form-item>
               </el-form>
@@ -369,7 +369,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="其他视频" prop="otherImageVideos"  >
-                  <div class="duiqi" :class="info.cereBasicInformationVenue.otherImageVideos?'greens':''" @click ="info.cereBasicInformationVenue.otherImageVideos?openfile($baseURL+info.cereBasicInformationVenue.otherImageVideos):''">{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}</div>
+                  <div class="duiqi" :class="info.cereBasicInformationVenue.otherImageVideos?'greens':''" @click ="info.cereBasicInformationVenue.otherImageVideos?openfile(info.cereBasicInformationVenue.otherImageVideos):''">{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}</div>
                 </el-form-item>
               </el-form>
             </div>
@@ -438,6 +438,11 @@
   import newmap from "@/components/newmap/index";
   import indexall from "@/components/newmap/indexall";
   import { icManAdd} from '@/api/icManagement';
+  import {
+  	gongyuan,
+  	parkTrails,
+  	lvdaoduan,
+  } from '@/api/information.js';
   export default {
     components: {
       TitleWithCircle,
@@ -482,7 +487,8 @@
           checkState:'2',
           phone: '',
         },
-        shopMsg:{}
+        shopMsg:{},
+		lvdaoList:[]
       }
     },
     created() {
@@ -494,6 +500,7 @@
       if (this.info.cereAdvertisingInformation) {
         this.ontype = this.info.cereAdvertisingInformation.advertisingType
       }
+	  this.getAll()
     },
     computed: {
@@ -594,6 +601,30 @@
       closeFn() {
         this.$emit('change', false);
       },
+	  async	getAll(){
+	  	const lvdao = await lvdaoduan()
+	  	const gongyua  = await parkTrails() 
+	  	const budao = await gongyuan()
+	  	const lvList = lvdao.data.concat(gongyua.data)
+	  	
+	  	this.lvdaoList = lvList.concat(budao.data)
+	  },
+	  getLvdaoNameByCode(code) {
+	      // 若传入的 code 为空，直接返回空字符串
+	      if (!code) {
+	          return '';
+	      }
+	      // 遍历 this.lvdaoList 数组
+	      for (let i = 0; i < this.lvdaoList.length; i++) {
+	          const item = this.lvdaoList[i];
+	          // 当传入的 code 等于 item 的 code 时，返回 item 的 name
+	          if (item.code === code) {
+	              return item.name;
+	          }
+	      }
+	      // 若遍历完数组都没找到匹配的 code，返回空字符串
+	      return '无';
+	  },
     }
   }
 </script>
@@ -95,8 +95,9 @@
                     <allimg v-if="item" :src="item" fit="contain"  v-for="item in editbgid.displayImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
-                <el-form-item label="其他视频" prop="otherImageVideos"  >
-                  <div class="duiqi" :class="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div>
+                <el-form-item label="其他视频" prop="otherMedia"  >
+                  <!-- <div class="duiqi" :class="editbgid.otherImageVideos?'greens':editbgid.otherMedia?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):editbgid.otherMedia?:openfile($baseURL+editbgid.otherMedia)''">{{editbgid.otherImageVideos||editbgid.otherMedia?'查看详情':'无'}}</div> -->
+				  <div class="duiqi" :class="editbgid.otherMedia?'greens':''" @click ="editbgid.otherMedia?openfile($baseURL+editbgid.otherMedia):''">{{editbgid.otherMedia?'查看详情':'无'}}</div>
                 </el-form-item>
               </el-form>
             </div>
@@ -22,7 +22,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  // baseURL = 'http://128.10.249.32:9003';
+  baseURL = 'http://128.10.249.25:9003';
 } else {
@@ -128,7 +128,7 @@
     </el-dialog>
     <div class="zhuti" v-if="onaction == '2'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>合同管理</span> <span style="padding:0 5px;">></span> <span
+        <div style="color:#0006"> <span>商家信息管理</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">新增</span></div>
       </div>
@@ -152,7 +152,7 @@
     </div>
     <div class="zhuti" v-if="onaction == '4'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>合同管理</span> <span style="padding:0 5px;">></span> <span
+        <div style="color:#0006"> <span>商家信息管理</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">编辑</span></div>
       </div>
@@ -108,7 +108,7 @@
     <div class="zhuti" v-if="onaction == '2'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>招商租赁审核</span> <span style="padding:0 5px;">></span> <span
+        <div style="color:#0006"> <span>商户意向管理</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">新增</span></div>
       </div>
@@ -118,7 +118,7 @@
     </div>
     <div class="zhuti" v-if="onaction == '3'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>招商租赁审核</span> <span style="padding:0 5px;">></span> <span
+        <div style="color:#0006"> <span>商户意向管理</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">{{onindex=='1'?'查看':'审核'}}</span></div>
       </div>
       <div>
@@ -294,8 +294,10 @@ import merchantInformation from &#39;../../../components/merchantInformation/index.v
 		    if (valid) {
 				 this.ruleForm.id = this.secondData.id
 				 cerePlatformMerchantedit(this.ruleForm)
-				this.ggXin = false
-				  this.getAll()
+				 this.$message({
+				   message: '修改成功',
+				   type: 'success'
+				 })
 				}else{
 					this.$message({
 					  message: '请填写完整信息',
@@ -303,7 +305,9 @@ import merchantInformation from &#39;../../../components/merchantInformation/index.v
 					})
 				}
-			 })	      
+			 })	    
+			   this.getAll()
+			   this.ggXin = false
       },
   handleCurrentChange(val) {
     this.pageindex.pageNumber = val - 1
@@ -341,6 +345,10 @@ import merchantInformation from &#39;../../../components/merchantInformation/index.v
                      beforeClose: (action, instance, done) => {
                        if (action === 'confirm') {
                          cerePlatformMerchantedit({id:ids,isBlackList:num}).then(res=>{
+							 this.$message({
+							   message: '修改成功',
+							   type: 'success'
+							 })
                             this.getAll()
                            done();
                          })
@@ -257,11 +257,11 @@
                   <div class="duiqi">{{secondData.idCardNumber}}</div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="身份证有效期">
                   <div class="duiqi">{{secondData.idCardValidStart}}-{{secondData.idCardValidEnd}}</div>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="20">
               <el-col :span="12">
@@ -355,7 +355,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="手机号" prop="phone">
-                  <el-input v-model.number="ruleForm.phone" placeholder="请输入" />
+                  <el-input v-model.number="ruleForm.phone" placeholder="请输入"  :disabled="edit==false?true:false"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -366,13 +366,13 @@
                   <el-input v-model="ruleForm.idCardNumber" placeholder="请输入" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="身份证有效期" prop="idCardValidStart">
                   <el-date-picker v-model="ruleForm.idTime" type="daterange" range-separator="至"
                     start-placeholder="开始时间" end-placeholder="结束时间" value-format="yyyy-MM-dd" style="width:100%"
-                    @change="idCardchange" />
+                    @change="idCardchange"  @blur="blur" />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="20">
               <el-col :span="12">
@@ -561,11 +561,11 @@
             message: '手机号只能包含数字',
             trigger: 'blur',
           }],
-          idCardValidStart: [{
-            required: true,
-            message: '请选择身份证有效时间',
-            trigger: 'change'
-          }, ],
+          // idCardValidStart: [{
+          //   required: true,
+          //   message: '请选择身份证有效时间',
+          //   trigger: 'change'
+          // }, ],
           idCardPhotoFront: [{
             required: true,
             message: '请输入身份证照片(正面)',
@@ -703,11 +703,14 @@
         this.getAll();
       },
       idCardchange(e) {
-
+		console.log(e,'eee')
         this.ruleForm.idCardValidStart = e[0]
         this.ruleForm.idCardValidEnd = e[1]
-
+		
       },
+	  blur(){
+		  this.$forceUpdate()
+	  },
       // 新增确定
       addCheck() {
@@ -226,11 +226,11 @@
                   <div class="duiqi">{{secondData.idCardNumber}}</div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="身份证有效期">
                   <div class="duiqi">{{secondData.idCardValidStart}}-{{secondData.idCardValidEnd}}</div>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="20">
               <el-col :span="12">
@@ -333,11 +333,11 @@
                   <div class="duiqi">{{ruleForm.idCardNumber}}</div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="身份证有效期">
                   <div class="duiqi">{{ruleForm.idCardValidStart}}-{{ruleForm.idCardValidEnd}}</div>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="20">
               <el-col :span="12">
@@ -534,11 +534,11 @@
             message: '手机号只能包含数字',
             trigger: 'blur',
           }],
-          idCardValidStart: [{
-            required: true,
-            message: '请选择身份证有效时间',
-            trigger: 'change'
-          }, ],
+          // idCardValidStart: [{
+          //   required: true,
+          //   message: '请选择身份证有效时间',
+          //   trigger: 'change'
+          // }, ],
           idCardPhotoFront: [{
             required: true,
             message: '请输入身份证照片(正面)',
@@ -29,9 +29,9 @@
 	            </el-form-item>
 	            <el-form-item
 	              label="经营主体"
-	              prop="AuthenType"
+	              prop="authenType"
 	            >
-	  		<div>{{shopDetails.AuthenType==2?'个体工商户':'企业'}}</div>
+	  		<div>{{shopDetails.authenType==2?'个体工商户':'企业'}}</div>
 	            </el-form-item>
@@ -2,10 +2,10 @@
 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
 // const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
-const DOMAIN_PREFIXPING = 'http://128.10.249.32:9003' 
-const DOMAIN_PREFIX = 'http://128.10.249.32:9007'
-// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
-// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
+// const DOMAIN_PREFIXPING = 'http://128.10.249.32:9003' 
+// const DOMAIN_PREFIX = 'http://128.10.249.32:9007'
+const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
+const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
 const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
@@ -47,7 +47,7 @@ module.exports = {
 	terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
 	SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' ,
 	// 'https://jy.scjysm.asia:18086/cdwlMall/settled-merchant', //商家入驻链接
-	
+	// SettledMerchantPrefix:'http://localhost:8082',
 	shareLink: TIAOZHUAN + 'meh5', // 分享地址
 	// shareLink: 'http://172.16.61.123:9007/h5', // 分享地址
@@ -136,7 +136,7 @@
 				}
 				// console.log(this.commentImgs,'fffffffffffffffff')
 				// return
-				let data = [{
+				let data ={
 					orderId:this.orderId,
 					skuId:this.commentData.skuId,
 					productId:this.commentData.productId,
@@ -146,7 +146,7 @@
 					des:this.descStar,
 					delivery:this.logisticsStar,
 					attitude:this.serviceStar
-				}]
+				}
 				NET.request(API.Comment, {
 					params:data
@@ -12,7 +12,7 @@
 			<view class="evaluate-contentbox mar-top-20" v-for="(item,index) in commentList" :key="index">
 				<view class="evaluate-content flex-items flex-row flex-sp-between">
 					<view class="flex-items">
-						<image class="user-headSmallImg" :src="item.headImage"></image>
+						<image class="user-headSmallImg" :src="$baseURL+item.headImage"></image>
             <view class="">
               <text class="fs28 mar-left-20">{{item.name}}</text>
               <view class="mar-left-20 fs22 font-color-999 mar-top-10">
@@ -9,7 +9,7 @@
 				 <view class="time">
 				 	{{tableList.releaseTime}}
 				 </view>
-				 <view class="desc">
+				 <view class="desc" style="white-space: normal; word-wrap: break-word;">
 				 	<u-parse :html="tableList.announcementContent"></u-parse>
 				 </view>
@@ -8,13 +8,13 @@ import uView from &quot;uview-ui&quot;;
 import DialogBox from './components/DialogBox/DialogBox';
 //  let hostall = window.location.href;
 // let c1 = hostall.split('cdwlMall')[0];
-let c1 = 'https://jy.scjysm.asia:18086/'
-// let c1 = 'https://zhgw-uat.028wlkj.com/'
+// let c1 = 'https://jy.scjysm.asia:18086/'
+let c1 = 'https://zhgw-uat.028wlkj.com/'
 Vue.config.productionTip = false
 Vue.prototype.$http = http
 Vue.prototype.$imgUrl = (url) => {
-  return (c1 + "cdwlMall/questionnaire/file/static" + url);
-  // return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
+  // return (c1 + "cdwlMall/questionnaire/file/static" + url);
+  return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
 }
 Vue.prototype.$img = c1+ 'cdwlMall'
 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
@@ -169,6 +169,14 @@
 			}
 		},
 		{
+			"path": "pages/mycreated/actList",
+			"style": {
+				"navigationBarTitleText": "报名名单",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
 			"path": "pages/record/record",
 			"style": {
 				"navigationBarTitleText": "申请记录",
@@ -443,6 +451,13 @@
 				}
 			},
 			{
+				"path": "gongao/gongaoList",
+				"style": {
+					"navigationBarTitleText": "公告列表",
+					"navigationBarBackgroundColor": "#FFFFFF"
+				}
+			},
+			{
 				"path": "myZiyuan/myZiDetailsnew",
 				"style": {
 					"navigationBarBackgroundColor": "#FFFFFF",
@@ -22,9 +22,9 @@
 					</swiper-item>
 				</swiper>
 			</view>
-			<view class="bg-white">
+			<view class="bg-white" @click="gongList()">
 				<view class="notice-content">
-					<view class="notice-left">
+					<view class="notice-left" >
 						<view>
 							<image :src="$imgUrl('/home1.png')"></image>
 						</view>
@@ -33,8 +33,9 @@
 					<view class="notice-right" v-if="procedureData.length == 0">
 						暂无公告
 					</view>
+					 <!-- @click="gaozhi(item)" -->
 					<view class="notice-right">
-						<view class="notice-right-content" @click="gaozhi(item)" v-for="(item,index) in procedureData">
+						<view class="notice-right-content" v-for="(item,index) in procedureData">
 							<view class="notice-icon">公告</view>
 							<view class="notice-text" style="padding-top:4rpx"> {{item.announcementTitle}}</view>
 						</view>
@@ -645,6 +646,11 @@
 				})
 			},
+			gongList(){
+				uni.navigateTo({
+					url: `/pagesA/gongao/gongaoList`
+				})
+			},
 			details(item) {
 				let items = JSON.stringify(item)
 				if (this.current == 0 || this.current == 1) {
+<template>
+    <view class="pages">
+        <view v-if="tableList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
+        <view class="contents">
+            <view class="box" v-for="(item,index) in tableList" :key="index">
+                <view style="width:50%">
+                    <view class="title">
+                        姓名：{{item.signUpName}}
+                    </view>
+                    <view class="desc">
+                        <view>手机号：{{item.signUpPhone}}</view>
+                    </view>
+                </view>
+                <view class="more">
+                    <view class="icon-more">{{item.signUpTime}}</view>
+                </view>
+            </view>
+        </view>
+        <!-- 加载提示 -->
+        <view v-if="isLoading" style="text-align: center; padding: 20rpx;">加载中...</view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            tableList: [],
+            pageindex: {
+                activityApplicationId: '',
+                pageNumber: 0,
+                pageSize: 20,
+            },
+            isLoading: false, // 加载状态
+        };
+    },
+    onLoad(option) {
+        this.pageindex.activityApplicationId = option.ids
+        this.getALL();
+    },
+    onReachBottom() {
+        // 滚动到底部时加载更多数据
+        this.loadMoreData();
+    },
+    methods: {
+
+        getALL() {
+            this.isLoading = true;
+            this.$http.sendRequest('/cereActivityApplicationSignUp/queryByPage', 'POST', this.pageindex, 1).then(res => {
+                this.tableList = res.data.data.content;
+                this.isLoading = false;
+            });
+        },
+        loadMoreData() {
+            if (this.isLoading) return; // 如果正在加载，不重复请求
+            this.isLoading = true;
+            this.pageindex.pageNumber++;
+            this.$http.sendRequest('/cereActivityApplicationSignUp/queryByPage', 'POST', this.pageindex, 1).then(res => {
+                this.tableList = this.tableList.concat(res.data.data.content);
+                this.isLoading = false;
+            });
+        },
+    },
+};
+</script>
+
+
+<style lang="scss" scoped>
+	.more{
+		text-align: right;
+		.more-num {
+			display: inline-block;
+			background-color: #f04746;
+			border-radius: 100rpx;
+			color: #fff;
+			font-size: 20rpx;
+			width: 36rpx;
+			height: 36rpx;
+			text-align: center;
+			line-height: 36rpx;
+		}
+		.icon-more {
+			margin-top: 14rpx;
+			font-size: 28rpx;
+			color: #afafaf;
+		}
+	}
+	.pages {
+		width: 100vw;
+		height: 100%;
+		position: relative;
+		overflow-y: auto;
+		background-color: #f6f6f6;
+
+		.contents {
+			width: 100%;
+
+			background-color: #fff;
+			margin-top: 20rpx;
+
+			.box {
+				width: 94%;
+				margin: 0 auto;
+				padding: 28rpx 0;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.title {
+					font-size: 28rpx;
+					font-weight: bold;
+				}
+
+				.time {
+					margin: 20rpx 0;
+					color: #888D9C;
+					font-size: 24rpx;
+				}
+
+				.desc {
+					color: #888D9C;
+					font-size: 24rpx;
+					text-align: justify;
+					margin-top: 10px;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 1;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+	}
+</style>
 \ No newline at end of file
@@ -55,6 +55,7 @@
 						<u-button type="info" size="mini" @click="tijiao('1',v.id)" v-if="v.auditStatus == '2'" style="margin-right: 22rpx;">撤回</u-button>
 						<u-button type="info" size="mini" @click="bianji(v.id)" v-if="v.auditStatus == '1'" style="margin-right: 22rpx;">编辑</u-button>
 						<u-button type="info" size="mini" @click="generatePoster(v.id)" v-if="v.auditStatus == '3'" style="margin-right: 22rpx;">显示二维码</u-button>
+						<u-button type="info" size="mini" @click="getList(v.id)" v-if="v.auditStatus == '3'" style="margin-right: 22rpx;">报名名单</u-button>
 						<u-button type="info" size="mini" @click="delact(v.id)" v-if="v.auditStatus == '1'" style="margin-right: 22rpx;">删除</u-button>
 					</view>
 				</view>
@@ -224,6 +225,11 @@
 					//请求失败
 				})
 			},
+			getList(ids){
+				uni.navigateTo({
+					url: `/pages/mycreated/actList?ids=${ids}`
+				})
+			},
 		}
 	}
 </script>
@@ -310,10 +310,10 @@
 		},
 		methods: {
 			async toPath1(path) {
-				let c1 = uni.getStorageSync('user').phone
+				let h1 = uni.getStorageSync('user').phone
 				// let c1 = '18188305496'
 				await this.$http.sendRequest('/check/getAll', 'POST', {
-					"shopPhone": c1,
+					"shopPhone": h1,
 					"checkState": "1",
 					"page": 1,
 					"pageSize": 1
@@ -325,14 +325,108 @@
 						uni.setStorageSync('shopId', '');
 					}
 				})
-				uni.navigateTo({
-					url: path,
+				await this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
+					"pageSize": 10,
+					pageNumber: 0,
+					phone: uni.getStorageSync('user').phone
+				}).then(res => {
+					if (res.data.code == '20004' || res.data.code == '20003') {
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+					}
+					if (res.data.data.content.length > 0) {
+						let c1 = res.data.data.content[0]
+					console.log(c1.checkState,'checkState')
+						if (c1.checkState == '1') {
+							uni.showToast({
+								icon: 'none',
+								title: '商家申请正在审核中',
+								duration: 3000
+							});
+						} else if (c1.checkState == '3') {
+							uni.showToast({
+								icon: 'none',
+								title: '商家申请审核已被拒绝 请重新提交',
+								duration: 3000
+							});
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '/pagesA/leaseAdd/leaseAdd'
+								})
+							}, 3000)
+						} else if (c1.checkState == '2') {
+							uni.navigateTo({
+								url: path,
+							})
+						}
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: '请先申请成为商家',
+							duration: 3000
+						});
+						setTimeout(() => {
+							uni.navigateTo({
+								url: '/pagesA/leaseAdd/leaseAdd'
+							})
+						}, 3000)
+					}
 				})
+				
+			
+			
 			},
 			toPath(path) {
-				uni.navigateTo({
-					url: path,
+				 this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
+					"pageSize": 10,
+					pageNumber: 0,
+					phone: uni.getStorageSync('user').phone
+				}).then(res => {
+					if (res.data.code == '20004' || res.data.code == '20003') {
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+					}
+					if (res.data.data.content.length > 0) {
+						let c1 = res.data.data.content[0]
+					console.log(c1.checkState,'checkState')
+						if (c1.checkState == '1') {
+							uni.showToast({
+								icon: 'none',
+								title: '商家申请正在审核中',
+								duration: 3000
+							});
+						} else if (c1.checkState == '3') {
+							uni.showToast({
+								icon: 'none',
+								title: '商家申请审核已被拒绝 请重新提交',
+								duration: 3000
+							});
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '/pagesA/leaseAdd/leaseAdd'
+								})
+							}, 3000)
+						} else if (c1.checkState == '2') {
+							uni.navigateTo({
+								url: path,
+							})
+						}
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: '请先申请成为商家',
+							duration: 3000
+						});
+						setTimeout(() => {
+							uni.navigateTo({
+								url: '/pagesA/leaseAdd/leaseAdd'
+							})
+						}, 3000)
+					}
 				})
+				
 			},
 		}
 	}
+<template>
+	<view class="pages">
+		<view v-if="tableList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
+		<view class="contents">
+			<view class="box" v-for="(item,index) in tableList" @click="getDetail(item)">
+				<view style="width:70%">
+					<view class="title">
+						{{item.announcementTitle}}
+					</view>
+					<view class="desc">
+						<view v-html="item.announcementContent"></view>
+					</view>
+				</view>
+				<view class="more">
+					<view class="more-num" v-if="item.isRead == '0'">1</view>
+					<view class="icon-more">{{formatDateTime(item.releaseTime)}}</view>
+				</view>
+				<!-- 	<view class="time">
+					{{formatDateTime(item.createTime)}}
+				</view> -->
+
+			</view>
+		</view>
+		<view v-if="isLoading" style="text-align: center; padding: 20rpx;">加载中...</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tableList: [],
+				pageindex: {
+					pageNumber: 0,
+					pageSize: 20,
+				},
+				isLoading:false
+			}
+		},
+		onLoad(option) {
+
+		},
+		onShow(option) {
+
+		},
+		mounted() {
+			this.getALL()
+		},
+		methods: {
+			formatDateTime(dateTimeString) {
+				// 将输入的日期时间字符串转换为Date对象
+				const inputDate = new Date(dateTimeString);
+				const now = new Date();
+
+				// 获取年、月、日来进行比较
+				const inputYear = inputDate.getFullYear();
+				const inputMonth = inputDate.getMonth();
+				const inputDay = inputDate.getDate();
+
+				const currentYear = now.getFullYear();
+				const currentMonth = now.getMonth();
+				const currentDay = now.getDate();
+
+				// 检查输入的日期是否为今天
+				const isToday = (inputYear === currentYear) && (inputMonth === currentMonth) && (inputDay === currentDay);
+
+				// 格式化时间为HH:mm
+				const hours = inputDate.getHours().toString().padStart(2, '0');
+				const minutes = inputDate.getMinutes().toString().padStart(2, '0');
+				const timeString = `${hours}:${minutes}`;
+
+				// 如果是今天，则在时间前面加上'今天'
+				return isToday ? `今天${timeString}` : timeString;
+			},
+			onReachBottom() {
+			    // 滚动到底部时加载更多数据
+			    this.loadMoreData();
+			},
+			getALL() {
+				this.isLoading = true;
+				this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', this.pageindex, 1).then(res => {
+					
+					this.tableList = res.data.data.content
+					this.isLoading = false;
+				})
+			},
+			loadMoreData() {
+			    if (this.isLoading) return; // 如果正在加载，不重复请求
+			    this.isLoading = true;
+			    this.pageindex.pageNumber++;
+			   this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', this.pageindex, 1).then(res => {
+			        this.tableList = this.tableList.concat(res.data.data.content);
+			        this.isLoading = false;
+			    });
+			},
+			getDetail(items) {
+				uni.navigateTo({
+					url: `/pages/procedure/procedure?item=${encodeURIComponent(JSON.stringify(items))}`
+					// url: `/pagesA/procedureList/procedureDetail?item=${encodeURIComponent(JSON.stringify(item))}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.more {
+		text-align: right;
+
+		.more-num {
+			display: inline-block;
+			background-color: #f04746;
+			border-radius: 100rpx;
+			color: #fff;
+			font-size: 20rpx;
+			width: 36rpx;
+			height: 36rpx;
+			text-align: center;
+			line-height: 36rpx;
+		}
+
+		.icon-more {
+			margin-top: 14rpx;
+			font-size: 28rpx;
+			color: #afafaf;
+		}
+	}
+
+	.pages {
+		width: 100vw;
+		height: 100%;
+		position: relative;
+		overflow-y: auto;
+		background-color: #f6f6f6;
+
+		.contents {
+			width: 100%;
+
+			background-color: #fff;
+			margin-top: 20rpx;
+
+			.box {
+				width: 94%;
+				margin: 0 auto;
+				padding: 28rpx 0;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.title {
+					font-size: 30rpx;
+					font-weight: bold;
+				}
+
+				.time {
+					margin: 20rpx 0;
+					color: #888D9C;
+					font-size: 24rpx;
+				}
+
+				.desc {
+					color: #888D9C;
+					font-size: 24rpx;
+					text-align: justify;
+					margin-top: 10px;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 1;
+					overflow: hidden;
+					text-overflow: ellipsis;
+
+				}
+			}
+		}
+	}
+</style>
 \ No newline at end of file
@@ -110,12 +110,31 @@
 				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 			},
 			go() {
-				console.error(this.fileList1)
-				console.error(this.fileList2)
-				
+				if (!this.model1.idCardNumber) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入身份证号码'
+					});
+					return false;
+				}
+	
 				this.model1.applyTime = this.getCurrentTime()
 				this.model1.idCardFrontImage = this.fileList1.join(',')
 				this.model1.idCardBackImage = this.fileList2.join(',')
+				if (!this.model1.idCardFrontImage) {
+					uni.showToast({
+						icon: 'none',
+						title: '请上传身份证照片'
+					});
+					return false;
+				}
+				if (!this.model1.idCardBackImage) {
+					uni.showToast({
+						icon: 'none',
+						title: '请上传身份证照片'
+					});
+					return false;
+				}
 				this.model1.username = this.model1.name
 				this.model1.phone = uni.getStorageSync('user').phone
 				console.error({
@@ -224,7 +224,7 @@
 		},
 		onLoad(options) {
 			this.imgurl = this.$img
-			const item = JSON.parse(decodeURIComponent(options.item));
+			const item = JSON.parse(decodeURIComponent(options.item))
 			console.log(options.item, '1123123213')
 			this.record = item
 			let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
 //  let hostall = window.location.href;
 // let c1 = hostall.split('cdwlMall')[0];
-let c1 = 'https://jy.scjysm.asia:18086/'
-// let c1 = 'https://zhgw-uat.028wlkj.com/'
+// let c1 = 'https://jy.scjysm.asia:18086/'
+let c1 = 'https://zhgw-uat.028wlkj.com/'
 //封装request请求
 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	//判断header提交数据类型
@@ -21,17 +21,17 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
-		// bases = 'http://128.10.249.31:9003'+ url;
+		bases = 'http://128.10.249.25:9003'+ url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
-		bases = c1 + 'cdwlMall/meserver/admin-server' + url; 
+		// bases = c1 + 'cdwlMall/meserver/admin-server' + url; 
 	}else if(baseUrl == 3){
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
 		// bases = 'http://128.10.249.22:9003:9007' + url;
-		// bases = 'http://128.10.249.23:9007' + url;
-		bases = c1 + 'cdwlMall/meserver/api' + url;
+		bases = 'http://128.10.249.25:9007' + url;
+		// bases = c1 + 'cdwlMall/meserver/api' + url;
 	}else{
 		// bases = 'http://128.10.249.22:9004' + url;
@@ -39,9 +39,9 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
-		// bases = 'http://128.10.249.31:9004' + url;
+		bases = 'http://128.10.249.25:9004' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
-		bases = c1 + 'cdwlMall/business-server' + url;
+		// bases = c1 + 'cdwlMall/business-server' + url;
 	}
 	var token = uni.getStorageSync('token') || '';
@@ -21,7 +21,7 @@ let PREFIX;
   // PREFIX = 'http://8.130.38.56:8027/business-server';
   PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server';
   // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
-  // PREFIX = 'http://128.10.249.31:9004';
+  // PREFIX = 'http://128.10.249.32:9004';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
@@ -3,19 +3,18 @@ import home from &#39;./home&#39;
 const host = `${window.location.protocol}//${window.location.host}`
 const TIAOZHUAN = `${host}/cdwlMall/meserver/`
 // 获取当前环境变量 true => 生产环境 false => 开发环境
-const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : TIAOZHUAN + 'api'
-// const upUrl = (process.env.NODE_ENV === 'production') ? `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/admin-server` : 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
-const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : TIAOZHUAN + 'admin-server'
+const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
+const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
 export const api = {
-  // 登录模块
-  ...home(BASEURL),
-  // 图片上传
-  upload: `${upUrl}/miniio/uploadQuestion`,
-  // 商家入驻
-  enterpriseCheck: `${BASEURL}/check/enterpriseCheck`,
-  individualCheck: `${BASEURL}/check/individualCheck`,
-  organizationsCheck: `${BASEURL}/check/organizationsCheck`,
-  personalCheck: `${BASEURL}/check/personalCheck`,
-  getByName: `${BASEURL}/app/getSelect`
+	// 登录模块
+	...home(BASEURL),
+	// 图片上传
+	upload: `${upUrl}/miniio/uploadQuestion`,
+	// 商家入驻
+	enterpriseCheck: `${BASEURL}/check/enterpriseCheck`,
+	individualCheck: `${BASEURL}/check/individualCheck`,
+	organizationsCheck: `${BASEURL}/check/organizationsCheck`,
+	personalCheck: `${BASEURL}/check/personalCheck`,
+	getByName: `${BASEURL}/app/getSelect`
 }
 export default api
@@ -232,7 +232,8 @@ export default {
         enterpriseCardStartTime: '', // 证件有效开始时间
         enterpriseCardEndTime: '', // 证件有效结束时间
         enterpriseCardPositive: '', // 身份证正面照
-        enterpriseCardSide: '' // 身份证反面照
+        enterpriseCardSide: '' ,// 身份证反面照
+		merchantType: '线上商家' 
       },
       idCardList: [],
       dictName: '证件类型',
@@ -232,7 +232,8 @@ export default {
         subjectCardStartTime: '', // 证件有效开始时间
         subjectCardEndTime: '', // 证件有效结束时间
         subjectCardPositive: '', // 身份证正面照
-        subjectCardSide: '' // 身份证反面照
+        subjectCardSide: '' ,// 身份证反面照
+		merchantType: '线上商家' 
       },
       idCardList: [],
       dictName: '证件类型',
@@ -230,7 +230,8 @@ export default {
         otherCardStartTime: '', // 证件有效开始时间
         otherCardEndTime: '', // 证件有效结束时间
         otherCardPositive: '', // 身份证正面照
-        otherCardSide: '' // 身份证反面照
+        otherCardSide: '' ,// 身份证反面照
+		merchantType: '线上商家' 
       },
       idCardList: [],
       dictName: '证件类型',
@@ -186,7 +186,8 @@ export default {
         personalCardEndTime: '', // 证件有效结束时间
         personalCardPositive: '', // 身份证正面照
         personalCardSide: '', // 身份证反面照
-        personalCardHand: '' // 手持证件照
+        personalCardHand: '' ,// 手持证件照
+		merchantType: '线上商家' 
       },
       idCardList: [],
       dictName: '证件类型',
@@ -284,7 +284,8 @@ export default {
         enterpriseCardStartTime: '', // 证件有效开始时间
         enterpriseCardEndTime: '', // 证件有效结束时间
         enterpriseCardPositive: '', // 身份证正面照
-        enterpriseCardSide: '' // 身份证反面照
+        enterpriseCardSide: '' ,// 身份证反面照
+		merchantType: '线上商家' 
       },
       idCardList: [],
       dictName: '证件类型',
@@ -283,7 +283,8 @@ export default {
         otherCardStartTime: '', // 证件有效开始时间
         otherCardEndTime: '', // 证件有效结束时间
         otherCardPositive: '', // 身份证正面照
-        otherCardSide: '' // 身份证反面照
+        otherCardSide: '' ,// 身份证反面照
+		merchantType: '线上商家' 
       },
       idCardList: [],
       dictName: '证件类型',
@@ -206,7 +206,8 @@ export default {
         personalCardEndTime: '', // 证件有效结束时间
         personalCardPositive: '', // 身份证正面照
         personalCardSide: '', // 身份证反面照
-        personalCardHand: '' // 手持证件照
+        personalCardHand: '' ,// 手持证件照
+		merchantType: '线上商家' 
       },
       idCardList: [],
       dictName: '证件类型',
@@ -287,7 +287,8 @@ export default {
         subjectCardStartTime: '', // 证件有效开始时间
         subjectCardEndTime: '', // 证件有效结束时间
         subjectCardPositive: '', // 身份证正面照
-        subjectCardSide: '' // 身份证反面照
+        subjectCardSide: '' ,// 身份证反面照
+		merchantType: '线上商家' 
       },
       idCardList: [],
       dictName: '证件类型',