hmp 4 år sedan
förälder
incheckning
8e235cac48

+ 1 - 1
App.vue

@@ -38,5 +38,5 @@
 	@import "uview-ui/index.scss";
 	 @import "assets/colorui/main.css";
 	 @import "assets/colorui/icon.css";
-	 @import "assets/colorui/app.css"; /* 你的项目css */
+	 @import "assets/colorui/app.scss"; /* 你的项目css */
 </style>

+ 21 - 9
assets/colorui/app.css → assets/colorui/app.scss

@@ -1,5 +1,8 @@
+$base-color:#ff9447;
+// #D18C42
+
 .btn-color{
-	color: #D18C42;
+	color: $base-color;
 }
 
 
@@ -16,13 +19,13 @@
 }
 
 .btn-bg-color{
-	background-color: #D18C42;
+	background-color: $base-color;
 	color: #FFFFFF;
 }
 
 .btn-line-color{
-	border: 1rpx solid #D18C42;
-	color: #D18C42;
+	border: 1rpx solid $base-color;
+	color: $base-color;
 }
 
 .text-base{
@@ -34,18 +37,18 @@
 	color: #ffffff;
 }
 .line-base{
-	border: 1rpx solid #D18C42;
-	color: #D18C42;
+	border: 1rpx solid $base-color;
+	color: $base-color;
 }
 
 .line-btn-base{
-	border: 1rpx solid #D18C42;
-	color: #D18C42;
+	border: 1rpx solid $base-color;
+	color: $base-color;
 }
 
 
 .bg-base{
-	background-color: #D18C42;
+	background-color: $base-color;
 	color: #FFFFFF;
 }
 
@@ -214,7 +217,16 @@
 }
 
 /* ==========text-cut=========== */
+.btnCss {
+		border: none;
+		border-radius: 0rpx;
+		outline: none;
+	}
 
+	.btnCss::after {
+		border: none;
+		outline: none;
+	}
 
 
 .text-cut-1 {

+ 1 - 1
components/my-bar.vue

@@ -35,7 +35,7 @@
 <style lang="scss" scoped>
 	.bg {
 		height: 440rpx;
-		background-image: linear-gradient(#2a5ba4, #37678d, #836079);
+		background-image: linear-gradient(#2a5ba4, #35668c, #7a5f79);
 		border-radius: 0 0 200rpx -200rpx;
 	}
 

+ 2 - 2
pages/activity/comps/card.vue

@@ -2,7 +2,7 @@
 	<view class="">
 		<view class="card" style="display: flex;" v-for="(item,index) in cardList" :key="index">
 			<view v-if="checkAllShow" class="center" style="width: 10%;background-color: #F1F1F1;">
-				<u-checkbox shape="circle" @change="checkboxChange" v-model="item.checked" :name="index"></u-checkbox>
+				<u-checkbox active-color="#ff9447" shape="circle" @change="checkboxChange" v-model="item.checked" :name="index"></u-checkbox>
 			</view>
 			<navigator :url="`/pages/publish/detail?id=${item.id}&current=${current}`" hover-class="none" class="" >
 				<image class="bg" :src="item.pic"></image>
@@ -26,7 +26,7 @@
 			<view class="" style="height: 110rpx;"></view>
 			<view class="bottom-bar">
 				<view class="left">
-					<u-checkbox @change="checkAllChange" shape="circle" v-model="checkAll">
+					<u-checkbox active-color="#ff9447" @change="checkAllChange" shape="circle" v-model="checkAll">
 						全选
 					</u-checkbox>
 				</view>

+ 27 - 23
pages/card/card.vue

@@ -1,9 +1,10 @@
 <template>
 	<view>
-		<button  class="card" style="font-size: 30rpx;color: #5c5c5c;" v-for="(item,index) in menuList" :key="index" @click="jump(item.path)">
+		<button class="card btnCss" style="font-size: 30rpx;color: #5c5c5c;border-radius: 0;border: none;"
+			v-for="(item,index) in menuList" :key="index" @click="jump(item.path)">
 			<view style="display: flex;">
 				<view class="center">
-					<image style="width: 36rpx;height: 36rpx;" :src="item.icon" ></image>
+					<image style="width: 36rpx;height: 36rpx;" :src="item.icon"></image>
 				</view>
 				<view class="center">
 					<text class="padding-left-10">{{item.name}}</text>
@@ -13,11 +14,12 @@
 				<text class="cuIcon-right"></text>
 			</view>
 		</button>
-		
-		<button open-type="contact"  class="card" style="font-size: 30rpx;color: #5c5c5c;">
+
+		<button open-type="contact" class="card btnCss"
+			style="font-size: 30rpx;color: #5c5c5c;border-radius: 0;border: none;">
 			<view style="display: flex;">
 				<view class="center">
-					<image style="width: 36rpx;height: 36rpx;" src="/static/icon/kefu.png" ></image>
+					<image style="width: 36rpx;height: 36rpx;" src="/static/icon/kefu.png"></image>
 				</view>
 				<view class="center">
 					<text class="padding-left-10">客服</text>
@@ -27,7 +29,6 @@
 				<text class="cuIcon-right"></text>
 			</view>
 		</button>
-		
 	</view>
 </template>
 
@@ -35,32 +36,35 @@
 	export default {
 		data() {
 			return {
-				menuList:[
-					{
-						icon:'/static/icon/shangjia.png',
-						name:'商家认证',
-						path:'/pages/shop-info/shop-info?phone='+this.$cache.get('phone')
+				menuList: [{
+						icon: '/static/icon/shangjia.png',
+						name: '商家认证',
+						path: '/pages/shop-info/shop-info?edit=true&phone=' + this.$cache.get('phone')
 					},
 					{
-						icon:'/static/icon/bank.png',
-						name:'银行卡',
-						path:'/pages/userBank/userBank'
+						icon: '/static/icon/bank.png',
+						name: '银行卡',
+						path: '/pages/userBank/userBank'
 					},
 					{
-						icon:'/static/icon/xiazai.png',
-						name:'物料下载',
-						path:'/pages/mine/card/pay-setting'
+						icon: '/static/icon/xiazai.png',
+						name: '物料下载',
+						path: ''
 					},
 					{
-						icon:'/static/icon/wendang.png',
-						name:'开发文档',
-						path:'/pages/mine/card/pay-setting'
+						icon: '/static/icon/wendang.png',
+						name: '开发文档',
+						path: ''
 					},
 				]
 			}
 		},
 		methods: {
-			jump(url){
+			jump(url) {
+				if (this.$isEmpty(url)) {
+					this.$u.toast('即将推出')
+					return
+				}
 				uni.navigateTo({
 					url
 				})
@@ -70,11 +74,11 @@
 </script>
 
 <style lang="scss" scoped>
-	.card{
+	.card {
 		display: flex;
 		justify-content: space-between;
 		margin: 16rpx 0;
-		padding:8rpx 30rpx;
+		padding: 8rpx 30rpx;
 		background-color: #FFFFFF;
 	}
 </style>

+ 1 - 1
pages/index/index.vue

@@ -93,7 +93,7 @@
 			<view class="system">
 				<text class="title">数字化系统</text>
 				<view class="cu-list grid col-4 no-border margin-top-30" style="border-radius:20rpx ;">
-					<view class="cu-item" @click="$jump(item.path)" v-for="(item,index) in systemList" :key="index">
+					<view class="cu-item" @click="$u.toast('即将推出')" v-for="(item,index) in systemList" :key="index">
 						<view class="grid-icon">
 							<image mode="heightFix" style="height: 56rpx;" :src="item.icon" />
 						</view>

+ 12 - 1
pages/publish/publish.vue

@@ -89,7 +89,7 @@
 				</view>
 				<view class="text-center margin-top-20">
 					<text>提交即表示同意</text>
-					<text class="btn-color">《商家活动工具活动发布规则》</text>
+					<text style="color: #ff9447;" @click="protocol">《商家活动工具活动发布规则》</text>
 				</view>
 			</view>
 		</view>
@@ -198,6 +198,7 @@
 			this.transparent = obj.scrollTop * 0.006;
 		},
 		onReady() {
+			this.getElInfo()
 			this.$refs.uForm.setRules(this.rules);
 		},
 		onLoad() {
@@ -282,6 +283,11 @@
 					}
 				});
 			},
+			protocol(){
+				uni.navigateTo({
+					url: "/pages/webView/webView?url=" + this.$global.publishActivity
+				})
+			},
 			doPublish() {
 				if (!this.form.pic) {
 					this.$u.toast('请上传封面图')
@@ -310,6 +316,11 @@
 </script>
 
 <style lang="scss" scoped>
+	.btn-bg-color{
+		background-color: #FF9447;
+		color: #FFFFFF;
+	}
+	
 	.publish {
 		overflow: hidden;
 		border-radius: 10rpx;

+ 74 - 27
pages/shop-info/shop-info.vue

@@ -22,11 +22,11 @@
 					</view>
 					<view class="border">
 						<u-form-item label="业务联系人" prop="personName">
-							<u-input :border="false" placeholder="请输入业务联系人" v-model="form.personName"></u-input>
+							<u-input :disabled="isEdit" :border="false" placeholder="请输入业务联系人" v-model="form.personName"></u-input>
 						</u-form-item>
 					</view>
 					<view class="tips">
-						<text>*认证通过后,姓名将不可修改</text>
+						<text>*认证通过后,业务联系人将不可修改</text>
 					</view>
 					<view class="border">
 						<u-form-item label="联系方式" prop="personTel">
@@ -109,6 +109,9 @@
 							</view>
 						</u-form-item>
 					</view>
+					<view class="tips">
+						<text>*认证通过后,营业执照将不可修改</text>
+					</view>
 					<view class="border">
 						<view style="padding: 30rpx 0 10rpx;">
 							<text>店铺实况</text>
@@ -141,9 +144,12 @@
 					</view>
 					<view class="border">
 						<u-form-item label="身份证号码" prop="personIdCard">
-							<u-input :border="false" placeholder="请输入身份证号码" v-model="form.personIdCard"></u-input>
+							<u-input :disabled="isEdit" :border="false" placeholder="请输入身份证号码" v-model="form.personIdCard"></u-input>
 						</u-form-item>
 					</view>
+					<view class="tips">
+						<text>*认证通过后,身份证将不可修改</text>
+					</view>
 					<view class="photo border">
 						<text>请拿出本人有效二代身份证件准备拍摄</text>
 						<view class="box">
@@ -158,6 +164,9 @@
 									src="../../static/icon/idcard1.png"></image>
 							</view>
 						</view>
+						<view class="tips">
+							<text>*认证通过后,身份证人像面将不可修改</text>
+						</view>
 						<view class="box" style="margin-top: 0;">
 							<view style="position: relative;" class="uploadImg" @click="chooseImage('idCardContrary')">
 								<view v-if="$isEmpty(form.idCardContrary)">
@@ -170,6 +179,9 @@
 									src="../../static/icon/idcard2.png"></image>
 							</view>
 						</view>
+						<view class="tips">
+							<text>*认证通过后,身份证国徽面将不可修改</text>
+						</view>
 						<view style="margin: 30rpx 0;">
 							<text>拍摄时确保身份证边框完整,字体清晰,亮度均匀</text>
 						</view>
@@ -183,9 +195,9 @@
 				</view>
 			</view>
 			<view v-else class="center flex-direction margin-bottom-30" style="margin-top: 100rpx;">
-				<view class="center margin-bottom-20 text-sm ">
+				<view v-if="!isEdit" class=" margin-bottom-20 text-sm center " >
 					<text style="color: #949494;">确认注册即代表已阅读并同意</text>
-					<text style="color: #104DFF;" @click="protocol">《软件服务协议》</text>
+					<text style="color: #104DFF;" @click="protocol">《联兑通软件服务协议》</text>
 				</view>
 				<view @click="submit" class="btn cu-btn round" style="width:90%;height: 90rpx;font-size: 34rpx;">
 					提交资料
@@ -216,7 +228,7 @@
 
 		<u-popup v-model="checkboxShow" mode="bottom" height="50%" border-radius="12">
 			<view class="padding-30">
-				<u-checkbox-group>
+				<u-checkbox-group active-color="#D18C42">
 					<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in checkboxList"
 						:key="index" :name="index">
 						{{ item.name }}
@@ -246,6 +258,7 @@
 				},
 				labelWidth: 170,
 				form: {
+					id:'',
 					mallId: '',
 					mallAreaId: '',
 					name: '',
@@ -261,6 +274,7 @@
 					businessLicense: '',
 					shopPic: '',
 					slogan: '',
+					email:'',
 
 					province: '',
 					city: '',
@@ -271,6 +285,7 @@
 
 					auditStatus: 0,
 					labelIds: '',
+					labelNames:'',
 					cover: '',
 				},
 				regionShow: false,
@@ -289,7 +304,9 @@
 				//公司总类
 				checkboxShow: false,
 				checkboxList: [],
-				step: 1
+				step: 3,
+				//编辑还是修改
+				isEdit:false
 			}
 		},
 		watch: {
@@ -323,8 +340,14 @@
 				return
 			}
 			this.form.personTel = options.phone
+			
+			if (options.edit) {
+				this.isEdit=true
+				this.fetchShopDetail()
+			}else{
+				this.getShopLabelAll()
+			}
 			this.fetchMallList()
-			this.getShopLabelAll()
 		},
 		methods: {
 			async uploadShopPics(){
@@ -338,6 +361,16 @@
 					this.imgList.splice(index, 1)
 				})
 			},
+			async fetchShopDetail() {
+				let params = {
+					id: this.vuex_shopId
+				}
+				let res = await this.$api.shop.detail(params)
+				this.$util.objectCoppy(this.form,res.data)
+				this.mallLabel=res.data.mallName
+				this.imgList=this.form.shopPic.split(",")
+				this.getShopLabelByMallId()
+			},
 			prevStep() {
 				if (this.step > 1 && this.step < 4) {
 					this.step--
@@ -357,8 +390,6 @@
 						this.form.labelIds = this.checkboxList.filter(item => item.checked == true).map(item => item.id).join(",")
 						this.form.labelNames=this.checkboxList.filter(item=>item.checked == true).map(item => item.name).join(",")
 					}
-					
-					
 					if (this.$isEmpty(this.form.labelIds)) {
 						this.$u.toast('请选择公司总类')
 						return
@@ -391,11 +422,11 @@
 				})
 			},
 			getShopLabelAll() {
-				let p = {
+				let params = {
 					current: 0,
-					size: 50
+					size: 500
 				}
-				this.$api.mall.getShopLabelAll(p).then(res => {
+				this.$api.mall.getShopLabelAll(params).then(res => {
 					res.data.records.forEach(item => {
 						item.checked = false
 					})
@@ -413,6 +444,10 @@
 
 			},
 			async chooseImage(name) {
+				if (this.isEdit && (name=='businessLicense' || name=='idCardFront'|| name=='idCardContrary')) {
+					this.$u.toast('不可修改')
+					return
+				}
 				let res = await this.$mpi.chooseImage()
 				this.$api.uploadFile(res[0]).then(res => {
 					this.form[name] = res.data.link
@@ -454,13 +489,20 @@
 				this.form.mallAreaId = e[0].value
 			},
 			//获取多选的标签
-			getShopLabelByMallId() {
-				this.$api.mall.getShopLabelByMallId(this.form.mallId).then(res => {
-					res.data.forEach(item => {
+			async getShopLabelByMallId() {
+				let res=await this.$api.mall.getShopLabelByMallId(this.form.mallId)
+				res.data.forEach(item => {
+					if (this.$isEmpty(this.form.id)) {
 						item.checked = false
-					})
-					this.checkboxList = res.data
+					}else{
+						if (this.form.labelIds.indexOf(item.id)!=-1) {
+							item.checked=true
+						}else{
+							item.checked=false
+						}
+					}
 				})
+				this.checkboxList = res.data
 			},
 			//多选确认
 			checkboxChange(e) {
@@ -480,28 +522,33 @@
 					this.$u.toast('请上传身份证反面照')
 					return
 				}
-				let content=''
-				if (this.$isEmpty(this.form.mallId)) {
-					content='提交成功,请耐心等待平台审核'
+				
+				
+				let content='提交成功,请耐心等待商场管理员审核'
+				let url='/pages/login/account-login'
+				if (this.isEdit) {
+					content='修改成功'
+					url='/pages/index/index'
 				}else{
-					content='提交成功,请耐心等待商场管理员审核'
+					if (this.$isEmpty(this.form.mallId)) {
+						content='提交成功,请耐心等待平台审核'
+					}
 				}
-				
 				this.$api.shop.submit(this.form).then(res => {
 					if (res.success == true) {
 						this.$dialog.showModal(content, false).then(() => {
 							uni.reLaunch({
-								url: "../login/account-login"
+								url
 							})
 						})
 					}
 				})
 			},
-			protocol() {
+			protocol(){
 				uni.navigateTo({
-					url: "../webView/webView?url=" + this.$global.protocol
+					url: "/pages/webView/webView?url=" + this.$global.shopRegister
 				})
-			}
+			},
 		}
 	}
 </script>

+ 11 - 5
utils/global.js

@@ -1,10 +1,19 @@
 let global = {
 
-	protocol: 'https://ldt.guosen-fumao.cn/shop_protocol.html',
+	//商户注册协议
+	shopRegister: 'https://ldt.guosen-fumao.cn/shop_register.html',
+	//活动发布协议
+	publishActivity:'https://ldt.guosen-fumao.cn/publish_activity.html',
 	
 	// WebSocketUrl:'ws://localhost:2539/websocket/',
 	WebSocketUrl:'wss://ldt.guosen-fumao.cn/websocket/',
+	//webSocket message
+	socketMessage:{
+		payForPaymentCode:'用户通过付款码付款',//商家扫描用户的付款码支付
+		userPaidOfPaymentCode:'用户已通过付款码支付',
+	},
 	
+	//商户收款码
 	QR_PATH:'https://ldt.guosen-fumao.cn/h5/#/pages/checkstand/index?id=',
 	
 	TRANSFORM_PARAMS:'95963',
@@ -14,10 +23,7 @@ let global = {
 		APPID: 'wx2db9c41e85d5a4fc', //appid
 	},
 	
-	socketMessage:{
-		payForPaymentCode:'用户通过付款码付款',//商家扫描用户的付款码支付
-		userPaidOfPaymentCode:'用户已通过付款码支付',
-	}
+	
 }
 
 export default global

+ 3 - 2
utils/util.js

@@ -74,8 +74,9 @@ util.uniqueArray = (arr)=>{
 	return [...new Set(arr)]
 }
 
-
-
+util.objectCoppy =(target,source)=>{
+	Object.keys(target).forEach(key=>{target[key]=source[key]})
+}
 
 //获取某一个页面上下文 context
 util.getPageCtx = (idx = 0) => {