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

杨鑫
2 parents 048313b9 e75eb290
Showing 15 changed files with 915 additions and 223 deletions
wenjuan/.editorconfig
yslvdao-miniapp/main.js
yslvdao-miniapp/manifest.json
yslvdao-miniapp/pages.json
yslvdao-miniapp/pages/accepting/accepting.vue
yslvdao-miniapp/pages/advertisementAdd/advertisementAdd - 副本 (2).vue
yslvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
yslvdao-miniapp/pages/home/home.scss
yslvdao-miniapp/pages/home/home.vue
yslvdao-miniapp/pages/leaseAdd/leaseAdd.vue
yslvdao-miniapp/pages/login/login.scss
yslvdao-miniapp/pages/my/my.vue
yslvdao-miniapp/pages/record/record.scss
yslvdao-miniapp/utils/request.js
yslvdao-miniapp/utils/rsaEncrypt.js
@@ -7,7 +7,7 @@ indent_style = space
 indent_size = 2
 end_of_line = lf
 insert_final_newline = true
-trim_trailing_whitespace = true
+trim_trailing_whitespace = true 
 [*.md]
 insert_final_newline = false
 import Vue from 'vue';
 import App from './App';
 import http from '@/utils/request.js'
-
 import uView from "uview-ui";
-
+// import {decrypt,encrypt} from '@/utils/rsaEncrypt.js'
 // 弹出框
 import DialogBox from './components/DialogBox/DialogBox';
 Vue.config.productionTip = false
 Vue.prototype.$http = http
+// Vue.prototype.$decrypt = decrypt
 Vue.prototype.$imgUrl = (url) => {
   return ("https://jy.scjysm.asia:18086/mefile/file/static" + url);
 }
-// Vue.prototype.$upload = "http://172.16.61.48/admin-server/file/upload"
-Vue.prototype.$upload = "https://jy.scjysm.asia:18086/admin-server/file/upload"
+// Vue.prototype.$upload = "http://172.16.61.48/admin-server/file/upload"
+// Vue.prototype.$upload = "https://jy.scjysm.asia:18086/admin-server/file/upload"
+// Vue.prototype.$upload = "http://192.168.8.106:9003/miniio/upload"
+Vue.prototype.$upload  = "https://jy.scjysm.asia:18086/admin-server/miniio/upload"
+Vue.prototype.$img = "http://172.16.61.48/cdwlMall"
 // 全局组件
 Vue.component('DialogBox', DialogBox);
 {
     "name" : "绿道",
-    "appid" : "__UNI__F034047",
+    "appid" : "__UNI__93E0C91",
     "description" : "",
     "versionName" : "1.0.2",
     "versionCode" : "100",
@@ -376,6 +376,19 @@
   ],
+  "subpackages": [{
+  	"root": "pagesA",
+  	"name": "pagesA",
+  	"pages": [
+  		{
+  			"path": "leaseAdd/leaseAdd",
+  			"style": {
+  				"navigationBarBackgroundColor": "#FFFFFF",
+  				"navigationBarTitleText": "商家入驻"
+  			}
+  		}
+  	]	
+  }],
   "globalStyle": {
     "navigationBarTextStyle": "black"
   },
@@ -19,7 +19,7 @@
 							record.cereBasicInformationShop&&record.cereBasicInformationShop.detailedLocation?record.cereBasicInformationShop.detailedLocation:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.detailedLocation?record.cereBasicInformationVenue.detailedLocation:''
 							}}</text>
 					</view>
-					<view class="info-item" style="margin-bottom: 24rpx;" v-if="record.advertisingSpaceType">
+		<!-- 			<view class="info-item" style="margin-bottom: 24rpx;" v-if="record.advertisingSpaceType">
 						<text style="padding-right: 20rpx;">广告位类型：</text>
 						<text>{{record.advertisingSpaceType?record.advertisingSpaceType:''
 							}}</text>
@@ -28,7 +28,7 @@
 						<text style="padding-right: 20rpx;" v-if="!record.advertisingSpaceType">租金：<span>￥1067/月</span></text>
 						<text style="padding-right: 20rpx;" v-if="record.advertisingSpaceType">租金：<span>￥1067/天</span></text>
 						<text v-if="!record.advertisingSpaceType">面积：<span>81/m²</span></text>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -64,7 +64,7 @@
 			</view>
 			<view class="form-item" v-if="!record.advertisingSpaceType">
 				<view class="label">经营主体</view>
-				<text>{{record.operatingEntity}}</text>
+				<text style="">{{record.operatingEntity}}</text>
 			</view>
 			<!-- 广告显示 -->
 			<view class="form-item" label-top v-if="record.advertisingSpaceType">
@@ -85,22 +85,40 @@
 			</view>
 			<view class="form-item">
 				<view class="label">身份证号码</view>
-				<text>{{record.idNumber || record.idCardNumber}}</text>
+				<text>{{ record.idNumber || record.idCardNumber}}</text>
+				<!-- <text>{{$sm4.SM4Util(record.idCardNumber) }}</text> -->
 			</view>
 			<view class="form-item">
 				<view class="label">身份证有效期</view>
 				<text>{{record.idValidStart || record.idCardValidStart}}至 {{record.idValidEnd || record.idCardValidEnd}}</text>
 			</view>
-			<view class="form-item" label-top>
-				<view class="label">身份证照片</view>
+<!-- 			<view class="form-item" label-top>
+				<view class="label">身份证正面</view>
 				<view class="deom-box">
 					<view class="img-deom">
-						<u-image width="304rpx" height="182rpx"  :src="record.idPhotoFront || record.idCardPhotoFront"></u-image>
+						<u-image width="304rpx" height="182rpx"  :src="record.idPhotoBack || record.idCardPhotoBack"></u-image>
 					</view>
+				</view>
+			</view>
+			<view class="form-item" label-top>
+				<view class="label">身份证反面</view>
+				<view class="deom-box">
 					<view class="img-deom">
 						<u-image width="304rpx" height="182rpx"  :src="record.idPhotoBack || record.idCardPhotoBack"></u-image>
 					</view>
 				</view>
+			</view> -->
+			<view class="form-item" label-top>
+				<view class="label">身份证正面</view>
+				<view class="img">
+					<u-image width="304rpx" height="182rpx" :src="record.idPhotoFront || record.idCardPhotoFront" ></u-image>
+				</view>
+			</view>
+			<view class="form-item" label-top>
+				<view class="label">身份证反面</view>
+				<view class="img">
+					<u-image width="304rpx" height="182rpx" :src="record.idPhotoBack || record.idCardPhotoBack" ></u-image>
+				</view>
 			</view>
 			<view class="form-item" label-top>
 				<view class="label">企业授权书</view>
@@ -125,6 +143,7 @@
 </template>
 <script>
+	// import {decryptedSM4} from '@/utils/rsaEncrypt.js'
 	export default {
 		data() {
 			return {
@@ -132,11 +151,23 @@
 			}
 		},
-		 onLoad(options) {
+		async onLoad(options) {
 		    const item = JSON.parse(decodeURIComponent(options.item));
 		    console.log('Received item:', item);
 			this.record = item
-		  },
+			if(this.record.idNumber) {
+				this.record.idNumber = await this.$http.sendRequest('/cereBusinessInfo/decode?str='+this.record.idNumber, 'GET',this.record.idNumber, 1).then(res => {
+					console.error(res.data.data)
+					return res.data.data
+				})
+			}
+			// if(this.record.idCardNumber) {
+			// 	this.record.idCardNumber = await this.$http.sendRequest('/cereBusinessInfo/decode?str='+this.record.idCardNumber, 'GET',this.record.idNumber, 1).then(res => {
+			// 		console.error(res.data.data)
+			// 		return res.data.data
+			// 	})
+			// }
+		},
 		methods: {
 			Zhicheck(){
 				let payList ={
@@ -187,4 +218,8 @@
 <style scoped lang="scss">
 	@import 'accepting.scss';
+	text {
+		text-align: right;
+		word-wrap:break-word; word-break:break-all;width: 50%;line-height: 40rpx;
+	}
 </style> 
+<template>
+	<view class="page">
+		<view class="steps-box">
+			<u-steps :list="numList" :current="active"></u-steps>
+		</view>
+		<view>
+			<view v-show="active == 0">
+				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
+					<view class="add-list">
+						<u-form-item label="投放时段" prop="scheduleTime" borderBottom>
+							<!-- <u-input v-model="model1.name" type="select" @click="toChangeTime"></u-input> -->
+							<u-input v-model="model1.scheduleTime" type="select" @click="TimeStratshow = true"
+								placeholder="请选择" />
+							<u-picker mode="time" v-model="TimeStratshow" :params="params"
+								@confirm="startTimeChange"></u-picker>
+						</u-form-item>
+					</view>
+					<view class="add-list">
+						<u-form-item label="跳转类型" prop="advertisementContent" borderBottom>
+							<u-input v-model="model1.advertisementContent"></u-input>
+						</u-form-item>
+						<u-form-item label="链接" prop="redirectUrl" borderBottom>
+							<u-input v-model="model1.redirectUrl"></u-input>
+						</u-form-item>
+						<u-form-item label="投放定价" prop="cpc" borderBottom>
+							<u-input v-model="model1.cpc"></u-input>
+						</u-form-item>
+					</view>
+					<view class="add-list">
+						<u-form-item label="封面图片" prop="coverImage" borderBottom labelPosition="top">
+							<u-upload :action="$upload" :auto-upload="true" ref="coverImage" :max-count="1"></u-upload>
+						</u-form-item>
+					</view>
+					<view class="add-list">
+						<u-form-item label="广告标题" prop="adTitle" borderBottom labelPosition="top">
+							<u-input v-model="model1.adTitle" />
+						</u-form-item>
+					</view>
+						
+				</u-form>
+			</view>
+
+
+
+
+			<view class="add-list" v-show='active == 1'>
+				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
+					<u-form-item label="主体名称" prop="subjectName" borderBottom>
+						<u-input v-model="model1.subjectName"></u-input>
+					</u-form-item>
+					<u-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode" borderBottom>
+						<u-input v-model="model1.unifiedSocialCreditCode"></u-input>
+					</u-form-item>
+					<u-form-item label="类型" prop="type" borderBottom>
+						<u-input v-model="model1.type" type="select" @click="typeShow = true" placeholder='请选择类型' />
+					</u-form-item>
+					<u-form-item label="法定代表人" prop="legalRepresentative" borderBottom>
+						<u-input v-model="model1.legalRepresentative"></u-input>
+					</u-form-item>
+					<u-form-item label="经营范围" prop="businessScope" borderBottom>
+						<u-input v-model="model1.businessScope"></u-input>
+					</u-form-item>
+					<u-form-item label="注册资本" prop="registeredCapital" borderBottom>
+						<u-input v-model="model1.registeredCapital"></u-input>
+					</u-form-item>
+					<u-form-item label="成立日期" prop="establishmentDate" borderBottom>
+						<u-input v-model="model1.establishmentDate"></u-input>
+					</u-form-item>
+					<u-form-item label="住所" prop="address" borderBottom>
+						<u-input v-model="model1.address"></u-input>
+					</u-form-item>
+					<u-form-item label="邮箱地址" prop="emailAddress" borderBottom>
+						<u-input v-model="model1.emailAddress"></u-input>
+					</u-form-item>
+					<u-form-item label="经营开始时间" prop="businessStartDate" borderBottom>
+						<u-input v-model="model1.businessStartDate" type="select" @click="busStartshow = true"
+							placeholder="请选择" />
+						<u-picker mode="time" v-model="busStartshow" :params="params"
+							@confirm="busStTimeChange"></u-picker>
+					</u-form-item>
+					<u-form-item label="经营结束时间" prop="businessEndDate" borderBottom>
+						<u-input v-model="model1.businessEndDate" type="select" @click="busEndtshow = true"
+							placeholder="请选择" />
+						<u-picker mode="time" v-model="busEndtshow" :params="params"
+							@confirm="busEndTimeChange"></u-picker>
+					</u-form-item>
+					<u-form-item label="营业执照" prop="businessLicense" borderBottom labelPosition="top">
+						<u-upload :action="$upload" :auto-upload="true" ref="businessLicense" :max-count="1"></u-upload>
+					</u-form-item>
+				</u-form>
+			</view>
+
+
+			<view v-show="active == 2">
+				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
+					<view class="add-list">
+						<u-form-item label="经营者姓名" prop="lesseeName" borderBottom>
+							<u-input v-model="model1.lesseeName"></u-input>
+						</u-form-item>
+						<u-form-item label="证件类型" prop="idCardType" borderBottom>
+							<u-input v-model="model1.idCardType" type="select" @click="IdtypeShow = true"
+								placeholder='请选择类型' />
+						</u-form-item>
+						<u-form-item label="身份证号码" prop="idCardNumber" borderBottom>
+							<u-input v-model="model1.idCardNumber"></u-input>
+						</u-form-item>
+						<u-form-item label="身份证有效开始时间" prop="idCardValidStart" borderBottom>
+							<u-input v-model="model1.idCardValidStart" type="select" @click="idCardStartshow = true"
+								placeholder="请选择" />
+							<u-picker mode="time" v-model="idCardStartshow" :params="params1"
+								@confirm="idCardStTimeChange"></u-picker>
+						</u-form-item>
+						<u-form-item label="身份证有效结束时间" prop="idCardValidEnd" borderBottom>
+							<u-input v-model="model1.idCardValidEnd" type="select" @click="idCardEndtshow = true"
+								placeholder="请选择" />
+							<u-picker mode="time" v-model="idCardEndtshow" :params="params1"
+								@confirm="idCardEndTimeChange"></u-picker>
+						</u-form-item>
+					</view>
+					<view class="add-list">
+						<view class="deom-box">
+							<view class="img-deom">
+								<u-upload :action="$upload" :custom-btn="true" :max-count="1" ref="idCardPhotoFront">
+									<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover"
+										hover-stay-time="150">
+										<u-image width="304rpx" height="182rpx"
+											:src="$imgUrl('/uploadID1.png')"></u-image>
+										</view>
+								</u-upload>
+								<text>点击上传证件人像面</text>
+							</view>
+							<view class="img-deom">
+								<u-upload :action="$upload" :custom-btn="true" :max-count="1" ref="idCardPhotoBack">
+									<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover"
+										hover-stay-time="150">
+										<u-image width="304rpx" height="182rpx"
+											:src="$imgUrl('/uploadID2.png')"></u-image>
+									</view>
+								</u-upload>
+								<text>点击上传证件国徽面</text>
+							</view>
+						</view>
+					</view>
+					<view class="add-list">
+						<view style="line-height: 60rpx;">上传示例</view>
+						<view class="deom-box">
+							<view class="img-deom">
+								<u-image width="304rpx" height="182rpx" :src="$imgUrl('/front-icon.png')"></u-image>
+								<text>人脸示例图</text>
+							</view>
+							<view class="img-deom">
+								<u-image width="304rpx" height="182rpx" :src="$imgUrl('/back-icon.png')"></u-image>
+								<text>国徽面示例图</text>
+							</view>
+						</view>
+					</view>
+					<text
+						style="display: inline-block; font-size: 24rpx; line-height: 30px; margin: 24rpx 30rpx 0;">请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。</text>
+					<view class="add-list" labelPosition="left" :model="model1" :rules="rules" ref="uForm"
+						:labelWidth="250">
+						<u-form-item label="是否为法人" prop="isLegalPerson" borderBottom>
+							<u-radio-group v-model="model1.isLegalPerson">
+								<u-radio name="1" value="1">是</u-radio>
+								<u-radio name="0" value="0">否</u-radio>
+							</u-radio-group>
+						</u-form-item>
+						<u-form-item label="企业授权书" prop="enterpriseAuthorization" borderBottom labelPosition="top">
+
+							<u-upload :action="$upload" :auto-upload="true" ref="enter" :max-count="1"></u-upload>
+						</u-form-item>
+					</view>
+				</u-form>
+			</view>
+		</view>
+
+		<u-select v-model="typeShow" :list="activesType" @confirm="typeChange"></u-select>
+		<u-select v-model="IdtypeShow" :list="idType" @confirm="IdtypeChange"></u-select>
+		<!-- 保存按钮 -->
+		<view class="page-footer">
+			<u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;" @click="toBefor"
+				v-if="active != 0">上一步</u-button>
+			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="toNext" v-if="active != 2">下一步</u-button>
+			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="go" v-if="active == 2">提交申请</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				active: 0,
+				numList: [{
+					name: '租赁信息'
+				}, {
+					name: '主体信息'
+				}, {
+					name: '经营者信息'
+				}],
+				model1: {
+					scheduleTime: '',
+					advertisementContent: '',
+					redirectUrl: '',
+					coverImage: '',
+					adTitle: '',
+					cpc:'',
+					subjectName: '',
+					unifiedSocialCreditCode: '',
+					type: '',
+					legalRepresentative: '',
+					businessScope: '',
+					registeredCapital: '',
+					establishmentDate: '',
+					address: '',
+					emailAddress: '',
+					businessStartDate: '',
+					businessEndDate: '',
+					businessLicense: '',
+					lesseeName: '',
+					idCardType: '',
+					idCardNumber: '',
+					idCardValidStart: '',
+					idCardValidEnd: '',
+					isLegalPerson: '0',
+					idCardPhotoFront:'',
+					idCardPhotoBack:'',
+					enterpriseAuthorization: '',
+					auditStatus: '1'
+				},
+				rules: {},
+				// 类型
+				showType: false,
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: true
+				},
+				params1: {
+					year: true,
+					month: true,
+					day: true
+				},
+				TimeStratshow: false,
+				typeShow: false,
+				activesType: [{
+					value: 1,
+					label: '个人'
+				}, {
+					value: 2,
+					label: '企业'
+				}],
+				idType: [{
+					value: 1,
+					label: '身份证'
+				}, ],
+				IdtypeShow: false,
+				busStartshow: false,
+				busEndtshow: false,
+				idCardStartshow: false,
+				idCardEndtshow: false,
+				params: {
+					year: true,
+					month: true,
+					day: true,
+				},
+				ziyuanId: '',
+				ziyuanType:'',
+
+			}
+		},
+		onLoad(option) {
+			this.ziyuanId = option.ids
+			this.ziyuanType = option.type
+		},
+		onShow() {
+		let shopId = {
+			shopId:uni.getStorageSync('shopId') || ''
+		}
+		  const isLogin = uni.getStorageSync('token');
+		  if (isLogin =='') { 
+		    // 如果未登录，跳转到登录页面
+		        	uni.navigateTo({
+		        	  url: '/pages/login/login'
+		        	})
+		  }else{
+			  let page={
+				condition:2
+			  }
+			 this.$http.sendRequest('/shop/getById', 'POST',shopId).then(res => {
+				 if(res.data.code !="20004"){
+					 this.shopMsg = res.data.data
+					 this.Islogin= false
+					 this.$http.sendRequest('/index/index', 'POST',page).then(res => {
+					 	//成功回调
+					 	this.tongji = res.data.data
+					 })
+				 }else{
+					 uni.navigateTo({
+					   url: '/pages/login/login'
+					 })
+				 }
+			 })
+		  }		
+		
+		},
+		methods: {
+			typeChange(e) {
+				this.model1.type = e[0].label;
+			},
+			 getCurrentTime() {
+			      const now = new Date();
+			      const year = now.getFullYear();
+			      const month = ('0' + (now.getMonth() + 1)).slice(-2);
+			      const day = ('0' + now.getDate()).slice(-2);
+			      const hours = ('0' + now.getHours()).slice(-2);
+			      const minutes = ('0' + now.getMinutes()).slice(-2);
+			      const seconds = ('0' + now.getSeconds()).slice(-2);
+			
+			      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			    },
+			go() {
+				let coverImg = []
+				let files = []
+				let idCardOne = []
+				let idCardTwo = []
+				let enterS  = []
+				// // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
+				coverImg = this.$refs.coverImage.lists.filter(val => {
+					return val.progress == 100;
+				})
+				coverImg.map(item => {
+					this.model1.coverImage = item.response.data.url
+				})
+				files = this.$refs.businessLicense.lists.filter(val => {
+					return val.progress == 100;
+				})
+				
+				files.map(item => {
+					this.model1.businessLicense = item.response.data.url
+				})
+				idCardOne = this.$refs.idCardPhotoFront.lists.filter(val => {
+					return val.progress == 100;
+				})
+				idCardOne.map(item => {
+					this.model1.idCardPhotoFront = item.response.data.url
+				
+				})
+				idCardTwo = this.$refs.idCardPhotoBack.lists.filter(val => {
+					return val.progress == 100;
+				})
+				idCardTwo.map(item => {
+					this.model1.idCardPhotoBack = item.response.data.url
+				})
+				enterS = this.$refs.enter.lists.filter(val => {
+					return val.progress == 100;
+				})
+				enterS.map(item => {
+					this.model1.enterpriseAuthorization = item.response.data.url
+				})
+				this.model1.rentalResourcesId = this.ziyuanId
+				this.model1.advertisingSpaceType = this.ziyuanType
+				this.model1.applicant = uni.getStorageSync('shopId')
+				this.model1.applicationTime = this.getCurrentTime()
+				this.$http.sendRequest('/cereAdvertiserInfo/add', 'POST', this.model1, 1).then(res => {
+					uni.navigateTo({
+						url: '/pages/record/record'
+					})
+				})
+			},
+			// toChangeTime(val) {
+			// 	uni.navigateTo({
+			// 		url: `/pages/advertisementTime/advertisementTime?val=${val}`
+			// 	})
+			// },
+			// 上一步
+			toBefor() {
+				this.active = +this.active - 1;
+			},
+			// 下一步
+			toNext() {
+				this.active = +this.active + 1;
+			},
+			startTimeChange(val) {
+				this.model1.scheduleTime = this.timeChange(val)
+			},
+			timeChange(val) {
+				const {
+					year,
+					month,
+					day,
+				} = val;
+				return `${year}-${month}-${day}`;
+			},
+			leiXpops(val) {
+				this.model1.intentionalBusinessType = val[0].label
+			},
+			busStTimeChange(val) {
+				this.model1.businessStartDate = this.timeChange(val)
+				this.model1.businessEndDate = ''
+			},
+			busEndTimeChange(val) {
+				const time = this.timeChange(val);
+				if (new Date(time).getTime() > new Date(this.model1.businessStartDate).getTime()) {
+					this.model1.businessEndDate = time
+				} else {
+					this.$refs.uToast.show({
+						title: '结束时间不能小于开始时间',
+						type: 'error',
+					})
+				}
+			},
+			idCardStTimeChange(val) {
+				this.model1.idCardValidStart = this.timeChange1(val)
+				this.model1.idCardValidEnd = ''
+			},
+			idCardEndTimeChange(val) {
+				const time = this.timeChange1(val);
+				if (new Date(time).getTime() > new Date(this.model1.idCardValidStart).getTime()) {
+					this.model1.idCardValidEnd = time
+				} else {
+					this.$refs.uToast.show({
+						title: '结束时间不能小于开始时间',
+						type: 'error',
+					})
+				}
+			},
+			IdtypeChange(e) {
+				this.model1.idCardType = e[0].label;
+			},
+			timeChange1(val) {
+				const {
+					year,
+					month,
+					day
+				} = val;
+				return `${year}-${month}-${day}`;
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'advertisementAdd.scss';
+</style>
 \ No newline at end of file
@@ -28,7 +28,9 @@
 					</view>
 					<view class="add-list">
 						<u-form-item label="封面图片" prop="coverImage" borderBottom labelPosition="top">
-							<u-upload :action="$upload" :auto-upload="true" ref="coverImage" :max-count="1"></u-upload>
+							<u-upload :action="$upload" :auto-upload="false" ref="businessLicense" :max-count="1"
+								@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'coverImage')"></u-upload>
+							<!-- <u-upload :action="$upload" :auto-upload="true" ref="coverImage" :max-count="1"></u-upload> -->
 						</u-form-item>
 					</view>
 					<view class="add-list">
@@ -36,7 +38,7 @@
 							<u-input v-model="model1.adTitle" />
 						</u-form-item>
 					</view>
-						
+
 				</u-form>
 			</view>
@@ -85,7 +87,9 @@
 							@confirm="busEndTimeChange"></u-picker>
 					</u-form-item>
 					<u-form-item label="营业执照" prop="businessLicense" borderBottom labelPosition="top">
-						<u-upload :action="$upload" :auto-upload="true" ref="businessLicense" :max-count="1"></u-upload>
+						<u-upload :action="$upload" :auto-upload="false" ref="businessLicense" :max-count="1"
+							@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'businessLicense')"></u-upload>
+						<!-- <u-upload :action="$upload" :auto-upload="true" ref="businessLicense" :max-count="1"></u-upload> -->
 					</u-form-item>
 				</u-form>
 			</view>
@@ -104,13 +108,13 @@
 						<u-form-item label="身份证号码" prop="idCardNumber" borderBottom>
 							<u-input v-model="model1.idCardNumber"></u-input>
 						</u-form-item>
-						<u-form-item label="身份证有效开始时间" prop="idCardValidStart" borderBottom>
+						<u-form-item label="有效开始时间" prop="idCardValidStart" borderBottom>
 							<u-input v-model="model1.idCardValidStart" type="select" @click="idCardStartshow = true"
 								placeholder="请选择" />
 							<u-picker mode="time" v-model="idCardStartshow" :params="params1"
 								@confirm="idCardStTimeChange"></u-picker>
 						</u-form-item>
-						<u-form-item label="身份证有效结束时间" prop="idCardValidEnd" borderBottom>
+						<u-form-item label="有效结束时间" prop="idCardValidEnd" borderBottom>
 							<u-input v-model="model1.idCardValidEnd" type="select" @click="idCardEndtshow = true"
 								placeholder="请选择" />
 							<u-picker mode="time" v-model="idCardEndtshow" :params="params1"
@@ -120,17 +124,21 @@
 					<view class="add-list">
 						<view class="deom-box">
 							<view class="img-deom">
-								<u-upload :action="$upload" :custom-btn="true" :max-count="1" ref="idCardPhotoFront">
+								<u-upload :action="$upload" :custom-btn="true"
+									@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'idCardPhotoFront')"
+									:auto-upload="false" :max-count="1" ref="idPhotoFront">
 									<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover"
 										hover-stay-time="150">
 										<u-image width="304rpx" height="182rpx"
 											:src="$imgUrl('/uploadID1.png')"></u-image>
-										</view>
+									</view>
 								</u-upload>
 								<text>点击上传证件人像面</text>
 							</view>
 							<view class="img-deom">
-								<u-upload :action="$upload" :custom-btn="true" :max-count="1" ref="idCardPhotoBack">
+								<u-upload :action="$upload" :custom-btn="true"
+									@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'idCardPhotoBack')"
+									:auto-upload="false" :max-count="1" ref="idPhotoBack">
 									<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover"
 										hover-stay-time="150">
 										<u-image width="304rpx" height="182rpx"
@@ -165,8 +173,10 @@
 							</u-radio-group>
 						</u-form-item>
 						<u-form-item label="企业授权书" prop="enterpriseAuthorization" borderBottom labelPosition="top">
-
-							<u-upload :action="$upload" :auto-upload="true" ref="enter" :max-count="1"></u-upload>
+							<u-upload :action="$upload" ref="enter" :max-count="1"
+								@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'enterpriseAuthorization')"
+								:auto-upload="false"></u-upload>
+							<!-- <u-upload :action="$upload" :auto-upload="true" ref="enter" :max-count="1"></u-upload> -->
 						</u-form-item>
 					</view>
 				</u-form>
@@ -203,7 +213,7 @@
 					redirectUrl: '',
 					coverImage: '',
 					adTitle: '',
-					cpc:'',
+					cpc: '',
 					subjectName: '',
 					unifiedSocialCreditCode: '',
 					type: '',
@@ -222,8 +232,8 @@
 					idCardValidStart: '',
 					idCardValidEnd: '',
 					isLegalPerson: '0',
-					idCardPhotoFront:'',
-					idCardPhotoBack:'',
+					idCardPhotoFront: '',
+					idCardPhotoBack: '',
 					enterpriseAuthorization: '',
 					auditStatus: '1'
 				},
@@ -267,7 +277,7 @@
 					day: true,
 				},
 				ziyuanId: '',
-				ziyuanType:'',
+				ziyuanType: '',
 			}
 		},
@@ -276,98 +286,133 @@
 			this.ziyuanType = option.type
 		},
 		onShow() {
-		let shopId = {
-			shopId:uni.getStorageSync('shopId') || ''
-		}
-		  const isLogin = uni.getStorageSync('token');
-		  if (isLogin =='') { 
-		    // 如果未登录，跳转到登录页面
-		        	uni.navigateTo({
-		        	  url: '/pages/login/login'
-		        	})
-		  }else{
-			  let page={
-				condition:2
-			  }
-			 this.$http.sendRequest('/shop/getById', 'POST',shopId).then(res => {
-				 if(res.data.code !="20004"){
-					 this.shopMsg = res.data.data
-					 this.Islogin= false
-					 this.$http.sendRequest('/index/index', 'POST',page).then(res => {
-					 	//成功回调
-					 	this.tongji = res.data.data
-					 })
-				 }else{
-					 uni.navigateTo({
-					   url: '/pages/login/login'
-					 })
-				 }
-			 })
-		  }		
-		
+			let shopId = {
+				shopId: uni.getStorageSync('shopId') || ''
+			}
+			const isLogin = uni.getStorageSync('token');
+			if (isLogin == '') {
+				// 如果未登录，跳转到登录页面
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			} else {
+				let page = {
+					condition: 2
+				}
+				this.$http.sendRequest('/shop/getById', 'POST', shopId).then(res => {
+					if (res.data.code != "20004") {
+						this.shopMsg = res.data.data
+						this.Islogin = false
+						this.$http.sendRequest('/index/index', 'POST', page).then(res => {
+							//成功回调
+							this.tongji = res.data.data
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+					}
+				})
+			}
+
 		},
 		methods: {
+			onsuccess1(e, file, fileList, ziduan) {
+				console.error(e, file, fileList, ziduan)
+				uni.uploadFile({
+					url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
+					filePath: e[0].url,
+					name: 'file', // 后端接收的文件参数名
+					formData: {
+						filePath: 'xcx', // 其他表单数据
+					},
+					success: (uploadFileRes) => {
+						this.model1[ziduan] = this.$img + JSON.parse(uploadFileRes.data).data
+
+						console.log('上传成功', this.model1);
+						uni.showToast({
+							title: '上传成功',
+							icon: 'success',
+						});
+					},
+					fail: (err) => {
+						console.error('上传失败', err);
+						uni.showToast({
+							title: '上传失败',
+							icon: 'none',
+						});
+					},
+				});
+			},
 			typeChange(e) {
 				this.model1.type = e[0].label;
 			},
-			 getCurrentTime() {
-			      const now = new Date();
-			      const year = now.getFullYear();
-			      const month = ('0' + (now.getMonth() + 1)).slice(-2);
-			      const day = ('0' + now.getDate()).slice(-2);
-			      const hours = ('0' + now.getHours()).slice(-2);
-			      const minutes = ('0' + now.getMinutes()).slice(-2);
-			      const seconds = ('0' + now.getSeconds()).slice(-2);
-			
-			      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-			    },
+			getCurrentTime() {
+				const now = new Date();
+				const year = now.getFullYear();
+				const month = ('0' + (now.getMonth() + 1)).slice(-2);
+				const day = ('0' + now.getDate()).slice(-2);
+				const hours = ('0' + now.getHours()).slice(-2);
+				const minutes = ('0' + now.getMinutes()).slice(-2);
+				const seconds = ('0' + now.getSeconds()).slice(-2);
+
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			},
 			go() {
-				let coverImg = []
-				let files = []
-				let idCardOne = []
-				let idCardTwo = []
-				let enterS  = []
-				// // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-				coverImg = this.$refs.coverImage.lists.filter(val => {
-					return val.progress == 100;
-				})
-				coverImg.map(item => {
-					this.model1.coverImage = item.response.data.url
-				})
-				files = this.$refs.businessLicense.lists.filter(val => {
-					return val.progress == 100;
-				})
-				
-				files.map(item => {
-					this.model1.businessLicense = item.response.data.url
-				})
-				idCardOne = this.$refs.idCardPhotoFront.lists.filter(val => {
-					return val.progress == 100;
-				})
-				idCardOne.map(item => {
-					this.model1.idCardPhotoFront = item.response.data.url
-				
-				})
-				idCardTwo = this.$refs.idCardPhotoBack.lists.filter(val => {
-					return val.progress == 100;
-				})
-				idCardTwo.map(item => {
-					this.model1.idCardPhotoBack = item.response.data.url
-				})
-				enterS = this.$refs.enter.lists.filter(val => {
-					return val.progress == 100;
-				})
-				enterS.map(item => {
-					this.model1.enterpriseAuthorization = item.response.data.url
-				})
+				// let coverImg = []
+				// let files = []
+				// let idCardOne = []
+				// let idCardTwo = []
+				// let enterS  = []
+				// // // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
+				// coverImg = this.$refs.coverImage.lists.filter(val => {
+				// 	return val.progress == 100;
+				// })
+				// coverImg.map(item => {
+				// 	this.model1.coverImage = item.response.data.url
+				// })
+				// files = this.$refs.businessLicense.lists.filter(val => {
+				// 	return val.progress == 100;
+				// })
+
+				// files.map(item => {
+				// 	this.model1.businessLicense = item.response.data.url
+				// })
+				// idCardOne = this.$refs.idCardPhotoFront.lists.filter(val => {
+				// 	return val.progress == 100;
+				// })
+				// idCardOne.map(item => {
+				// 	this.model1.idCardPhotoFront = item.response.data.url
+
+				// })
+				// idCardTwo = this.$refs.idCardPhotoBack.lists.filter(val => {
+				// 	return val.progress == 100;
+				// })
+				// idCardTwo.map(item => {
+				// 	this.model1.idCardPhotoBack = item.response.data.url
+				// })
+				// enterS = this.$refs.enter.lists.filter(val => {
+				// 	return val.progress == 100;
+				// })
+				// enterS.map(item => {
+				// 	this.model1.enterpriseAuthorization = item.response.data.url
+				// })
 				this.model1.rentalResourcesId = this.ziyuanId
 				this.model1.advertisingSpaceType = this.ziyuanType
 				this.model1.applicant = uni.getStorageSync('shopId')
 				this.model1.applicationTime = this.getCurrentTime()
+				console.error({
+					...this.model1
+				})
+				// return
 				this.$http.sendRequest('/cereAdvertiserInfo/add', 'POST', this.model1, 1).then(res => {
-					uni.navigateTo({
-						url: '/pages/record/record'
-					})
+					uni.showToast({
+						title: '提交成功',
+						icon: 'none',
+					});
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1000)
 				})
 			},
 			// toChangeTime(val) {
@@ -357,7 +357,14 @@
 		align-items: center;
 	}
 	.card_title{
-		font-size:16px;
+		// font-size:16px;
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+	.card_more{
+		// font-size:16px;
+		color: #555555;
+		font-size: 21rpx;
 	}
 }
 .other-business {
@@ -267,13 +267,16 @@
 			</view>
 			<view class="cardHome">
-				<view class="card_home">
+				<view class="card_home" >
 					<view class="card_title">营销推广活动</view>
-					<view class="card_more" @click="goDetail('/pages/marketing/marketingList/marketingList')">查看更多  ></view>
+					<view style="align-items: center;" class="card_more" @click="goDetail('/pages/marketing/marketingList/marketingList')">
+						查看更多 
+						<u-icon name="arrow-right" color="#555555" size="19"></u-icon>
+					</view>
 				</view>
 				<view style="width:100%;margin-top:10px;" class="other-business">
 					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
-						<view v-for="(item, index) in yingxiaoData" :key="item.id" class="scroll-view-item_H" @click="toDetail(item.id, '/pages/marketing/marketingDetail/marketingDetail')">
+						<view v-for="(item, index) in yingxiaoData" :key="item.id" class="scroll-view-item_H" @click="toDetailhd(item)">
 							<view class="business-card">
 								<u-image :showLoading="true" :src="item.coverImage" width="100%" height="210rpx"></u-image>
 								<view class="business-card-title">
@@ -289,9 +292,16 @@
 			</view>
 			<view class="cardHome">
-				<view class="card_home">
+	<!-- 			<view class="card_home">
+					<view class="card_title">商务合作</view>
+					<view class="card_more" >查看更多 ></view>
+				</view> -->
+				<view class="card_home" >
 					<view class="card_title">商务合作</view>
-					<view class="card_more" @click="goDetail('/pages/business/businessList/businessList')">查看更多 ></view>
+					<view style="align-items: center;" class="card_more" @click="goDetail('/pages/business/businessList/businessList')">
+						查看更多 
+						<u-icon name="arrow-right" color="#555555" size="19"></u-icon>
+					</view>
 				</view>
 				<view style="width:100%;margin-top:10px;" class="other-business">
 					<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
@@ -307,7 +317,7 @@
 				</view>
 			</view>
 		</view>
-		
+		<view style="height: 250rpx;"></view>
 		<!-- tabbar -->
 		<tabbar :tabBarShow="0"></tabbar>
 	</view>
@@ -370,6 +380,12 @@
 			this.onCouponTab(0)
 		},
 		methods: {
+			toDetailhd(items) {
+				  let msg = JSON.stringify(items)
+				uni.navigateTo({
+					url: `/pages/marketing/marketingDetail/marketingDetail?item=${msg}`
+				})
+			},
 			getALL(){
 				let pagesize = {
 					pageNumber: 1,
@@ -59,8 +59,12 @@
 						<u-picker mode="time" v-model="busEndtshow" :params="params"
 							@confirm="busEndTimeChange"></u-picker>
 					</u-form-item>
-					<u-form-item label="营业执照" prop="businessLicense" borderBottom labelPosition="top">
+					<!-- 		<u-form-item label="营业执照" prop="businessLicense" borderBottom labelPosition="top">
 						<u-upload :action="$upload" :auto-upload="true" ref="businessLicense" :max-count="1"></u-upload>
+					</u-form-item> -->
+					<u-form-item label="营业执照" prop="businessLicense" borderBottom labelPosition="top">
+						<u-upload :action="$upload" :auto-upload="false" ref="businessLicense" :max-count="1"
+							@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'businessLicense')"></u-upload>
 					</u-form-item>
 				</u-form>
 			</view>
@@ -77,13 +81,13 @@
 						<u-form-item label="身份证号码" prop="idNumber" borderBottom>
 							<u-input v-model="model1.idNumber"></u-input>
 						</u-form-item>
-						<u-form-item label="身份证有效开始时间" prop="idValidStart" borderBottom>
+						<u-form-item label="有效开始时间" prop="idValidStart" borderBottom>
 							<u-input v-model="model1.idValidStart" type="select" @click="idCardStartshow = true"
 								placeholder="请选择" />
 							<u-picker mode="time" v-model="idCardStartshow" :params="params1"
 								@confirm="idCardStTimeChange"></u-picker>
 						</u-form-item>
-						<u-form-item label="身份证有效结束时间" prop="idValidEnd" borderBottom>
+						<u-form-item label="有效结束时间" prop="idValidEnd" borderBottom>
 							<u-input v-model="model1.idValidEnd" type="select" @click="idCardEndtshow = true"
 								placeholder="请选择" />
 							<u-picker mode="time" v-model="idCardEndtshow" :params="params1"
@@ -93,7 +97,9 @@
 					<view class="add-list">
 						<view class="deom-box">
 							<view class="img-deom">
-								<u-upload :action="$upload" :custom-btn="true" :max-count="1"  ref="idPhotoFront">
+								<u-upload :action="$upload" :custom-btn="true"
+									@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'idPhotoFront')"
+									:auto-upload="false" :max-count="1" ref="idPhotoFront">
 									<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover"
 										hover-stay-time="150">
 										<u-image width="304rpx" height="182rpx"
@@ -103,7 +109,9 @@
 								<text>点击上传证件人像面</text>
 							</view>
 							<view class="img-deom">
-								<u-upload :action="$upload" :custom-btn="true" :max-count="1" ref="idPhotoBack">
+								<u-upload :action="$upload" :custom-btn="true"
+									@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'idPhotoBack')"
+									:auto-upload="false" :max-count="1" ref="idPhotoBack">
 									<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover"
 										hover-stay-time="150">
 										<u-image width="304rpx" height="182rpx"
@@ -138,8 +146,10 @@
 							</u-radio-group>
 						</u-form-item>
 						<u-form-item label="企业授权书" prop="enter" borderBottom labelPosition="top">
-
-							<u-upload :action="$upload" :auto-upload="true" ref="enter" :max-count="1"></u-upload>
+							<u-upload :action="$upload" ref="enter" :max-count="1"
+								@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'enterpriseAuthorization')"
+								:auto-upload="false"></u-upload>
+							<!-- <u-upload :action="$upload" :auto-upload="true" ref="enter" :max-count="1"></u-upload> -->
 						</u-form-item>
 					</view>
 				</u-form>
@@ -189,7 +199,7 @@
 					idNumber: '',
 					idValidStart: '',
 					idValidEnd: '',
-					idPhotoFront:'',
+					idPhotoFront: '',
 					idPhotoBack: '',
 					isLegalPerson: '',
 					enterpriseAuthorization: '',
@@ -236,91 +246,136 @@
 			this.ziyuanId = option.ids
 		},
 		onShow() {
-		let shopId = {
-			shopId:uni.getStorageSync('shopId') || ''
-		}
-		  const isLogin = uni.getStorageSync('token');
-		  if (isLogin =='') { 
-		    // 如果未登录，跳转到登录页面
-		        	uni.navigateTo({
-		        	  url: '/pages/login/login'
-		        	})
-		  }else{
-			  let page={
-				condition:2
-			  }
-			 this.$http.sendRequest('/shop/getById', 'POST',shopId).then(res => {
-				 if(res.data.code !="20004"){
-					 this.shopMsg = res.data.data
-					 this.Islogin= false
-					 this.$http.sendRequest('/index/index', 'POST',page).then(res => {
-					 	//成功回调
-					 	this.tongji = res.data.data
-					 })
-				 }else{
-					 uni.navigateTo({
-					   url: '/pages/login/login'
-					 })
-				 }
-			 })
-		  }		
-		
+			let shopId = {
+				shopId: uni.getStorageSync('shopId') || ''
+			}
+			const isLogin = uni.getStorageSync('token');
+			if (isLogin == '') {
+				// 如果未登录，跳转到登录页面
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			} else {
+				let page = {
+					condition: 2
+				}
+				this.$http.sendRequest('/shop/getById', 'POST', shopId).then(res => {
+					if (res.data.code != "20004") {
+						this.shopMsg = res.data.data
+						this.Islogin = false
+						this.$http.sendRequest('/index/index', 'POST', page).then(res => {
+							//成功回调
+							this.tongji = res.data.data
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+					}
+				})
+			}
+
 		},
 		methods: {
+			onsuccess1(e, file, fileList, ziduan) {
+				console.error(e, file, fileList, ziduan)
+				uni.uploadFile({
+					url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
+					filePath: e[0].url,
+					name: 'file', // 后端接收的文件参数名
+					formData: {
+						filePath: 'xcx', // 其他表单数据
+					},
+					success: (uploadFileRes) => {
+						if (ziduan == 'businessLicense') {
+							this.model1.businessLicense = this.$img + JSON.parse(uploadFileRes.data).data
+							console.error(this.model1.businessLicense)
+						} else if (ziduan == 'idPhotoFront') {
+							this.model1.idPhotoFront = this.$img + JSON.parse(uploadFileRes.data).data
+						} else if (ziduan == 'idPhotoBack') {
+							this.model1.idPhotoBack = this.$img + JSON.parse(uploadFileRes.data).data
+						} else {
+							this.model1.enterpriseAuthorization = this.$img + JSON.parse(uploadFileRes.data)
+								.data
+						}
+
+						console.log('上传成功', this.model1);
+						uni.showToast({
+							title: '上传成功',
+							icon: 'success',
+						});
+					},
+					fail: (err) => {
+						console.error('上传失败', err);
+						uni.showToast({
+							title: '上传失败',
+							icon: 'none',
+						});
+					},
+				});
+			},
 			typeChange(e) {
 				this.model1.entityType = e[0].label;
 			},
-getCurrentTime() {
-      const now = new Date();
-      const year = now.getFullYear();
-      const month = ('0' + (now.getMonth() + 1)).slice(-2);
-      const day = ('0' + now.getDate()).slice(-2);
-      const hours = ('0' + now.getHours()).slice(-2);
-      const minutes = ('0' + now.getMinutes()).slice(-2);
-      const seconds = ('0' + now.getSeconds()).slice(-2);
+			getCurrentTime() {
+				const now = new Date();
+				const year = now.getFullYear();
+				const month = ('0' + (now.getMonth() + 1)).slice(-2);
+				const day = ('0' + now.getDate()).slice(-2);
+				const hours = ('0' + now.getHours()).slice(-2);
+				const minutes = ('0' + now.getMinutes()).slice(-2);
+				const seconds = ('0' + now.getSeconds()).slice(-2);
-      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-    },
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			},
 			go() {
-				let files = []
-				let idCardOne = []
-				let idCardTwo = []
-				let enter = []
-				// // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-				files = this.$refs.businessLicense.lists.filter(val => {
-					return val.progress == 100;
-				})
-				files.map(item => {
-					this.model1.businessLicense = item.response.data.url
-				})
-				idCardOne = this.$refs.idPhotoFront.lists.filter(val => {
-					return val.progress == 100;
-				})
-				idCardOne.map(item => {
-					this.model1.idPhotoFront = item.response.data.url
+				// let files = []
+				// let idCardOne = []
+				// let idCardTwo = []
+				// let enter = []
+				// // // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
+				// files = this.$refs.businessLicense.lists.filter(val => {
+				// 	return val.progress == 100;
+				// })
+				// files.map(item => {
+				// 	this.model1.businessLicense = item.response.data.url
+				// })
+				// idCardOne = this.$refs.idPhotoFront.lists.filter(val => {
+				// 	return val.progress == 100;
+				// })
+				// idCardOne.map(item => {
+				// 	this.model1.idPhotoFront = item.response.data.url
+
+				// })
+				// idCardTwo = this.$refs.idPhotoBack.lists.filter(val => {
+				// 	return val.progress == 100;
+				// })
+				// idCardTwo.map(item => {
+				// 	this.model1.idPhotoBack = item.response.data.url
+				// })
+				// enter = this.$refs.enter.lists.filter(val => {
+				// 	return val.progress == 100;
+				// })
+				// enter.map(item => {
+				// 	this.model1.enterpriseAuthorization = item.response.data.url
+				// })
-				})
-				idCardTwo = this.$refs.idPhotoBack.lists.filter(val => {
-					return val.progress == 100;
-				})
-				idCardTwo.map(item => {
-					this.model1.idPhotoBack = item.response.data.url
-				})
-				enter = this.$refs.enter.lists.filter(val => {
-					return val.progress == 100;
-				})
-				enter.map(item => {
-					this.model1.enterpriseAuthorization = item.response.data.url
-				})
-				
 				this.model1.rentalResourcesId = this.ziyuanId
 				this.model1.applicant = uni.getStorageSync('shopId')
 				this.model1.applicationTime = this.getCurrentTime()
-				
+				console.error(this.model1)
+				// return
 				this.$http.sendRequest('/cereBusinessInfo/add', 'POST', this.model1, 1).then(res => {
-					uni.redirectTo({
-						url: '/pages/record/record'
-					})
+					// uni.redirectTo({
+					// 	url: '/pages/record/record'
+					// })
+					uni.showToast({
+						title: '提交成功',
+						icon: 'none',
+					});
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1000)
 				})
 			},
 			// 上一步
@@ -36,17 +36,18 @@
 /* 填写 */
 .input-info{
   padding: 0 6%;
-  margin: 80rpx 0 40rpx 0;
+  // margin: 80rpx 0 40rpx 0;
   .info{
     display: flex;
     align-items:center;
     justify-content: space-between;
     width: 100%;
     height: 100rpx;
-	background-color: #F2F4F6;
-	border-radius: 20rpx;
+	background-color: #fff;
+	border-radius: 32rpx;
 	margin-bottom: 40rpx;
 	padding: 0 30rpx 0 40rpx;
+	border: 2rpx solid rgba(15,187,89,0.1804);
     input{
       width: 70%;
       height: 100%;
@@ -105,8 +106,8 @@
     justify-content: center;
     width: 88%;
     height: 90rpx;
-    background-color:#3f9b6a;
-    border-radius: 10rpx;
+    background-color:#0FBB59;
+    border-radius: 32rpx;
     color: #FFFFFF;
     font-size: 32rpx;
   }
@@ -18,18 +18,18 @@
 			<view class="user-info" @click="myMsg">
 				<view class="portrait">
 					<image :src="$imgUrl('/img/head.jpg')"  v-if="Islogin"></image>
-					<image :src="shopMsg.shopLogo" v-else></image>
+					<image :src="shopMsg.shopLogo?shopMsg.shopLogo:$imgUrl('/img/head.jpg')" v-else></image>
 				</view>
 				<view class="info">
 					<view class="nickname">
 						<text v-if="Islogin">请登录</text>
-						<text v-else >{{shopMsg.shopName}}</text>
+						<text v-else >{{shopMsg.shopName || '用户'}}</text>
 					</view>
 					<view class="rank">
 						<view class="rank-box">
 						<image :src="$imgUrl('/vip.png')" ></image>
 						<text v-if="Islogin"></text>
-						<text v-else >{{shopMsg.shopReturn.returnAdress}}有限公司</text>
+						<text v-else-if="shopMsg.shopReturn.returnAdress">{{shopMsg.shopReturn.returnAdress}}有限公司</text>
 						</view>
 					</view>
 				</view>
@@ -308,6 +308,47 @@
 			this.getALL()
 		},
 		methods: {
+			isshop() {
+				uni.navigateTo({
+					url: '/pagesA/leaseAdd/leaseAdd'
+				})
+				return
+				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
+					"pageSize": 10,
+					pageNumber: 0,
+					phone: uni.getStorageSync('user').phone
+				}, 2).then(res => {
+					//成功回调
+					if (res.data.data.content.length > 0) {
+						let c1 = res.data.data.content[0]
+						console.error({
+							...c1
+						})
+						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 {
+						uni.navigateTo({
+							url: '/pagesA/leaseAdd/leaseAdd'
+						})
+					}
+				})
+			},
 			getALL(){
 				this.pageindex.createUser =uni.getStorageSync('shopId')
 				this.$http.sendRequest('/cerePromotion/queryByPage', 'POST', this.pageindex,1).then(res => {
@@ -24,7 +24,7 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			width: 30%;
+			// width: 30%;
 			height: 100%;
 			background-color: #fff;
 			padding: 10rpx 16rpx;
@@ -13,16 +13,18 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		types = 'application/json';
 	}
 	var bases = ''
+	console.error(baseUrl)
 	if(baseUrl == 1){
 		bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
 		// bases = 'http://8.130.38.56:8027/admin-server' + url;
-		// bases = 'http://192.168.2.193:9003' + url;
+		// bases = 'http://192.168.8.106:9003' + url;
 	}else{
+		
 		// bases = 'http://8.130.38.56:8027/business-server' + url;
-		bases = 'http://192.168.8.106:9004' + url;
-		// bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
+		// bases = 'http://192.168.8.106:9004' + url;
+		bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
 	}
 	var token = uni.getStorageSync('token') || '';
-import JSEncrypt from './jsencrypt'
+import * as CryptoSM4 from 'sm-crypto';
 // 密钥对生成 http://web.chacuo.net/netrsakeypair
@@ -7,17 +7,44 @@ const publicKey = &#39;MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArEAGYSWFuRIiPS3M2
 const privateKey = 'MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCsQAZhJYW5EiI9LczatgFJdYgX3bnWzYCxDxKEpHUoonZ+HN8gfl10YtntKVyUb/IlMsanoHpbvopEbPcPkqpra/gASIgvUar9Tg9YT53rN/AwSODVL8MbK0G1jJAnyR46pl7MMNnxypEDTZi8oEKYno0Je2dUZ5FIssR5NwU8WSh020GfUbdQDMTpc5VE2rosqcAz8qjeBl87/1Ux0wqZrvaPv7Cg7at9VC49Kd+urI2jkZ6jg2yVlnMlzhzwfrcAkcueJrUhDjmZKCx0DN4QqktH21vz1MERUw2v4jq0nyTRNnyltTomypkNjCiRr9JvgiBSGEX45XWj37331pwhAgMBAAECggEAKo6nBNmAcHlKfFMUifTt3HhtZ3ggsjGT2isfKCZ5y9BX9lCr0Btoe5jwvue5N/NwoEArVL8RfBlXkBBb+j0CXggO/gLtosNKu8rNf8QsADGR5lwbMJDcY5oMYg6YjzvhfBwez9RCBLtHmMlTM0dlLM//iJg0r2XnP07rvAccBAybbQrobwb+t3UY3388rVWEfdU7SJ3lYA+LxneFZMhol1YhB179IzFeVJYipbrockK2LURa21xbDdsd1jFoYTIP7JDh27qfAluV5sN+5aM4QqNFCnvVEqM/1x1ITwEE9aGzoxHywJ0xAhLujqA3fGgkGuawPQkDvtHPqEZmBaM8AQKBgQDULCp7GVYI66RgUYXeF7dhs9hD+vqsQOkePZmfN0/0AlioWNUmGlybk2ivzPKuGzJrBQ/Hk7c67wyOBwQtiC4I1v/c7yQa+kp4673nJOy90OIt/1MNxMPux10cO3TrRv8uqT/LOncg35hNyBEh9UVjoWH/qlFfoXMznX2Vr4jOxQKBgQDP1LuQ/aTzORcvprmqVFAXaDjNtgp8I93TXXW2iv1Pw+EM/T1xMdjhRi5qRD0KaU7/dRuDloN94mTG/y4htMxcusJGAotJQCWE8M7cb/o27F/FikoVSoHbfBfZe1zODuksuJIsknP0W18PCo8qldg2F9IJ1GfF1pl90WsJvIVtrQKBgDnOzsQ7YvWLPn3/uDmKvKwiFApxl1rXVKyom/KFX4NcIEu96FU5WYIJ57v+WyCUyGfgOSxnUsT73K/VuY2uTNybt5q6jVvMVf4cPOF9bgNJplZh+n8F3VxxdSz8Bh8UePJ9qqP0igCq6xRGLmTSLtW2Yr0F6qXjlz+46T6fVOcBAoGBAMGsvDJMvLfQHxRP6buaIJz/idfh6flvrxt2f+jhs1fu8T2ajPR8gGDGdyCegMfABVc4ObCxxc28+S8cxE+y3bMYc0ysuEJF3fD6O7vfOiyOsF01Fv6qVUNFbDBGruBzssXzJn0U6avwrjAlJe+IfllCb4CriR0rdBR04KvNHAZtAoGBALMec9nn6PDOjCXdKjHEAkAmopfatShJI1KRC8TTnPjMvAbCsuUWezUkTj7S9ZN81F6tPaS+DdeE4CD7T7/EfjRtfxbMwPZ6b4gaXdZgCigSqa3HVh2fUD5Wlfypl3r50pKzmW6POG/o/a466bgh9CkylBpqgKfeQyNNLpE1HZA/'
-// 加密
-export function encrypt(txt) {
-  const encryptor = new JSEncrypt()
-  encryptor.setPublicKey(publicKey) // 设置公钥
-  return encryptor.encrypt(txt) // 对需要加密的数据进行加密
-}
+const DEFAULT_KEY ="cda4442f102f6396eea76902e37ad7cb";
+const DEFAULT_IV = "8bd8a83221742111c7532b7275a7fe9c";
-// 解密
-export function decrypt(txt) {
-  const encryptor = new JSEncrypt()
-  encryptor.setPrivateKey(privateKey)
-  return encryptor.decrypt(txt)
-}
+function stringToHex(str){
+	let hex = Array.prototype.map.call(str, (c) => {
+		return c.charCodeAt(0).toString(16);
+	}).join("");
+	return hex;
+}
+ 
+const pwdKey = stringToHex(DEFAULT_KEY) //密钥替换为后端密钥
+ 
+function encryptedSM4(text) {
+	const gmCryptConfigSet = {
+		padding: DEFAULT_KEY,
+		mode: 'cbc',
+		iv: DEFAULT_IV,
+		output: 'string'
+	};
+	return CryptoSM4.sm4.encrypt(JSON.stringify(text), DEFAULT_KEY, gmCryptConfigSet)
+}
+ 
+ 
+function decryptedSM4(text) {
+	const gmCryptConfigGet = {
+		padding: DEFAULT_KEY,
+		mode: 'cbc',
+		iv: DEFAULT_IV,
+		output: 'string'
+	};
+	const originData = CryptoSM4.sm4.decrypt(text, DEFAULT_KEY, gmCryptConfigGet);
+	const charCodes = originData.split('').map(char => char.charCodeAt(0));
+	// 过滤掉字符码等于0的字节
+	const filteredCharCodes = charCodes.filter(code => code !== 0);
+	const decryptData = filteredCharCodes.map(code => String.fromCharCode(code)).join('')
+	// 将过滤后的字符码数组转换回字符串
+	console.error(decryptData)
+	return JSON.parse(decryptData)
+}
+module.exports.decryptedSM4 = decryptedSM4
 \ No newline at end of file