Merge branch 'master' of http://122.51.230.86:3000/dianliang/dl_uniapp

api/business/member.js

@@ -24,6 +24,14 @@ export function uniSaveMember(data) {
 		data: data
 	})
 }
+//通告主认证申请
+export function toApply(data) {
+	return request({
+		url: '/member/apply/toApply',
+		method: 'post',
+		data: data
+	})
+}
 
 
 //------------------开通会员-----------------------

config.js

@@ -1,6 +1,6 @@
 // 应用全局配置
 module.exports = {
-	baseUrl: 'http://192.168.1.17:8080',
+	baseUrl: 'http://192.168.1.4:8080',
 	// baseUrl: 'http://localhost:8080',
 	// 应用信息
 	appInfo: {

pages/mine/auth/auth-form.vue

@@ -33,7 +33,7 @@
 									@delete="deleteFile($event,'SBList')" limit="1"></uni-file-picker>
 							</view>
 							<view class="img-upload">
-								<uni-file-picker iconPath="/static/mine/auth/yingyezhizhao.png" required="true"
+								<uni-file-picker iconPath="/static/mine/auth/yingyezhizhao.png"
 									:value="YYZZList" imgTitle="营业执照" :sizeType="sizeType"
 									@select="afterRead($event,'YYZZList')" @delete="deleteFile($event,'YYZZList')"
 									limit="1"></uni-file-picker>
@@ -41,7 +41,7 @@
 						</view>
 						<view class="item-field" v-if="'02'==identityType || '03'==identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>与品牌方沟通记录
+								与品牌方沟通记录
 							</view>
 							<view class="item-value">
 								<uni-file-picker :value="GTList" :sizeType="sizeType"
@@ -51,7 +51,7 @@
 						</view>
 						<view class="item-field" v-if="'03'==identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>品牌投放授权/合同
+								品牌投放授权/合同
 							</view>
 							<view class="warn-little-text">* 需加盖申请主体红色公章（不支持PS章、电子章、部门章及专用章）</view>
 							<view class="item-value">
@@ -62,31 +62,31 @@
 						</view>
 						<view class="item-field-row" v-if="'01'==identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>品牌名
+								品牌名
 							</view>
 							<view class="item-value">
-								<input class="uni-input" v-model="dataObj.name" type="number" placeholder="请输入" />
+								<input class="uni-input" v-model="dataObj.brandName" type="number" placeholder="请输入" />
 							</view>
 						</view>
 						<view class="item-field-row" v-if="'01'==identityType || '02'==identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>公司全称
+								公司全称
 							</view>
 							<view class="item-value">
-								<input class="uni-input" v-model="dataObj.name" type="number" placeholder="请输入" />
+								<input class="uni-input" v-model="dataObj.corpName" type="number" placeholder="请输入" />
 							</view>
 						</view>
 						<view class="item-field-row" v-if="'03'==identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>授权公司全称
+								授权公司全称
 							</view>
 							<view class="item-value">
-								<input class="uni-input" v-model="dataObj.name" type="number" placeholder="请输入" />
+								<input class="uni-input" v-model="dataObj.authCorpName" type="number" placeholder="请输入" />
 							</view>
 						</view>
 						<view class="item-field" v-if="'04'==identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>店铺后台截图
+								店铺后台截图
 							</view>
 							<view class="item-value">
 								<uni-file-picker :value="DPHTList" :sizeType="sizeType"
@@ -96,7 +96,7 @@
 						</view>
 						<view class="item-field" v-if="'04'==identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>店铺物流截图
+								店铺物流截图
 							</view>
 							<view class="item-value">
 								<uni-file-picker :value="DPWLList" :sizeType="sizeType"
@@ -106,46 +106,46 @@
 						</view>
 						<view class="item-field-row" v-if="'04'==identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>店铺名称
+								店铺名称
 							</view>
 							<view class="item-value">
-								<input class="uni-input" v-model="dataObj.name" type="number" placeholder="请输入" />
+								<input class="uni-input" v-model="dataObj.shopName" type="number" placeholder="请输入" />
 							</view>
 						</view>
 						<view class="item-field-row" v-if="'04'==identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>店铺链接
+								店铺链接
 							</view>
 							<view class="item-value">
-								<input class="uni-input" v-model="dataObj.name" type="number" placeholder="请输入" />
+								<input class="uni-input" v-model="dataObj.shopLink" type="number" placeholder="请输入" />
 							</view>
 						</view>
 						<view class="item-field-row">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>行业、领域
+								行业、领域
 							</view>
 							<view class="item-value">
-								<input class="uni-input" v-model="dataObj.name" type="number" placeholder="请输入" />
+								<input class="uni-input" v-model="dataObj.industry" type="number" placeholder="请输入" />
 							</view>
 						</view>
 						<view class="item-field" v-if="'03'!=identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>公司所在城市
+								公司所在城市
 							</view>
 							<view class="item-value">
 								<uni-data-picker placeholder="请选择" popup-title="请选择" :localdata="dataTree"
-									v-model="dataObj.cityId" @change="onchange" @nodeclick="onnodeclick"
+									v-model="dataObj.corpCityCode" @change="onchange" @nodeclick="onnodeclick"
 									@popupopened="onpopupopened" @popupclosed="onpopupclosed">
 								</uni-data-picker>
 							</view>
 						</view>
 						<view class="item-field" v-if="'03'==identityType">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>个人所在城市
+								个人所在城市
 							</view>
 							<view class="item-value">
 								<uni-data-picker placeholder="请选择" popup-title="请选择" :localdata="dataTree"
-									v-model="dataObj.cityId" @change="onchange" @nodeclick="onnodeclick"
+									v-model="dataObj.personCityCode" @change="onchange" @nodeclick="onnodeclick"
 									@popupopened="onpopupopened" @popupclosed="onpopupclosed">
 								</uni-data-picker>
 							</view>
@@ -161,7 +161,7 @@
 					<view class="form-content">
 						<view class="item-field">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>企业微信/钉钉个人资料页/在职证明
+								企业微信/钉钉个人资料页/在职证明
 							</view>
 							<view class="warn-little-text">* 需要包含姓名、公司名和职位。在职证明需加盖申请主体红色公章（不支持PS章、电子章、部门章及专用章）</view>
 							<view class="item-value">
@@ -172,7 +172,7 @@
 						</view>
 						<view class="item-field-row">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>姓名
+								姓名
 							</view>
 							<view class="item-value">
 								<input class="uni-input" v-model="dataObj.name" type="number" placeholder="请输入" />
@@ -180,10 +180,10 @@
 						</view>
 						<view class="item-field-row">
 							<view class="item-lable is-required">
-								<image src="@/static/mine/required.png" mode="aspectFit"></image>身份证号
+								身份证号
 							</view>
 							<view class="item-value">
-								<input class="uni-input" v-model="dataObj.name" type="number" placeholder="请输入" />
+								<input class="uni-input" v-model="dataObj.idCard" type="number" placeholder="请输入" />
 							</view>
 						</view>
 						<view class="item-field">
@@ -191,7 +191,7 @@
 								附言（选填）
 							</view>
 							<view class="item-value">
-								<textarea style="margin-top: 10rpx;" v-model="dataObj.detail" placeholder="请输入详细地址" />
+								<textarea style="margin-top: 10rpx;" v-model="dataObj.review" placeholder="请输入详细地址" />
 							</view>
 						</view>
 					</view>
@@ -206,19 +206,20 @@
 
 <script>
 	import navigationBarVue from '@/components/navigation/navigationBar.vue';
-	import {
+	import {getTextByIdentityType} from '@/utils/common.js'
-		getTextByIdentityType
+	import {treeCity} from '@/api/business/base.js'
-	} from '@/utils/common.js'
+	import {toApply} from '@/api/business/member.js'
-	import {
+  import upload from '@/utils/upload'
-		treeCity
-	} from '@/api/business/base.js'
 	import config from '@/config';
+  import {toast} from '@/utils/common.js'
 	export default {
 		components: {
 			navigationBarVue
 		},
 		data() {
 			return {
+			  userId:"",
+        uploadUrl: config.baseUrl,
 				globalConfig: getApp().globalData.config,
 				//当前选择的认证身份
 				identityType: "",
@@ -241,9 +242,27 @@
 				//店铺物流截图
 				DPWLList: [],
 				dataObj: {
-					name: ""
+				  tradeImage:"",
+          busiImage:"",
+          recordImage:"",
+          contractImage:"",
+          shopImage:"",
+          jobImage:"",
+          logisticsImage:"",
+					brandName:"",
+          corpName:"",
+          authCorpName:"",
+          shopName:"",
+          shopLink:"",
+          industry:"",
+          corpCityCode:"",
+          corpCityName:"",
+          personCityCode:"",
+          personCityName:"",
+          name:"",
+          idCard:"",
+          review:""
 				},
-
 			}
 		},
 		onLoad(option) {
@@ -269,6 +288,66 @@
 					});
 				})
 			},
+
+      submitForm(){
+
+			  if (this.SBList.length > 0) {
+          this.dataObj.tradeImage = this.SBList
+              .map(item => item.url.replace(this.uploadUrl, ''))
+              .join(',');
+        }
+			  if (this.YYZZList.length > 0) {
+          this.dataObj.busiImage = this.YYZZList
+              .map(item => item.url.replace(this.uploadUrl, ''))
+              .join(',');
+        }
+			  if (this.SFList.length > 0) {
+          this.dataObj.jobImage = this.SFList
+              .map(item => item.url.replace(this.uploadUrl, ''))
+              .join(',');
+        }
+        if (this.GTList.length > 0) {
+          this.dataObj.recordImage = this.GTList
+              .map(item => item.url.replace(this.uploadUrl, ''))
+              .join(',');
+        }
+        if (this.SQList.length > 0) {
+          this.dataObj.contractImage = this.SQList
+              .map(item => item.url.replace(this.uploadUrl, ''))
+              .join(',');
+        }
+        if (this.DPHTList.length > 0) {
+          this.dataObj.shopImage = this.DPHTList
+              .map(item => item.url.replace(this.uploadUrl, ''))
+              .join(',');
+        }
+        if (this.DPWLList.length > 0) {
+          this.dataObj.logisticsImage = this.DPWLList
+              .map(item => item.url.replace(this.uploadUrl, ''))
+              .join(',');
+        }
+			  let data = {
+          identityType:this.identityType,
+          applyJson:JSON.stringify(this.dataObj)
+        }
+        toApply(data).then(res => {
+          if (res.code == 200) {
+            uni.showToast({
+              icon: 'success',
+              duration: 2000,
+              title: '提交成功'
+            });
+            uni.navigateBack()
+          }
+        }).catch((e) => {
+          uni.showToast({
+            icon: 'error',
+            duration: 2000,
+            title: e
+          });
+        })
+      },
+
 			afterRead(file, key) {
 				for (let i = 0; i < file.tempFilePaths.length; i++) {
 					upload({
@@ -277,7 +356,7 @@
 					}).then((res) => {
 						console.log(res, '215')
 						this[key].push({
-							url: config.baseUrl + res.data
+							url: res.url
 						})
 						console.log(this[key], "this[key]")
 					})