Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

api/help.js

@@ -7,15 +7,21 @@ const api = {
 	addGoodsSource: 'user/addGoodsSource',
 	joinStore: 'store/joinStore',
 	getStoreType: 'store/getStoreType',
-	storeSet:'store/editStore',
+	storeSet: 'store/editStore',
-	storeInfo:'store/getStoreInfo',
+	storeInfo: 'store/getStoreInfo',
 	getAgreement: 'user/getAgreement',
 }
+export const tipOffList = (param) => {
+	return request.get('goods/tipOffList ', param)
+}
+export const openShop = (param) => {
+	return request.post('store/openShop', param)
+}
 export const submitStandard = (param) => {
 	return request.post('order/submitStandard', param)
 }
 export const getAgreement = (data) => {
-	return request.get(api.getAgreement,data)
+	return request.get(api.getAgreement, data)
 }
 // 帮助中心列表
 export const list = (param) => {
@@ -45,4 +51,3 @@ export const storeSet = (param) => {
 export const storeInfo = (param) => {
 	return request.get(api.storeInfo, param)
 }
-

pages/gamll/index.vue

@@ -279,7 +279,6 @@
 			}
 		},
 		onLoad() {
-
 			this.retail = uni.getStorageSync('userInfo').retail
 			this.getRetailList()
 			this.getDescribe()

pages/gamll/mall.vue

@@ -4,10 +4,10 @@
 			<u-navbar title="供应商入驻" :border-bottom="false" :background="background"></u-navbar>
 		</view> -->
 		<view class="park-but">
-			<view class="but">
+			<view class="but" @click="handleSortType(10)" :style="{ color: (formData.type==10)?'#794007':'#fff' }">
 				公司
 			</view>
-			<view class="but">
+			<view class="but" @click="handleSortType(20)" :style="{ color: (formData.type==20)?'#794007':'#fff' }">
 				个体户
 			</view>
 		</view>
@@ -16,13 +16,13 @@
 				法人姓名<text style="color: red;">*</text>
 			</view>
 			<view class="form-input">
-				<input type="text" placeholder="请输入法人姓名">
+				<input type="text" v-model="formData.name" placeholder="请输入法人姓名">
 			</view>
 			<view class="form-title">
 				法人手机号码<text style="color: red;">*</text>
 			</view>
 			<view class="form-input">
-				<input type="text" placeholder="请输入法人手机号码">
+				<input type="text" @blur="mobileReg" v-model="formData.mobile" placeholder="请输入法人手机号码">
 			</view>
 			<view class="form-title">
 				法人身份证正面<text style="color: red;">*</text>
@@ -92,52 +92,105 @@
 			<view style="font-size: 22rpx;color: #999;margin-bottom: 30rpx;">
 				仅支持jpg、png、gif、50M以内/个
 			</view>
-			<view class="form-title">
+			<view class="form-title" v-if="formData.type==20">
+				法人银行卡号
+				<!-- <text style="color: red;">*</text> -->
+			</view>
+			<view class="form-input" v-if="formData.type==20">
+				<input type="text" v-model="formData.bank_account_number" placeholder="请输入法人银行卡号">
+			</view>
+			<view class="form-title" v-if="formData.type==20">
+				法人银行卡开户行
+				<!-- <text style="color: red;">*</text> -->
+			</view>
+			<view class="form-input" v-if="formData.type==20">
+				<input type="text" v-model="formData.bank_name" placeholder="请输入法人银行卡开户行">
+			</view>
+			<view class="form-title" v-if="formData.type==20">
+				法人收款二维码
+				<!-- <text style="color: red;">*</text> -->
+			</view>
+			<view class="card" v-if="formData.type==20">
+				<u-upload :action="action" :header="header" @on-uploaded="proveCodeSuccess" @on-remove="proveCodeRemove"
+					:file-list="codeList" :custom-btn="true" max-count="1">
+					<template v-slot:addBtn>
+						<view class="card-box">
+							<image :src="$picUrl+'/static/news/icon-upload.png'" style="height: 96rpx;" mode="">
+							</image>
+						</view>
+					</template>
+				</u-upload>
+			</view>
+			<view style="font-size: 22rpx;color: #999;margin-bottom: 30rpx;" v-if="formData.type==20">
+				仅支持jpg、png、gif、50M以内/个
+			</view>
+			<view class="form-title" v-if="formData.type==10">
 				对公开户名称<text style="color: red;">*</text>
 			</view>
-			<view class="form-input">
+			<view class="form-input" v-if="formData.type==10">
-				<input type="text" placeholder="请输入对公开户名称">
+				<input type="text" v-model="formData.corporate_account_name" placeholder="请输入对公开户名称">
 			</view>
-			<view class="form-title">
+			<view class="form-title" v-if="formData.type==10">
 				对公账号<text style="color: red;">*</text>
 			</view>
-			<view class="form-input">
+			<view class="form-input" v-if="formData.type==10">
-				<input type="text" placeholder="请输入对公账号">
+				<input type="text" v-model="formData.corporate_account_number" placeholder="请输入对公账号">
 			</view>
-			<view class="form-title">
+			<view class="form-title" v-if="formData.type==10">
 				对公开户行<text style="color: red;">*</text>
 			</view>
-			<view class="form-input">
+			<view class="form-input" v-if="formData.type==10">
-				<input type="text" placeholder="请输入对公开户行">
+				<input type="text" v-model="formData.corporate_bank_name" placeholder="请输入对公开户行">
+			</view>
+			<view class="form-title" v-if="formData.type==20">
+				收款二维码商户名称
+				<!-- <text style="color: red;">*</text> -->
+			</view>
+			<view class="form-input" v-if="formData.type==20">
+				<input type="text" v-model="formData.merchant_name" placeholder="请输入收款二维码商户名称">
 			</view>
 			<view class="form-title">
 				小程序名称
 			</view>
 			<view class="form-input">
-				<input type="text" placeholder="请输入小程序名称">
+				<input type="text" v-model="formData.mini_program_name" placeholder="请输入小程序名称">
 			</view>
 			<view class="form-title">
 				小程序AppId
 			</view>
 			<view class="form-input">
-				<input type="text" placeholder="请输入AppId">
+				<input type="text" v-model="formData.mini_program_app_id" placeholder="请输入AppId">
 			</view>
 			<view class="form-title">
 				小程序AppSecret
 			</view>
 			<view class="form-input">
-				<input type="text" placeholder="请输入AppSecret">
+				<input type="text" v-model="formData.mini_program_app_secret" placeholder="请输入AppSecret">
 			</view>
 			<view class="form-title">
 				法人电子邮箱
 			</view>
 			<view class="form-input">
-				<input type="text" placeholder="请输入法人电子邮箱">
+				<input type="text" v-model="formData.legal_person_email" placeholder="请输入法人电子邮箱">
 			</view>
 		</view>
 		<view class="park-button" @click="nextStep">
 			提交
 		</view>
+		<view class="dia" v-if="cdDia">
+			<view class="diaMain">
+				<image src="/static/order/ld.png" mode="" class="ld"></image>
+				<view class="cdTitle">
+					提交成功
+				</view>
+				<view class="cdInfo">
+					您的开通商城的相关信息已提交，请您耐心等待，谢谢！
+				</view>
+				<view class="iKnow" @click="meKone()">
+					我知道了
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 <script>
@@ -149,25 +202,38 @@
 				background: {
 					background: 'none'
 				},
-				indexBackgroundImage: 'https://www.amiami.com.cn/static/openShopping.png?t='+1,
+				indexBackgroundImage: 'https://www.amiami.com.cn/static/openShopping.png?t=' + new Date().getTime(),
 				action: '',
 				header: '',
+				cdDia: false,
 				justList: [],
 				backList: [],
 				holdList: [],
 				proveList: [],
-				formData:{
+				formData: {
-					card_just_imgage_ids: [],
+					name: "",
-					card_back_imgage_ids: [],
+					mobile: "",
-					prove_hold_imgage_ids: [],
+					id_card_front_id: "",
-					prove_imgage_ids: [],
+					id_card_back_id: "",
+					business_license_id: "",
+					photo_id: "",
+					bank_account_number: "",
+					bank_name: "",
+					qr_code_id: "",
+					merchant_name: "",
+					corporate_account_name: "",
+					corporate_account_number: "",
+					corporate_bank_name: "",
+					mini_program_name: "",
+					mini_program_app_id: "",
+					mini_program_app_secret: "",
+					legal_person_email: "",
+					type: 10
 				},
-				
 			}
 		},
 		onLoad(options) {
 			this.storeInfo = JSON.parse(uni.getStorageSync("storeInfo"));
-			console.log(this.storeInfo)
 		},
 		onShow() {
 
@@ -188,49 +254,156 @@
 			// const params = this.$getShareUrlParams()
 			// return {
 			// 	title: '诚挚邀请，欢迎开通！',
-			// 	path: `/pages/news1/MerchantSupplier`
+			// 	path: `/pages/gamll/mall`
 			// }
 		},
 		methods: {
-			toTextPage() {
+			mobileReg() {
-				uni.navigateTo({
+				let reg = /^[1][3,4,5,7,8,9][0-9]{9}$/
-					url: '/pages/news1/text?pageFlag=' + 3
+				if (!this.formData.mobile) { //判断如果手机号为空，提示用户输入手机号
+					uni.showToast({
+						title: '请输入手机号码',
+						icon: 'none'
 					})
+					return
+				} else if (!reg.test(this.formData.mobile)) { //判断手机号格式时候正确
+					uni.showToast({
+						title: '手机号码不正确',
+						icon: 'none'
+					})
+					this.formData.mobile = ''
+				}
+			},
+			meKone() {
+				this.cdDia = false
+			},
+			handleSortType(type) {
+				Object.keys(this.formData).forEach(key => {
+					this.formData[key] = ''; // 或者使用 delete obj[key];
+				});
+				this.formData.type = type
 			},
 			nextStep() {
 				let that = this
-				if (that.formData.card_just_imgage_ids.length == 0) {
+				if (!that.formData.name) {
+					uni.showToast({
+						title: "请输入法人姓名",
+						icon: 'none'
+					})
+					return
+				}
+				if (!that.formData.mobile) {
+					uni.showToast({
+						title: "请输入法人手机号码",
+						icon: 'none'
+					})
+					return
+				}
+				if (that.formData.id_card_front_id.length == 0) {
 					uni.showToast({
 						title: "请上传身份证正面",
 						icon: 'none'
 					})
 					return
 				}
-				if (that.formData.card_back_imgage_ids.length == 0) {
+				if (that.formData.id_card_back_id.length == 0) {
 					uni.showToast({
 						title: "请上传身份证反面",
 						icon: 'none'
 					})
 					return
 				}
-				if (that.formData.prove_imgage_ids.length == 0) {
+				if (that.formData.business_license_id.length == 0) {
 					uni.showToast({
 						title: "请上传营业执照",
 						icon: 'none'
 					})
 					return
 				}
-				if (that.formData.prove_hold_imgage_ids.length == 0) {
+				if (that.formData.photo_id.length == 0) {
 					uni.showToast({
 						title: "请上传手持营业执照",
 						icon: 'none'
 					})
 					return
 				}
-				let cardId = [that.formData.card_just_imgage_ids, that.formData.card_back_imgage_ids, that
+				if (that.formData.type == 10) {
-					.formData.prove_hold_imgage_ids
+					if (!that.formData.corporate_account_name) {
-				]
+						uni.showToast({
-				console.log(cardId)
+							title: "请输入对公开户名称",
+							icon: 'none'
+						})
+						return
+					}
+					if (!that.formData.corporate_account_number) {
+						uni.showToast({
+							title: "请输入对公账号",
+							icon: 'none'
+						})
+						return
+					}
+					if (!that.formData.corporate_bank_name) {
+						uni.showToast({
+							title: "请输入对公开户行",
+							icon: 'none'
+						})
+						return
+					}
+				}
+				// if (that.formData.type == 20) {
+				// 	if (!that.formData.bank_account_number) {
+				// 		uni.showToast({
+				// 			title: "请输入法人银行卡号",
+				// 			icon: 'none'
+				// 		})
+				// 		return
+				// 	}
+				// 	if (!that.formData.bank_name) {
+				// 		uni.showToast({
+				// 			title: "请输入法人银行卡开户行",
+				// 			icon: 'none'
+				// 		})
+				// 		return
+				// 	}
+				// 	if (that.formData.qr_code_id.length == 0) {
+				// 		uni.showToast({
+				// 			title: "请上传法人收款二维码",
+				// 			icon: 'none'
+				// 		})
+				// 		return
+				// 	}
+				// 	if (!that.formData.merchant_name) {
+				// 		uni.showToast({
+				// 			title: "收款二维码商户名称",
+				// 			icon: 'none'
+				// 		})
+				// 		return
+				// 	}
+				// }
+
+				if (that.formData.type == 10) {
+					that.formData.bank_account_number = '';
+					that.formData.bank_name = '';
+					that.formData.merchant_name = '';
+					that.formData.qr_code_id = "";
+				}
+				if (that.formData.type == 20) {
+					that.formData.corporate_account_name = '';
+					that.formData.corporate_account_number = '';
+					that.formData.corporate_bank_name = '';
+				}
+				help.openShop({
+					form: that.formData
+				}).then(result => {
+					if (result.status == 200) {
+						that.cdDia = true
+					}
+					uni.showToast({
+						title: result.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
 			},
 			// 正面
 			cardJustSuccess(list) {
@@ -246,12 +419,12 @@
 						list.forEach(item => {
 							idList.push(item.response.data.fileInfo.file_id)
 						});
-						this.formData.card_just_imgage_ids = idList.join(',');
+						this.formData.id_card_front_id = idList.join(',');
 					}
 				}
 			},
 			cardJustRemove(file, fileList) {
-				this.formData.card_just_imgage_ids = this.handleRemove(file, fileList);
+				this.formData.id_card_front_id = this.handleRemove(file, fileList);
 			},
 			// 反面
 			cardBackSuccessve(list) {
@@ -267,12 +440,12 @@
 						list.forEach(item => {
 							idList.push(item.response.data.fileInfo.file_id)
 						});
-						this.formData.card_back_imgage_ids = idList.join(',');
+						this.formData.id_card_back_id = idList.join(',');
 					}
 				}
 			},
 			cardBackRemove(file, fileList) {
-				this.formData.card_back_imgage_ids = this.handleRemove(file, fileList);
+				this.formData.id_card_back_id = this.handleRemove(file, fileList);
 			},
 			// 手持营业执照
 			proveHoldSuccess(list) {
@@ -288,12 +461,12 @@
 						list.forEach(item => {
 							idList.push(item.response.data.fileInfo.file_id)
 						});
-						this.formData.prove_hold_imgage_ids = idList.join(',');
+						this.formData.photo_id = idList.join(',');
 					}
 				}
 			},
 			proveholdRemove(file, fileList) {
-				this.formData.prove_hold_imgage_ids = this.handleRemove(file, fileList);
+				this.formData.photo_id = this.handleRemove(file, fileList);
 			},
 			// 营业证
 			proveSuccess(list) {
@@ -309,12 +482,33 @@
 						list.forEach(item => {
 							idList.push(item.response.data.fileInfo.file_id)
 						});
-						this.formData.prove_imgage_ids = idList.join(',');
+						this.formData.business_license_id = idList.join(',');
 					}
 				}
 			},
 			proveRemove(file, fileList) {
-				this.formData.prove_imgage_ids = this.handleRemove(file, fileList);
+				this.formData.business_license_id = this.handleRemove(file, fileList);
+			},
+			// 二维码
+			proveCodeSuccess(list) {
+				if (list.length > 0) {
+					const {
+						response
+					} = list[0];
+					if (response.status == 200) {
+						uni.showToast({
+							title: "上传成功"
+						})
+						let idList = []
+						list.forEach(item => {
+							idList.push(item.response.data.fileInfo.file_id)
+						});
+						this.formData.qr_code_id = idList.join(',');
+					}
+				}
+			},
+			proveCodeRemove(file, fileList) {
+				this.formData.qr_code_id = this.handleRemove(file, fileList);
 			},
 			handleRemove: function(file, fileList) {
 				let idList = []
@@ -432,7 +626,82 @@
 						font-style: normal;
 						text-transform: none;
 					}
+
+				}
+			}
+		}
+	}
+
+	::v-deep .u-list-item {
+		width: 153rpx !important;
+		height: 153rpx !important;
+		margin: 0 !important;
+	}
+
+	.dia {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(0, 0, 0, 0.7);
+		z-index: 99;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.diaMain {
+			width: 560rpx;
+			height: 432rpx;
+			background: linear-gradient(180deg, #FFE4E4 0%, #FFFFFF 100%);
+			border-radius: 12rpx 12rpx 12rpx 12rpx;
+			opacity: 1;
+			position: relative;
+
+			.ld {
+				width: 100rpx;
+				height: 100rpx;
+				position: absolute;
+				top: -50rpx;
+				left: 230rpx;
 			}
+
+			.cdTitle {
+				width: 128rpx;
+				height: 44rpx;
+				font-size: 32rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: #000000;
+				line-height: 44rpx;
+				margin: 80rpx 0 0 216rpx;
+			}
+
+			.cdInfo {
+				width: 498rpx;
+				height: 120rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				color: #727272;
+				line-height: 38rpx;
+				margin-left: 48rpx;
+				margin-top: 28rpx;
+			}
+
+			.iKnow {
+				width: 412rpx;
+				height: 72rpx;
+				background: #F55349;
+				border-radius: 8rpx 8rpx 8rpx 8rpx;
+				opacity: 1;
+				font-size: 28rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+				line-height: 72rpx;
+				margin: 36rpx 0 0 74rpx;
+				text-align: center;
 			}
 		}
 	}

pages/user/index.vue

@@ -553,18 +553,21 @@
 							开通商城
 						</view>
 					</view>
-					<!-- <view class="serveIcon"  @click="goJump('/pages/gamll/mall')">
+					<view class="serveIcon" @click="goJump('/pages/gamll/dailyReport')">
-						<image :src="$picUrl+'/static/user/gmall.png?t=1'" class="icons"></image>
+						<!-- <image :src="$picUrl+'/static/user/report?t=1'" class="icons"></image> -->
+						<image src="../../static/user/report.png" class="icons"></image>
 						<view class="serveInfo">
-							开通商城2
+							每日线报
 						</view>
 					</view>
-					<view class="serveIcon"  @click="goJump('/pages/gamll/dailyReport')">
+					<view class="serveIcon" @click="goJump('/pages/gamll/mall')">
-						<image :src="$picUrl+'/static/user/gmall.png?t=1'" class="icons"></image>
+						<image src="../../static/user/shop_data.png" class="icons"></image>
+						<!-- <image :src="$picUrl+'/static/user/shop_data.png?t=1'" class="icons"></image> -->
 						<view class="serveInfo">
-							每日线报
+							商城资料
 						</view>
-					</view> -->
+					</view>
+
 				</view>
 			</view>
 			<!-- 商品推荐 -->