修改

components/mp-tree/css/style.scss

@@ -1,5 +1,3 @@
-$base-color:#ff9447;
-
 .flex_between_center {
 		display: flex;
 		justify-content: space-between;

components/uploadimg/uploadImg.vue

@@ -5,7 +5,7 @@
 				<image style="width: 60rpx;height: 60rpx;margin-bottom: 20rpx;" :src="addImg"></image>
 				<text>{{title}}</text>
 			</view>
-			<image class="img" v-else :src="model" :style="{'width':width+'rpx','height':height+'rpx'}"></image>
+			<image  v-else :src="model" :style="{'width':width+'rpx','height':height+'rpx'}"></image>
 			<image v-if="!model && enableImg" style="height: 160rpx;width: 90%;position: absolute" :src="bgImg">
 			</image>
 		</view>
@@ -79,11 +79,7 @@
 			height: 70rpx;
 		}
 
-		.img {
-			width: 480rpx;
-			height: 300rpx;
-		}
-
+		
 		text {
 			color: #999;
 		}

manifest.json

@@ -1,79 +1,85 @@
 {
-    "name" : "guosen-ldt-shop",
-    "appid" : "__UNI__7F38F21",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx2db9c41e85d5a4fc",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : true,
-            "postcss" : true,
-            "minified" : true
-        },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "您的位置信息将用于店铺注册"
-            }
-        }
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    }
+	"name": "guosen-ldt-shop",
+	"appid": "__UNI__7F38F21",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* SDK配置 */
+			"sdkConfigs": {}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wx2db9c41e85d5a4fc",
+		"setting": {
+			"urlCheck": false,
+			"es6": true,
+			"postcss": true,
+			"minified": true
+		},
+		"usingComponents": true,
+		"permission": {
+			"scope.userLocation": {
+				"desc": "您的位置信息将用于店铺注册"
+			}
+		},
+		"plugins": {
+			"ocr-plugin": {
+				"version": "3.0.4",
+				"provider": "wx4418e3e031e551be"
+			}
+		}
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	}
 }

pages.json

@@ -128,9 +128,11 @@
             {
 				"navigationStyle":"custom",
                 "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": false,
+				"usingComponents":{
+					"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+				}
             }
-            
         }
         ,{
             "path" : "pages/member/add",
@@ -182,7 +184,7 @@
             "style" :                                                                                    
             {
 				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#FE9644",
+				"navigationBarBackgroundColor": "#EF9944",
                 "navigationBarTitleText": "收款码",
                 "enablePullDownRefresh": false
             }
@@ -407,6 +409,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/test/test2/test2",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "test",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/bill/bill.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
+		<u-picker confirm-color="#EF9944" v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 		<view class="top">
 			<view class="tixian">

pages/card/card.vue

@@ -4,8 +4,8 @@
 			<button v-if="index!=4" class="card btnCss" style="font-size: 30rpx;color: #5c5c5c;border-radius: 0;border: none;">
 				<view style="display: flex;">
 					<view class="center">
-						<image v-if="index!=1 && index!=5" style="width:36rpx" :src="item.icon" mode="widthFix"></image>
-						<image v-else style="width:38rpx" :src="item.icon" mode="widthFix"></image>
+						<image v-if="index!=1 && index!=5" style="width:36rpx;height: 36rpx;" :src="item.icon" ></image>
+						<image v-else style="width:38rpx;height: 38rpx;" :src="item.icon"></image>
 					</view>
 					<view class="center">
 						<text class="padding-left-10">{{item.name}}</text>

pages/checkstand/pay-qrcode.vue

@@ -74,7 +74,7 @@
 
 <style>
 	page {
-		background-color: #FE9644;
+		background-color: #EF9944;
 	}
 </style>
 <style lang="scss" scoped>
@@ -90,7 +90,7 @@
 			height: 100rpx;
 			width: 100%;
 			font-size: 35rpx;
-			color: #FD711B;
+			color: #FE9644;
 			background-color: #F7F7F7;
 			 font-weight: 600;
 			 letter-spacing: 3rpx;

pages/index/index.vue

@@ -96,7 +96,7 @@
 		<u-modal @confirm="$jump('/pages/member/member')" :show-cancel-button="true" confirm-color="#ff9447"
 			confirm-text="立即开启" cancel-text="暂不开启" v-model="isOpenMemberShow" content="请先创建会员中心"></u-modal>
 			
-		<u-select @confirm="shopConfirm" :default-value="defaultValue" v-model="shopShow" value-name="id" label-name="name" :list="shopList">
+		<u-select confirm-color="#EF9944" @confirm="shopConfirm" :default-value="defaultValue" v-model="shopShow" value-name="id" label-name="name" :list="shopList">
 		</u-select>
 	</view>
 </template>
@@ -199,11 +199,6 @@
 				taskDetail: {}
 			}
 		},
-		watch:{
-			defaultValue(){
-				console.log("123");
-			}
-		},
 		onShow() {
 			this.init()
 		},
@@ -227,6 +222,9 @@
 					this.$u.vuex('vuex_shopStatus', false)
 					return
 				}
+				if (this.$cache.get('defaultValue')) {
+					this.defaultValue=this.$cache.get('defaultValue')
+				}
 				this.shopList = res.data.records
 				let item = this.shopList[this.defaultValue[0]]
 				this.shopId = item.id
@@ -271,8 +269,8 @@
 				this.shopLable = e[0].label
 				let item = this.shopList.filter((item,index) => {
 					if (this.shopId == item.id) {
-						console.log([index]);
 						this.defaultValue=[index]
+						this.$cache.put('defaultValue',this.defaultValue)
 						return true
 					}
 				})

pages/login/login.vue

@@ -7,7 +7,7 @@
 		<view class="content">
 			<view class="top">
 				<view class="logo">
-					<image src="@/static/icon/logo.png" mode=""></image>
+					<image src="@/static/icon/logo2.png" mode=""></image>
 				</view>
 				<view class="title">
 					<text>欢迎进入联兑通</text>
@@ -223,18 +223,13 @@
 			display: flex;
 
 			.logo {
-				background-color: $color;
-				width: 130rpx;
-				height: 130rpx;
-				border-radius: 30rpx;
+				padding-right: 20rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				margin-right: 20rpx;
-
 				image {
-					width: 90rpx;
-					height: 90rpx;
+					width: 140rpx;
+					height: 140rpx;
 				}
 			}
 
@@ -248,13 +243,14 @@
 
 				text:first-child {
 					font-weight: 800;
-					font-size: 50rpx;
+					font-size: 46rpx;
 					color: #000;
 					margin-bottom: 20rpx;
 				}
 
 				text:last-child {
-					font-size: 28rpx;
+					font-size: 26rpx;
+					font-weight: 400;
 					color: #7f7f7f;
 				}
 			}

pages/member/add.vue

@@ -1,55 +1,64 @@
 <template>
 	<view>
-		<view class="margin-30">
-			<text class="build_title">构建您的私域流量</text>
+		<view class="text-base padding-30 text-lg">
+			构建您的私域流量 牢牢锁住您的客户
 		</view>
-		<view class="card">
-			<text class="title">会员门槛</text>
-			<text class="desc">完成一笔任意金额交易即成会员</text>
-		</view>
-		<view class="card margin-top-30">
-			<text class="title">积分使用范围</text>
-			<text class="desc">通用（可在任意场景使用）</text>
+		<view class="bg-white padding-30 flex justify-between">
+			<text class="bold">会员门槛</text>
+			<text class="desc center">完成一笔任意金额交易即成会员</text>
 		</view>
-		
-		<view class="card margin-top-30">
-			<view class="margin-bottom-20">
-				<text class="title">积分价值</text>
-				<text class="sub_title">(例：1 元= 10 积分)</text>
+		<view class="card">
+			<view class="title">
+				<text class="bold">积分设置</text>
+				<text class="desc center">积分为本平台通用，可在任意场景使用</text>
 			</view>
-			<view class="flex">
-				<view class="center" style="width: 25%;">
-					<text class="text-bold  text-base" style="font-size: 40rpx;">1</text>
-					<text style="margin: 0 20rpx;">元</text>
-					<text style="margin: 0 20rpx;">=</text>
-				</view>
-				<view class="center" style="width: 45%;margin-left: 20rpx;">
-					<u-input disabled type="digit" height="50" :border="true" :clearable="false" v-model="form.point" placeholder="请输入积分数"/>
-					<view class="cu-tag bg-color radius">
-						积分
-					</view>
-				</view>
+			<view class="padding-30 u-border-bottom">
+				<u-form :model="form" ref="uForm" label-width="180" label-align="right">
+					<u-form-item label="积分兑率" :border-bottom="false">
+						<view class="margin-left-20">
+							<u-slider :min="1" height="10" v-model="value"  active-color="#EF9944" :use-slot="true" >
+								<view class="">
+									<view class="" >
+										<view class="badge-button">
+											{{value}}
+										</view>
+									</view>
+								</view>
+							</u-slider>
+							<!-- <u-slider v-model="value"  ></u-slider> -->
+							<!-- <u-input height="60" @click="show=!show" disabled :border="true" :clearable="false"
+								v-model="form.consumeOnePoint" placeholder="请选择返利比例" /> -->
+						</view>
+					</u-form-item>
+					<u-form-item label="消费1元赠送" :border-bottom="false">
+						<view class="center" style="justify-content: flex-start;margin-left: 20rpx;">
+							<u-input type="digit" style="width: 90%;" height="60" :border="true" :clearable="false"
+								v-model="form.consumeOnePoint" placeholder="请输入积分数" />
+							<view class="cu-tag bg-color radius" style="height: 60rpx;">
+								积分
+							</view>
+						</view>
+					</u-form-item>
+				</u-form>
 			</view>
-		</view>
-		
-		<view class="card margin-top-30">
-			<view class="margin-bottom-20">
-				<text class="title">积分规则</text>
+			<view class="title" style="margin-top: 20rpx;">
+				<text class="bold">积分价值</text>
+				<text class="desc">1积分={{value / 100}}元</text>
 			</view>
-			<view class="flex">
-				<view class="center" style="width: 25%;">
-					<text>消费1元赠送</text>
-				</view>
-				<view class="center" style="width: 45%;margin-left: 20rpx;">
-					<u-input disabled type="digit" height="50" :border="true" :clearable="false" v-model="form.consumeOnePoint" placeholder="请输入积分数"/>
-					<view class="cu-tag bg-color radius">
-						积分
-					</view>
-				</view>
+
+			<view class="desc" style="margin-top: 60rpx;" v-if="false">
+				提示：消费返利赠送积分比例建议不超过30%，如超过30%需要另外
+				进行申请，审批通过后即可。
+				<text class="text-base">申请更高返利</text>
+				<text class="cuIcon-right text-base"></text>
 			</view>
 		</view>
-		
-		<view class="center flex-direction" style="position: fixed;bottom: 10%;width: 100%;">
+
+		<view class="tips">
+			从公域聚合投放到私域流量的沉淀，智能化数字化的数据管理，联兑通帮助企业在裂变获客、私域留存、营销转化、客户管理各个环节提供帮助和辅助，形成一个完整的私域闭环，能有效的提高企业的私域运营效率，减少了客户的流失以及提升产品的转化和复购。
+		</view>
+
+		<view class="center flex-direction" style="margin: 70rpx 0;">
 			<view class="margin-bottom-30 text-sm">
 				<text>提交代表已同意</text>
 				<text style="color: #3099F1;">会员中心规则说明</text>
@@ -58,6 +67,8 @@
 				提交
 			</view>
 		</view>
+
+		<u-select confirm-color="#EF9944" v-model="show" :list="list"></u-select>
 	</view>
 </template>
 
@@ -65,18 +76,28 @@
 	export default {
 		data() {
 			return {
+				value:1,
+				show:false,
+				list: [{
+						value: '0.01',
+						label: '10%'
+					},
+					{
+						value: '0.02',
+						label: '20%'
+					},
+					{
+						value: '0.03',
+						label: '30%'
+					}
+				],
 				form:{
-					point:'1',
 					consumeOnePoint:'0.01'
 				}
 			}
 		},
 		methods: {
 			submit(){
-				if (this.$isEmpty(this.form.point)) {
-					this.$u.toast('请输入积分数')
-					return
-				}
 				if (this.$isEmpty(this.form.consumeOnePoint)) {
 					this.$u.toast('请输入积分规则')
 					return
@@ -85,10 +106,9 @@
 				let params={
 					id,
 					sendPointUnit: this.form.consumeOnePoint,
-					pointRate: this.$digital.keepTwoDecimalFull(1/this.form.point),
+					pointRate: this.value / 100,
 					isOpenMember: 1
 				}
-				console.log(params);
 				this.$api.shop.submit(params).then(res=>{
 					if (res.success) {
 						this.$dialog.showModal('创建成功',false).then(res=>{
@@ -104,45 +124,55 @@
 		}
 	}
 </script>
+<style>
+	page {
+		background-color: #f4f5f7;
+	}
+</style>
 
-<style lang="scss" scoped>
-	page{
-		background-color: #F4F5F7;
+<style lang="scss">
+	.bold {
+		font-size: 34rpx;
+		color: #1C1C1C;
+		font-weight: 800;
 	}
-	
-	.bg-color{
+
+	.desc {
+		color: #8f8f8f;
+		font-size: 26rpx;
+		font-weight: 400;
+		line-height: 40rpx;
+	}
+
+	.bg-color {
 		background-color: #EE9230;
 		color: #FFFFFF;
 	}
-	
-	.build_title{
-		color: #EE9230;
-		font-size: 32rpx;
-	}
-	
-	.card{
-		border-radius: 24rpx;
+
+	.card {
+		padding: 40rpx 30rpx;
+		margin-top: 20rpx;
 		background-color: #FFFFFF;
-		padding:25rpx 40rpx;
-		display: flex;
-		flex-direction: column;
-		
-		.title{
-			font-weight: 800;
-			font-size: 32rpx;
-			margin-bottom: 20rpx;
-		}
-		
-		.sub_title{
-			font-size: 24rpx;
-			color: #999;
-			margin-left: 10rpx;
-		}
-		
-		
-		.desc{
-			font-size: 26rpx;
-			color: #666666;
+
+		.title {
+			display: flex;
+			justify-content: space-between;
 		}
 	}
+
+	.tips {
+		font-size: 24rpx;
+		padding: 30rpx;
+		line-height: 46rpx;
+		color: #b3b3b3;
+	}
+	
+	.badge-button {
+		padding: 14rpx 16rpx;
+		background-color: $base-color;
+		color: #fff;
+		border-radius: 10rpx;
+		font-size: 22rpx;
+		line-height: 1;
+	}
 </style>

pages/member/add1.vue

@@ -0,0 +1,148 @@
+<template>
+	<view>
+		<view class="margin-30">
+			<text class="build_title">构建您的私域流量</text>
+		</view>
+		<view class="card">
+			<text class="title">会员门槛</text>
+			<text class="desc">完成一笔任意金额交易即成会员</text>
+		</view>
+		<view class="card margin-top-30">
+			<text class="title">积分使用范围</text>
+			<text class="desc">通用（可在任意场景使用）</text>
+		</view>
+		
+		<view class="card margin-top-30">
+			<view class="margin-bottom-20">
+				<text class="title">积分价值</text>
+				<text class="sub_title">(例：1 元= 10 积分)</text>
+			</view>
+			<view class="flex">
+				<view class="center" style="width: 25%;">
+					<text class="text-bold  text-base" style="font-size: 40rpx;">1</text>
+					<text style="margin: 0 20rpx;">元</text>
+					<text style="margin: 0 20rpx;">=</text>
+				</view>
+				<view class="center" style="width: 45%;margin-left: 20rpx;">
+					<u-input disabled type="digit" height="50" :border="true" :clearable="false" v-model="form.point" placeholder="请输入积分数"/>
+					<view class="cu-tag bg-color radius">
+						积分
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="card margin-top-30">
+			<view class="margin-bottom-20">
+				<text class="title">积分规则</text>
+			</view>
+			<view class="flex">
+				<view class="center" style="width: 25%;">
+					<text>消费1元赠送</text>
+				</view>
+				<view class="center" style="width: 45%;margin-left: 20rpx;">
+					<u-input disabled type="digit" height="50" :border="true" :clearable="false" v-model="form.consumeOnePoint" placeholder="请输入积分数"/>
+					<view class="cu-tag bg-color radius">
+						积分
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="center flex-direction" style="position: fixed;bottom: 10%;width: 100%;">
+			<view class="margin-bottom-30 text-sm">
+				<text>提交代表已同意</text>
+				<text style="color: #3099F1;">会员中心规则说明</text>
+			</view>
+			<view @click="submit" class="cu-btn bg-color round" style="width: 70%;height: 90rpx;font-size: 36rpx;">
+				提交
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form:{
+					point:'1',
+					consumeOnePoint:'0.01'
+				}
+			}
+		},
+		methods: {
+			submit(){
+				if (this.$isEmpty(this.form.point)) {
+					this.$u.toast('请输入积分数')
+					return
+				}
+				if (this.$isEmpty(this.form.consumeOnePoint)) {
+					this.$u.toast('请输入积分规则')
+					return
+				}
+				let id=this.vuex_shopId
+				let params={
+					id,
+					sendPointUnit: this.form.consumeOnePoint,
+					pointRate: this.$digital.keepTwoDecimalFull(1/this.form.point),
+					isOpenMember: 1
+				}
+				console.log(params);
+				this.$api.shop.submit(params).then(res=>{
+					if (res.success) {
+						this.$dialog.showModal('创建成功',false).then(res=>{
+							uni.redirectTo({
+								url:"/pages/member/member"
+							})
+						})
+					}else{
+						this.$u.toast(res.msg)
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background-color: #F4F5F7;
+	}
+	
+	.bg-color{
+		background-color: #EE9230;
+		color: #FFFFFF;
+	}
+	
+	.build_title{
+		color: #EE9230;
+		font-size: 32rpx;
+	}
+	
+	.card{
+		border-radius: 24rpx;
+		background-color: #FFFFFF;
+		padding:25rpx 40rpx;
+		display: flex;
+		flex-direction: column;
+		
+		.title{
+			font-weight: 800;
+			font-size: 32rpx;
+			margin-bottom: 20rpx;
+		}
+		
+		.sub_title{
+			font-size: 24rpx;
+			color: #999;
+			margin-left: 10rpx;
+		}
+		
+		
+		.desc{
+			font-size: 26rpx;
+			color: #666666;
+		}
+	}
+</style>

pages/member/detail.vue

@@ -96,6 +96,7 @@
 					return
 				}
 				let params = {
+					payId:this.userId,
 					receiveId: this.vuex_shopId,
 					payStatus:this.$global.PAY_STATUS.SUCCESS,
 					current: mescroll.num,

pages/member/member.vue

@@ -2,7 +2,7 @@
 	<view>
 		<u-navbar :custom-back="back" title="会员中心"></u-navbar>
 		
-		<block v-show="!loading">
+		<block >
 			<view class="empty-page" v-if="!isOpenMember">
 				<image src="../../static/icon/huiyuan1.png" mode=""></image>
 				<text style="color: #303030;font-weight: 800;font-size: 32rpx;margin-top: 25rpx;">创建会员中心</text>
@@ -31,7 +31,9 @@
 					</view>
 					<view class="u-m-t-50 u-flex u-col-center u-row-center">
 						<text class="u-font-24 u-m-r-20">规则:消费 1 元赠送 {{detail.sendPointUnit}} 积分</text>
-						<u-button size="mini" shape="circle" @click="showPopup=true">更改规则</u-button>
+						<view class="cu-btn bg-white sm round" @click="showPopup=true" style="padding: 10rpx 20rpx;">
+							更改规则
+						</view>
 					</view>
 				</view>
 				
@@ -82,7 +84,7 @@
 				<text>更改积分规则</text>
 				<u-form>
 					<u-form-item label-width="170"  label="消费1元赠送">
-						<u-input   disabled type="digit" height="50" :border="true" :clearable="false" v-model="sendPointUnit" placeholder="请输入积分数"/>
+						<u-input   type="digit" height="50" :border="true" :clearable="false" v-model="sendPointUnit" placeholder="请输入积分数"/>
 						<view slot="right" class="cu-tag btn-bg-color radius">
 							积分
 						</view>
@@ -167,7 +169,6 @@
 				this.height=this.$u.sys().windowHeight - rectInfo.top + 'px'
 			},
 			async fetchMemberInfo(){
-				this.$refs.loading.showLoading()
 				let params={
 					shopId:this.vuex_shopId
 				}
@@ -176,10 +177,6 @@
 					this.isOpenMember = true
 					this.detail = res.data
 				}
-				setTimeout(()=>{
-					this.$refs.loading.hide()
-					this.loading=false
-				},300)
 			},
 			downCallback() {
 				setTimeout(()=>{
@@ -236,8 +233,8 @@
 
 	.top-menu {
 		border-radius: 20rpx;
-		margin: 30rpx 20rpx;
-		padding: 50rpx;
+		margin: 20rpx 20rpx;
+		padding: 40rpx;
 		background-image: linear-gradient(to right, #272A46, #30355D);
 		color: #fff;
 		position: relative;
@@ -261,12 +258,12 @@
 			align-items: center;
 			justify-content: center;
 			flex:1;
-			margin-top: 30rpx;
+			margin-top: 40rpx;
 			text:first-child {
-				margin-bottom: 10rpx;
+				margin-bottom: 5rpx;
 				color: #FFFFFF;
 				font-weight: 800;
-				font-size: 40rpx;
+				font-size: 38rpx;
 			}
 
 			text:last-child {

pages/my-bills/bills-detail.vue

@@ -5,8 +5,9 @@
 				<image style="border-radius: 50%;" :src="billDetail.avatar?billDetail.avatar:'/static/icon/avatar.png'" mode="aspectFit"></image>
 				<text class="title">{{billDetail.nickName?billDetail.nickName:'微信用户'}}</text>
 				<view class="data">
-					<view class="text-base price plus" style="padding: 0;">
-						{{billDetail.cost}}
+					<view class="price plus text-base text-bold" style="padding: 0;">
+						<block v-if="$isNotEmpty(billDetail.receiveNumTotal)">{{billDetail.receiveNumTotal}}</block>
+						<block v-else>{{billDetail.cost}}</block>
 					</view>
 				</view>
 			</view>
@@ -17,23 +18,35 @@
 				</view>
 				<view class="item">
 					<text>商品原价</text>
-					<text class="strong">{{billDetail.cost}}</text>
+					<text class="strong  price">{{billDetail.cost || 0.00}}</text>
+				</view>
+				<view class="item">
+					<text>联营折扣</text>
+					<text style="color: #000;">{{billDetail.discount==-1 || billDetail.discount==0?'无折扣': $digital.floatMul(billDetail.discount , 10) +'折'}}</text>
 				</view>
 				<view class="item">
 					<text>现金支付</text>
-					<text class="strong">+{{billDetail.price}}</text>
+					<text class="strong price plus">{{billDetail.price || 0.00}}</text>
 				</view>
 				<view class="item">
 					<text>积分余额支付</text>
-					<text class="strong">+{{billDetail.balanceNum}}</text>
+					<text class="strong price plus">{{billDetail.balanceNum || 0.00}}</text>
 				</view>
 				<view class="item">
 					<text>渠道积分支付</text>
-					<text class="strong">+{{billDetail.pointNum}}</text>
+					<text class="strong price plus">{{billDetail.pointNum || 0.00}}</text>
 				</view>
 				<view class="item">
-					<text>联营折扣</text>
-					<text style="color: #000;">{{billDetail.discount==-1 || billDetail.discount==0?'无折扣': $digital.floatMul(billDetail.discount , 10) +'折'}}</text>
+					<text>积分手续费</text>
+					<text class="text-base text-bold price reduce">{{billDetail.pointFee || 0.00}}</text>
+				</view>
+				<view class="item">
+					<text>平台手续费</text>
+					<text class="text-base text-bold price reduce">{{billDetail.fee || 0.00}}</text>
+				</view>
+				<view class="item">
+					<text>交易手续费</text>
+					<text class="text-base text-bold price reduce">{{billDetail.merchantFee || 0.00}}</text>
 				</view>
 				<view class="item">
 					<text>交易状态</text>
@@ -194,6 +207,7 @@
 		color: #888888;
 		background-color: #FFFFFF;
 		margin-top: 20rpx;
+		margin-bottom: 50rpx;
 		padding: 20rpx 50rpx;
 		display: flex;
 		justify-content: space-between;

pages/my-bills/comps/balance-bills.vue

@@ -9,8 +9,8 @@
 				<view class="money-num u-p-t-50">{{dataInfo.balance}}</view>
 
 				<view class="padding-top-40 text-white text-df">
-					<text>总收益：￥ {{dataInfo.totalBalance}}</text>
-					<text class="margin-left-30">今日收益：￥ {{dataInfo.todayBalance}}</text>
+					<text class="price">总收益：{{dataInfo.totalBalance}}</text>
+					<text class="margin-left-30 price">今日收益：{{dataInfo.todayBalance}}</text>
 				</view>
 				<button @click="$jump('/pages/withdraw/withdraw')" class="u-reset-button withdraw-btn">提现</button>
 			</view>
@@ -69,7 +69,7 @@
 						<text>{{item.discount==-1 || item.discount==0?'无折扣':item.discount +'折'}}</text>
 					</view>
 					<view class="area3">
-						<text class="text-base">+￥{{item.price || 0}}</text>
+						<text class="text-base price plus">{{item.receiveNumYp || 0}}</text>
 					</view>
 				</navigator>
 			</mescroll>
@@ -79,7 +79,7 @@
 			<u-empty text="暂无数据" src="/static/icon/empty5.png" icon-size="260"></u-empty>
 		</view>
 		
-		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
+		<u-picker confirm-color="#EF9944" v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>
@@ -141,7 +141,6 @@
 		},
 		created() {
 			this.defaultTime = this.$dateTime.format(new Date(), 'YYYY-mm')
-			this.queryBalance()
 		},
 		methods: {
 			queryBalance(){

pages/my-bills/comps/bills.vue

@@ -9,8 +9,8 @@
 				<view class="money-num u-p-t-50">{{dataInfo.totalAssets}}</view>
 		
 				<view class="padding-top-40 text-white text-df">
-					<text>总收益：￥ {{dataInfo.totalRevenue}}</text>
-					<text class="margin-left-30">今日收益：￥ {{dataInfo.todayRevenue}}</text>
+					<text class="price">总收益：{{dataInfo.totalRevenue}}</text>
+					<text class="margin-left-30 price">今日收益：{{dataInfo.todayRevenue}}</text>
 				</view>
 			</view>
 		</view>
@@ -57,12 +57,13 @@
 						<text>{{item.discount==-1 || item.discount==0?'无折扣':item.discount +'折'}}</text>
 					</view>
 					<view class="area3">
-						<text class="text-base">{{item.receiveNumTotal || 0}}</text>
+						<text class="text-base price" v-if="$isNotEmpty(item.receiveNumTotal)">{{item.receiveNumTotal}}</text>
+						<text class="text-base price" v-else>{{item.cost || 0}}</text>
 					</view>
 				</navigator>
 			</mescroll>
 		</view>
-		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
+		<u-picker confirm-color="#EF9944" v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>
@@ -138,7 +139,6 @@
 				this.mescroll.resetUpScroll();
 			},
 			upCallback(mescroll) {
-				console.log("balance");
 				let params = {
 					receiveId: this.vuex_shopId,
 					current: mescroll.num,

pages/my-bills/comps/channel-point-bill.vue

@@ -9,8 +9,8 @@
 				<view class="money-num u-p-t-50">{{dataInfo.charge}}</view>
 
 				<view class="padding-top-40 text-white text-df">
-					<text>总收益：￥ {{dataInfo.totalCharge}}</text>
-					<text class="margin-left-30">今日收益：￥ {{dataInfo.todayCharge}}</text>
+					<text class="price">总收益：{{dataInfo.totalCharge}}</text>
+					<text class="margin-left-30 price">今日收益：{{dataInfo.todayCharge}}</text>
 				</view>
 			</view>
 		</view>
@@ -68,7 +68,7 @@
 						<text>{{item.discount==-1 || item.discount==0?'无折扣':item.discount +'折'}}</text>
 					</view>
 					<view class="area3">
-						<text class="text-base">+￥{{item.pointNum || 0}}</text>
+						<text class="text-base price plus">{{item.pointNum || 0}}</text>
 					</view>
 				</navigator>
 			</mescroll>
@@ -78,7 +78,7 @@
 			<u-empty text="暂无数据" src="/static/icon/empty5.png" icon-size="260"></u-empty>
 		</view>
 		
-		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
+		<u-picker confirm-color="#EF9944" v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>

pages/my-bills/comps/point-bills.vue

@@ -9,8 +9,8 @@
 				<view class="money-num u-p-t-50">{{dataInfo.point}}</view>
 
 				<view class="padding-top-40 text-white text-df">
-					<text>总收益：￥ {{dataInfo.totalPoint}}</text>
-					<text class="margin-left-30">今日收益：￥ {{dataInfo.todayPoint}}</text>
+					<text class="price">总收益：{{dataInfo.totalPoint}}</text>
+					<text class="margin-left-30 price">今日收益：{{dataInfo.todayPoint}}</text>
 				</view>
 				<button  @click="$jump('/pages/withdraw/withdraw')" class="u-reset-button withdraw-btn">提现</button>
 			</view>
@@ -68,7 +68,7 @@
 						<text>{{item.discount==-1 || item.discount==0?'无折扣':item.discount +'折'}}</text>
 					</view>
 					<view class="area3">
-						<text class="text-base">+￥{{item.balanceNum || 0}}</text>
+						<text class="text-base price plus">{{item.balanceNum || 0}}</text>
 					</view>
 				</navigator>
 			</mescroll>
@@ -78,7 +78,7 @@
 			<u-empty text="暂无数据" src="/static/icon/empty5.png" icon-size="260"></u-empty>
 		</view>
 		
-		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
+		<u-picker confirm-color="#EF9944" v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>

pages/pay/pay.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- 扫一扫错误回调 -->
-		<u-modal title="扫描异常"  confirm-color="#dc9b21"  v-model="scanNotify.scan" :content="scanNotify.scanMessage"></u-modal>
+		<u-modal title="扫描异常"  confirm-color="#EF9944"  v-model="scanNotify.scan" :content="scanNotify.scanMessage"></u-modal>
 		<view class="data">
 			<text style="color: #000;">收款金额</text>
 			<view class="price">
@@ -14,7 +14,7 @@
 				</view>
 			</view>
 		</view>
-		<amountInput ref="amountInput"  confirmText="收款" btnColor="#ff9900"
+		<amountInput ref="amountInput"  confirmText="收款" btnColor="#EF9944"
 			placeholder="请输入交易金额" @change="change"
 			@confirm="scanCode"></amountInput>
 	</view>

pages/publish/publish.vue

@@ -88,7 +88,7 @@
 		<cropper ref="cropper" selWidth="800rpx" selHeight="400rpx" @upload="cropperCondirm" :avatarSrc="form.pic"
 			avatarStyle="width:100vw;height:100vw;">
 		</cropper>
-		<u-picker v-model="timeShow" mode="time" @confirm="timeConfirm" :params="params"></u-picker>
+		<u-picker confirm-color="#EF9944" v-model="timeShow" mode="time" @confirm="timeConfirm" :params="params"></u-picker>
 	</view>
 </template>
 

pages/shop-info/shop-info.vue

@@ -1,265 +1,282 @@
 <template>
 	<view>
 		<u-navbar title="店铺资料" :border-bottom="false"></u-navbar>
-		<view class="title u-flex u-row-between u-col-center">
-			<text v-if="step==1">请选择商家类型</text>
-			<text v-else>完善商家资料</text>
-			<text v-show="step<=totalStep && step!=1" @click="prevStep" class="u-font-24" style="color: #999">上一步</text>
-		</view>
-		<view class="card">
-			<view class="margin-bottom-30" v-if="$isNotEmpty(failReason)">
-				<u-alert-tips @close="failReason=null" type="error" :close-able="true" :show-icon="true" title="审核意见"
-					:description="failReason"></u-alert-tips>
+		<block >
+			<view class="title u-flex u-row-between u-col-center">
+				<text v-if="step==1">请选择商家类型</text>
+				<text v-else>完善商家资料</text>
+				<text v-show="stepShow" @click="prevStep" class="u-font-24" style="color: #999">上一步</text>
 			</view>
-			<u-form :model="form" :label-width="labelWidth" ref="uForm">
-				<view v-if="step==1" class="steps1" style="padding-bottom: 40rpx;">
-					<view @click="clickType(1)" class="item   u-border-bottom">
-						<view class="flex">
-							<view class="center">
-								<image class="icon" src="../../static/icon/shop2.png" mode=""></image>
+			<view class="card">
+				<view class="margin-bottom-30" v-if="$isNotEmpty(failReason)">
+					<u-alert-tips @close="failReason=null" type="error" :close-able="true" :show-icon="true"
+						title="审核意见" :description="failReason"></u-alert-tips>
+				</view>
+				<u-form :model="form" :label-width="labelWidth" ref="uForm">
+					<view v-if="step==1" class="steps1" style="padding-bottom: 40rpx;">
+						<view @click="clickType(1)" class="item   u-border-bottom">
+							<view class="flex">
+								<view class="center">
+									<image class="icon" src="../../static/icon/shop2.png" mode=""></image>
+								</view>
+								<view class="item-content">
+									<text>小微商户</text>
+									<text>小微商户，需提供店铺门头照及实景照，店主身份证件及银行账户</text>
+								</view>
 							</view>
-							<view class="item-content">
-								<text>小微商户</text>
-								<text>小微商户，需提供店铺门头照及实景照，店主身份证件及银行账户</text>
+							<view class="center">
+								<image v-if="typeIndex==1" style="width: 40rpx;height: 40rpx;"
+									src="../../static/icon/check.png" mode=""></image>
+								<image v-else style="width: 40rpx;height: 40rpx;" src="../../static/icon/uncheck.png"
+									mode=""></image>
 							</view>
 						</view>
-						<view class="center">
-							<image v-if="typeIndex==1" style="width: 40rpx;height: 40rpx;"
-								src="../../static/icon/check.png" mode=""></image>
-							<image v-else style="width: 40rpx;height: 40rpx;" src="../../static/icon/uncheck.png"
-								mode=""></image>
-						</view>
-					</view>
 
-					<view @click="clickType(0)" class="item ">
-						<view class="flex">
-							<view class="center">
-								<image class="icon" src="../../static/icon/shop1.png" mode=""></image>
+						<view @click="clickType(0)" class="item ">
+							<view class="flex">
+								<view class="center">
+									<image class="icon" src="../../static/icon/shop1.png" mode=""></image>
+								</view>
+								<view class="item-content">
+									<text>企业商户/个体工商户</text>
+									<text>企业商户，需提供营业执照，企业法人证件，企业对公结算银行账户，特殊行业还需提供生产经营许可证（例如:食品、化妆品、药品等）</text>
+								</view>
 							</view>
-							<view class="item-content">
-								<text>企业商户/个体工商户</text>
-								<text>企业商户，需提供营业执照，企业法人证件，企业对公结算银行账户，特殊行业还需提供生产经营许可证（例如:食品、化妆品、药品等）</text>
+							<view class="center">
+								<image v-if="typeIndex==0" style="width: 40rpx;height: 40rpx;"
+									src="../../static/icon/check.png" mode=""></image>
+								<image v-else style="width: 40rpx;height: 40rpx;" src="../../static/icon/uncheck.png"
+									mode=""></image>
 							</view>
 						</view>
-						<view class="center">
-							<image v-if="typeIndex==0" style="width: 40rpx;height: 40rpx;"
-								src="../../static/icon/check.png" mode=""></image>
-							<image v-else style="width: 40rpx;height: 40rpx;" src="../../static/icon/uncheck.png"
-								mode=""></image>
-						</view>
 					</view>
-				</view>
 
-				<view v-show="step==2">
-					<view class="border">
-						<u-form-item v-if="typeIndex==1" label="店铺全称" prop="name" label-position="top">
-							<u-input :border="false" placeholder="比如:哈尔滨杨国福麻辣烫餐饮服务有限公司" v-model="auditForm.signName">
-							</u-input>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="商户简称" prop="name">
-							<u-input :border="false" placeholder="比如:杨国福麻辣烫(时尚天河2店)" v-model="form.name"></u-input>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="商户联系人手机号" prop="personTel" label-width="250">
-							<u-input placeholder="请输入联系方式" v-model="form.personTel" type="number"></u-input>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="所在商场" prop="phone">
-							<u-input @click="mallShow=true" :select-open="mallShow" :border="false"
-								placeholder="请选择所在商场(非必填项)" v-model="mallLabel" type="select"></u-input>
-							<u-icon class="clear" color="#999" v-if="mallLabel" name="close-circle-fill"
-								@click.stop="clear('mallLabel')"></u-icon>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="商户联系人邮箱" prop="email" label-width="240">
-							<u-input :border="false" placeholder="请输入商户联系人邮箱" v-model="form.email"></u-input>
-						</u-form-item>
-					</view>
-					<view class="border" v-if="form.mallId&&!$isEmpty(mallAreaList)">
-						<u-form-item label="所在区域" prop="phone">
-							<u-input @click="mallAreaShow=true" :border="false" placeholder="请选择所在区域"
-								v-model="mallAreaLabel" type="select"></u-input>
-							<u-icon class="clear" color="#999" v-if="mallAreaLabel" name="close-circle-fill"
-								@click.stop="clear('mallAreaLabel')"></u-icon>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="店铺标语" prop="name">
-							<u-input :border="false" placeholder="请输入店铺标语(非必填项)" v-model="form.slogan"></u-input>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label-width="200" label="公司种类" left-icon="grid">
-							<view class="flex justify-between " @click="chooseLabel">
-								<view class="u-flex u-flex-wrap">
-									<text v-if="form.labelKey" class="text-cut-1">{{form.labelKey}}</text>
-									<text v-else style="color: #c0c4cc;">请选择</text>
+					<view v-show="step==2">
+						<view class="border">
+							<u-form-item v-if="typeIndex==1" label="店铺全称" prop="name" label-position="top">
+								<u-input :border="false" placeholder="比如:哈尔滨杨国福麻辣烫餐饮服务有限公司"
+									v-model="auditForm.signName">
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label="商户简称" prop="name">
+								<u-input :border="false" placeholder="比如:杨国福麻辣烫(时尚天河2店)" v-model="form.name"></u-input>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label="商户联系人手机号" prop="personTel" label-width="250">
+								<u-input placeholder="请输入联系方式" v-model="form.personTel" type="number"></u-input>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label="所在商场" prop="phone">
+								<u-input @click="mallShow=true" :select-open="mallShow" :border="false"
+									placeholder="请选择所在商场(非必填项)" v-model="mallLabel" type="select"></u-input>
+								<u-icon class="clear" color="#999" v-if="mallLabel" name="close-circle-fill"
+									@click.stop="clear('mallLabel')"></u-icon>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label="商户联系人邮箱" prop="email" label-width="240">
+								<u-input :border="false" placeholder="请输入商户联系人邮箱" v-model="form.email"></u-input>
+							</u-form-item>
+						</view>
+						<view class="border" v-if="form.mallId&&!$isEmpty(mallAreaList)">
+							<u-form-item label="所在区域" prop="phone">
+								<u-input @click="mallAreaShow=true" :border="false" placeholder="请选择所在区域"
+									v-model="mallAreaLabel" type="select"></u-input>
+								<u-icon class="clear" color="#999" v-if="mallAreaLabel" name="close-circle-fill"
+									@click.stop="clear('mallAreaLabel')"></u-icon>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label="店铺标语" prop="name">
+								<u-input :border="false" placeholder="请输入店铺标语(非必填项)" v-model="form.slogan"></u-input>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label-width="200" label="公司种类" left-icon="grid">
+								<view class="flex justify-between " @click="chooseLabel">
+									<view class="u-flex u-flex-wrap">
+										<text v-if="form.labelKey" class="text-cut-1">{{form.labelKey}}</text>
+										<text v-else style="color: #c0c4cc;">请选择</text>
+									</view>
+									<view>
+										<u-icon name="arrow-right" color="#737373"></u-icon>
+									</view>
 								</view>
-								<view>
-									<u-icon name="arrow-right" color="#737373"></u-icon>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label="所在地区" prop="address">
+								<u-input :disabled="true" :border="false" placeholder="请选择所在地区" @click="regionShow=true"
+									v-model="form.location"></u-input>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label="具体地址" label-position="top" prop="address">
+								<u-input :border="false" placeholder="请详细写到门店编号" v-model="form.address"></u-input>
+								<view slot="right">
+									<u-button @click="chooseAddress" size="mini">获取地址</u-button>
 								</view>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<view style="padding: 30rpx 0 10rpx;">
+								<text>店铺封面</text>
+								<text style="font-size: 24rpx;color: #999999;">（请上传店铺封面)</text>
+								<mp-upload-img style="height: 120rpx;" ref="mpUploadCover" @click='uploadShopCover'
+									col="4" :count="1"></mp-upload-img>
 							</view>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="所在地区" prop="address">
-							<u-input :disabled="true" :border="false" placeholder="请选择所在地区" @click="regionShow=true"
-								v-model="form.location"></u-input>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="具体地址" label-position="top" prop="address">
-							<u-input :border="false" placeholder="请详细写到门店编号" v-model="form.address"></u-input>
-							<view slot="right">
-								<u-button @click="chooseAddress" size="mini">获取地址</u-button>
-							</view>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<view style="padding: 30rpx 0 10rpx;">
-							<text>店铺封面</text>
-							<text style="font-size: 24rpx;color: #999999;">（请上传店铺封面)</text>
-							<mp-upload-img style="height: 120rpx;" ref="mpUploadCover" @click='uploadShopCover' col="4"
-								:count="1"></mp-upload-img>
 						</view>
-					</view>
 
-					<view class="border">
-						<view style="padding: 30rpx 0 10rpx;">
-							<text>店铺实况</text>
-							<text style="font-size: 24rpx;color: #999999;">（请依次上传门头、店内照片)</text>
-							<mp-upload-img ref="mpUploadImg" @click='uploadShopPics' :count="2" col="4"></mp-upload-img>
+						<view class="border">
+							<view style="padding: 30rpx 0 10rpx;">
+								<text>店铺实况</text>
+								<text style="font-size: 24rpx;color: #999999;">（请依次上传门头、店内照片)</text>
+								<mp-upload-img ref="mpUploadImg" @click='uploadShopPics' :count="2" col="4">
+								</mp-upload-img>
+							</view>
 						</view>
-					</view>
 
-				</view>
-				<view v-show="merchantSubjectShow">
-					<view class="border">
-						<u-form-item label="上传营业执照" prop="businessLicense" label-position="top" label-width="180">
-							<upload-img title="请上传营业执照" @click="chooseBizilicense" :model="auditForm.businessLicense"
-								dataName="businessLicense"></upload-img>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="公司主体" prop="entity" label-width="210">
-							<u-input :border="false" placeholder="请输入公司主体" v-model="auditForm.entity">
-							</u-input>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="营业执照编号" prop="licenceNo" label-width="210">
-							<u-input :border="false" placeholder="请填写营业执照编号" v-model="auditForm.licenceNo">
-							</u-input>
-						</u-form-item>
 					</view>
-					<view class="border">
-						<u-form-item label="开户许可证编号" prop="licenceNo" label-width="210">
-							<u-input :border="false" placeholder="请填写开户许可证编号" v-model="auditForm.openAccountLicenceNo">
-							</u-input>
-						</u-form-item>
-						<u-form-item label="开户许可证照片" prop="openAccountLicenceUrl" label-position="top">
-							<upload-img title="请上传开户许可证照片" @click="chooseImageAudit"
-								:model="auditForm.openAccountLicenceUrl" dataName="openAccountLicenceUrl"></upload-img>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="手持营业执照在经营场所的照片" prop="handLicenceUrl" label-position="top">
-							<upload-img title="请上传手持营业执照在经营场所的照片" @click="chooseImageAudit"
-								:model="auditForm.handLicenceUrl" dataName="handLicenceUrl"></upload-img>
-						</u-form-item>
-					</view>
-				</view>
-				<view v-show="merchantCorporationShow">
-					<view class="photo border">
-						<text>请拿出商户法人有效二代身份证件准备拍摄</text>
-						<view class="box">
-							<upload-img :width="520" :height="300" title="上传人像面照片" @click="chooseIdCard"
-								:model="auditForm.idCardFront" dataName="idCardFront" :enableImg="true"></upload-img>
+					<view v-show="merchantSubjectShow">
+						<view class="border">
+							<u-form-item label="上传营业执照" prop="businessLicense" label-position="top" label-width="180">
+								<upload-img title="请上传营业执照" @click="chooseBizilicense"
+									:model="auditForm.businessLicense" dataName="businessLicense"></upload-img>
+							</u-form-item>
 						</view>
-						<view class="box" style="margin-top: 0;">
-							<upload-img :width="520" :height="300" title="上传国徽面照片" @click="chooseIdCard"
-								:model="auditForm.idCardContrary" dataName="idCardContrary" :enableImg="true"
-								:bgImg="idCardContraryBgImg"></upload-img>
+						<view class="border">
+							<u-form-item label="公司主体" prop="entity" label-width="210">
+								<u-input :border="false" placeholder="请输入公司主体" v-model="auditForm.entity">
+								</u-input>
+							</u-form-item>
 						</view>
-						<view style="margin: 30rpx 0;" class="tips">
-							<text>拍摄时确保身份证边框完整，字体清晰，亮度均匀</text>
+						<view class="border">
+							<u-form-item label="营业执照编号" prop="licenceNo" label-width="210">
+								<u-input :border="false" placeholder="请填写营业执照编号" v-model="auditForm.licenceNo">
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label="开户许可证编号" prop="licenceNo" label-width="210">
+								<u-input :border="false" placeholder="请填写开户许可证编号"
+									v-model="auditForm.openAccountLicenceNo">
+								</u-input>
+							</u-form-item>
+							<u-form-item label="开户许可证照片" prop="openAccountLicenceUrl" label-position="top">
+								<upload-img title="请上传开户许可证照片" @click="chooseImageAudit"
+									:model="auditForm.openAccountLicenceUrl" dataName="openAccountLicenceUrl">
+								</upload-img>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label="手持营业执照在经营场所的照片" prop="handLicenceUrl" label-position="top">
+								<upload-img title="请上传手持营业执照在经营场所的照片" @click="chooseImageAudit"
+									:model="auditForm.handLicenceUrl" dataName="handLicenceUrl"></upload-img>
+							</u-form-item>
 						</view>
 					</view>
-					<view class="border">
-						<u-form-item label="商户法人姓名" prop="legalPerson" label-width="230">
-							<u-input :border="false" placeholder="请输入公司法人姓名" v-model="auditForm.legalPerson">
-							</u-input>
-						</u-form-item>
-					</view>
-					<view class="border" v-if="typeIndex==1">
-						<u-form-item label="商户法人手机号" prop="mobile" label-width="230">
-							<u-input :border="false" placeholder="请输入商户法人手机号" v-model="auditForm.contactMobile">
-							</u-input>
-						</u-form-item>
-					</view>
-					<view class="border">
-						<u-form-item label="商户法人身份证号码" prop="personIdCard" label-position="top">
-							<u-input :border="false" placeholder="请输入商户法人身份证号码" v-model="auditForm.idCard">
-							</u-input>
-						</u-form-item>
-					</view>
+					<view v-show="merchantCorporationShow">
+						<view class="photo border">
+							<text>请拿出商户法人有效二代身份证件准备拍摄</text>
+							<view class="box">
+								<ocr-navigator  @onSuccess="idCardSuccess" certificateType="idCard" :opposite="false">
+									<upload-img  :width="520" :height="300" title="上传人像面照片"
+										:model="auditForm.idCardFront" dataName="idCardFront" :enableImg="true">
+									</upload-img>
+								</ocr-navigator>
+							</view>
+							<view class="box" style="margin-top: 0;">
+								<ocr-navigator @onSuccess="idCardSuccess" certificateType="idCard" :opposite="true">
+									<upload-img :width="520" :height="300" title="上传国徽面照片"
+										:model="auditForm.idCardContrary" dataName="idCardContrary" :enableImg="true"
+										:bgImg="idCardContraryBgImg"></upload-img>
+								</ocr-navigator>
+							</view>
+							<view style="margin: 30rpx 0;" class="tips">
+								<text>拍摄时确保身份证边框完整，字体清晰，亮度均匀</text>
+							</view>
+						</view>
+						<view class="border">
+							<u-form-item label="商户法人姓名" prop="legalPerson" label-width="230">
+								<u-input :border="false" placeholder="请输入公司法人姓名" v-model="auditForm.legalPerson">
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="border" v-if="typeIndex==1">
+							<u-form-item label="商户法人手机号" prop="mobile" label-width="230">
+								<u-input :border="false" placeholder="请输入商户法人手机号" v-model="auditForm.contactMobile">
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="border">
+							<u-form-item label="商户法人身份证号码" prop="personIdCard" label-position="top">
+								<u-input :border="false" placeholder="请输入商户法人身份证号码" v-model="auditForm.idCard">
+								</u-input>
+							</u-form-item>
+						</view>
 
-					<view class="border" v-if="typeIndex==0">
-						<u-form-item label="商户联系人姓名" prop="personName" label-width="230">
-							<u-input :disabled="isEdit" :border="false" placeholder="商户联系人姓名" v-model="form.personName">
-							</u-input>
-						</u-form-item>
-					</view>
+						<view class="border" v-if="typeIndex==0">
+							<u-form-item label="商户联系人姓名" prop="personName" label-width="230">
+								<u-input :disabled="isEdit" :border="false" placeholder="商户联系人姓名"
+									v-model="form.personName">
+								</u-input>
+							</u-form-item>
+						</view>
 
-					<view class="border" v-if="typeIndex==0">
-						<u-form-item label="商户联系人身份证号" prop="email" label-position="top">
-							<u-input :border="false" placeholder="请输入商户联系人身份证号" v-model="auditForm.contactLicenceNo">
-							</u-input>
-						</u-form-item>
+						<view class="border" v-if="typeIndex==0">
+							<u-form-item label="商户联系人身份证号" prop="email" label-position="top">
+								<u-input :border="false" placeholder="请输入商户联系人身份证号"
+									v-model="auditForm.contactLicenceNo">
+								</u-input>
+							</u-form-item>
+						</view>
 					</view>
-				</view>
 
-				<view v-show="settlementAccountShow" style="padding-bottom: 40rpx;">
-					<view class="">
-						<u-form-item :request="true" label="请填写结算银行账户号码" prop="bankCardNo" label-position="top">
-							<u-input :border="false" placeholder="请填写结算银行账户号码" v-model="auditForm.bankCardNo">
-							</u-input>
-						</u-form-item>
-						<u-form-item :request="true" label="银行类型" label-position="top">
-							<u-input :border="false" :select-open="bankCodeShow" type="select" placeholder="请选择银行类型"
-								v-model="auditForm.bankCodeLabel" @click="bankCodeShow = true" />
-						</u-form-item>
-						<u-form-item :request="true" label="账户类型" label-position="top">
-							<!-- <u-input  type="select" placeholder="请选银行择账户类型" v-model="auditForm.bankAccountTypeLabel" @click="bankAccountTypeShow = true"/> -->
-							<u-input :border="false" disabled placeholder="请选银行择账户类型"
-								v-model="auditForm.bankAccountTypeLabel" />
-						</u-form-item>
+					<view v-show="settlementAccountShow" style="padding-bottom: 40rpx;">
+						<view class="">
+							<u-form-item :request="true" label="请填写结算银行账户号码" prop="bankCardNo" label-position="top">
+								<u-input :border="false" placeholder="请填写结算银行账户号码" v-model="auditForm.bankCardNo">
+								</u-input>
+								<ocr-navigator slot="right" hover-class="none" @onSuccess="bankSuccess"
+									certificateType="bankCard">
+									<u-icon name="scan" size="42"></u-icon>
+								</ocr-navigator>
+							</u-form-item>
+							<u-form-item :request="true" label="银行类型" label-position="top">
+								<u-input :border="false" :select-open="bankCodeShow" type="select" placeholder="请选择银行类型"
+									v-model="auditForm.bankCodeLabel" @click="bankCodeShow = true" />
+							</u-form-item>
+							<u-form-item :request="true" label="账户类型" label-position="top">
+								<!-- <u-input  type="select" placeholder="请选银行择账户类型" v-model="auditForm.bankAccountTypeLabel" @click="bankAccountTypeShow = true"/> -->
+								<u-input :border="false" disabled placeholder="请选银行择账户类型"
+									v-model="auditForm.bankAccountTypeLabel" />
+							</u-form-item>
+						</view>
 					</view>
-				</view>
-			</u-form>
-		</view>
-		<view v-if="step<totalStep" class="center flex-direction" style="margin: 100rpx 0	;">
-			<view @click="nextStep" class="btn cu-btn round" style="width:90%;height: 90rpx;font-size: 34rpx;">
-				下一步
+				</u-form>
 			</view>
-		</view>
-		<view v-else class="center flex-direction margin-bottom-30" style="margin-top: 100rpx;">
-			<view v-if="!isEdit" class=" margin-bottom-20 text-sm center ">
-				<text style="color: #949494;">确认注册即代表已阅读并同意</text>
-				<text style="color: #104DFF;" @click="protocol">《联兑通软件服务协议》</text>
+			<view v-if="step<totalStep" class="center flex-direction" style="margin: 100rpx 0	;">
+				<view @click="nextStep" class="btn cu-btn round" style="width:90%;height: 90rpx;font-size: 34rpx;">
+					下一步
+				</view>
 			</view>
-			<view @click="submit" class="btn cu-btn round" style="width:90%;height: 90rpx;font-size: 34rpx;">
-				提交资料
+			<view v-else class="center flex-direction margin-bottom-30" style="margin-top: 100rpx;">
+				<view v-if="!isEdit" class=" margin-bottom-20 text-sm center ">
+					<text style="color: #949494;">确认注册即代表已阅读并同意</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;">
+					提交资料
+				</view>
 			</view>
-		</view>
+		</block>
 
 		<!-- 商场 -->
-		<u-popup height="60%" mode="bottom" v-model="mallShow">
+		<u-popup border-radius="8" height="60%" mode="bottom" v-model="mallShow">
 			<view class="fixed cu-bar search bg-white">
 				<view class="search-form radius">
 					<text class="cuIcon-search"></text>
@@ -277,8 +294,7 @@
 			</scroll-view>
 			<u-empty v-else name="search"></u-empty>
 		</u-popup>
-
-		<u-popup height="60%" mode="bottom" v-model="bankCodeShow">
+		<u-popup border-radius="8" height="60%" mode="bottom" v-model="bankCodeShow">
 			<view class="fixed cu-bar search bg-white">
 				<view class="search-form radius">
 					<text class="cuIcon-search"></text>
@@ -296,15 +312,14 @@
 			</scroll-view>
 			<u-empty v-else name="search"></u-empty>
 		</u-popup>
-
-		<u-select v-model="mallAreaShow" label-name="name" value-name="id" mode="single-column" :list="mallAreaList"
+		<u-select confirm-color="#EF9944" v-model="mallAreaShow" label-name="name" value-name="id" mode="single-column" :list="mallAreaList"
 			@confirm="mallAreaConfirm"></u-select>
-		<u-picker @confirm="regionConfirm" v-model="regionShow" mode="region"></u-picker>
-
+		<u-picker confirm-color="#EF9944" @confirm="regionConfirm" v-model="regionShow" mode="region"></u-picker>
 		<!-- <u-select v-model="bankCodeShow"  :list="bankCodeList" @confirm="bankTypeConfirm"></u-select> -->
-		<u-select v-model="bankAccountTypeShow" :list="bankAccountTypeList" @confirm="bankAccountTypeConfirm">
+		<u-select confirm-color="#EF9944" v-model="bankAccountTypeShow" :list="bankAccountTypeList" @confirm="bankAccountTypeConfirm">
 		</u-select>
 		<toast ref="toast"></toast>
+		<loading ref="loading" type="3" theme="2" />
 	</view>
 </template>
 
@@ -317,6 +332,21 @@
 			mpUploadImg
 		},
 		computed: {
+			stepShow: {
+				get() {
+					if (this.isEdit) {
+						if (this.step <= this.totalStep && this.step != 2) {
+							return true
+						}
+						return false
+					}
+					if (this.step <= this.totalStep && this.step != 1) {
+						return true
+					} else {
+						return false
+					}
+				}
+			},
 			settlementAccountShow: {
 				get() {
 					if (!this.needBankInfo) {
@@ -358,8 +388,8 @@
 		},
 		data() {
 			return {
+				loading: true,
 				typeIndex: 1,
-
 				//银行类型
 				bankKeyword: '',
 				bankCodeShow: false,
@@ -760,7 +790,6 @@
 			uni.hideLoading()
 		},
 		async onLoad(options) {
-			console.log("123");
 			this.form.personTel = this.$cache.get('phone')
 			this.auditForm.contactMobile = this.form.personTel
 			//监听从chooseLable页面返回的数据
@@ -787,8 +816,8 @@
 				//新增数据时才跑流程
 				this.getProcessDefinitionId()
 			}
-			this.initDict()
-			this.fetchMallList()
+			await this.initDict()
+			await this.fetchMallList()
 		},
 		methods: {
 			clickType(index) {
@@ -891,6 +920,10 @@
 				this.imgList = data
 				this.$refs.mpUploadImg.changeImgList(this.imgList)
 			},
+			bankSuccess(e) {
+				console.log(e);
+				this.auditForm.bankCardNo = e.detail.number.text
+			},
 			async chooseBank() {
 				let image = (await this.$mpi.chooseImage())[0]
 				this.$api.ocr.bank(image).then(res => {
@@ -1046,6 +1079,36 @@
 					this.auditForm[name] = res.data.link
 				})
 			},
+			idCardSuccess(e){
+				console.log(e,"e********");
+				let data=e.detail
+				console.log(data,"data******");
+				if (data.type==0) {
+					//身份证正面
+					this.OCRBiziIdCardInfo = data.detail
+					this.auditForm.addr=data.address.text
+					this.auditForm.gender=data.gender.text
+					this.auditForm.idCard=data.id.text
+					this.auditForm.nationality=data.nationality.text
+					this.auditForm.name=data.name.text
+					this.auditForm.legalPerson = data.name.text
+					this.form.personName = data.name.text
+					this.auditForm.contactLicenceNo = data.id.text
+				}else{
+					this.OCRBiziIdCardInfo.validDate = data.valid_date.text
+					this.auditForm.validDate = data.valid_date.text
+				}
+				this.$api.uploadFile(data.image_path).then(res=>{
+					if (data.type==0) {
+						//正面
+						this.auditForm.idCardFront=res.data.link
+					}
+					if (data.type==1) {
+						//反面
+						this.auditForm.idCardContrary=res.data.link
+					}
+				})
+			},
 			async chooseIdCard(name) {
 				if (this.isEdit) {
 					this.$refs.toast.info('不可修改')
@@ -1104,14 +1167,13 @@
 					uni.hideLoading()
 				})
 			},
-			fetchMallList() {
+			async fetchMallList() {
 				let params = {
 					name: this.mallKeyWord,
 					size: 20
 				}
-				this.$api.mall.list(params).then(res => {
-					this.mallList = res.data.records
-				})
+				let res = await this.$api.mall.list(params)
+				this.mallList = res.data.records
 			},
 			fetchMallAreaList() {
 				this.$api.mall.getMallAreaByMallId(this.form.mallId).then(res => {
@@ -1238,9 +1300,9 @@
 			},
 
 			//字典 begin
-			initDict() {
-				this.getBankType()
-				this.getBankAccountType()
+			async initDict() {
+				await this.getBankType()
+				await this.getBankAccountType()
 			},
 			async getBankType() {
 				let params = {
@@ -1390,4 +1452,13 @@
 			}
 		}
 	}
+
+	.ocr-wrapper {
+		margin: 40rpx auto;
+		width: 375rpx;
+	}
+
+	.intro {
+		margin: 40rpx;
+	}
 </style>

pages/statistics/pointBillStatistics.vue

@@ -55,7 +55,7 @@
 				</view>
 			</mescroll-body>
 		</view>
-		<u-picker v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
+		<u-picker confirm-color="#EF9944" v-model="showTime" mode="time" :params="params"  @confirm="confirmTime">
 		</u-picker>
 	</view>
 </template>

pages/test/test2/test2.vue

@@ -0,0 +1,37 @@
+<template>
+	<view class="">
+		<view class="cover center" style="flex-direction: column;">
+			<text class="cuIcon-roundaddfill text-base" style="font-size: 80rpx;"></text>
+			<text style="margin-top: 10rpx;">请上传活动封面</text>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	components:{
+	},
+	data() {
+		return {
+			form:{
+				title:''
+			}
+		};
+	},
+	onLoad() {
+		
+	},
+	methods:{
+		
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.cover{
+		background-color: #FFFFFF;
+		border-radius: 20rpx;
+		margin: 20rpx;
+		padding: 100rpx;
+	}
+</style>

pages/userBank/add.vue

@@ -23,8 +23,8 @@
 			</view>
 		</view>
 
-		<u-select v-model="bankTypeShow" :list="bankTypeList" @confirm="bankTypeConfirm"></u-select>
-		<u-select v-model="bankAccountTypeShow" :list="bankAccountTypeList" @confirm="bankAccountTypeConfirm">
+		<u-select confirm-color="#EF9944" v-model="bankTypeShow" :list="bankTypeList" @confirm="bankTypeConfirm"></u-select>
+		<u-select confirm-color="#EF9944" v-model="bankAccountTypeShow" :list="bankAccountTypeList" @confirm="bankAccountTypeConfirm">
 		</u-select>
 		
 		<toast ref="toast" ></toast>

utils/dialog.js

@@ -9,7 +9,7 @@ dialog.showModal=(content,showCancel=true,confirmColor)=>{
 			title:'提示',
 			content,
 			showCancel,
-			confirmColor:confirmColor?confirmColor:'#FF9447',
+			confirmColor:confirmColor?confirmColor:'#EF9944',
 			success: (res)=>{
 				if (res.confirm) {
 					resolve(res)
@@ -24,7 +24,7 @@ dialog.showModalAndBack=(content,confirmColor)=>{
     	title: "提示",
     	content: content,
     	showCancel:false,
-		confirmColor:confirmColor?confirmColor:'#FF9447',
+		confirmColor:confirmColor?confirmColor:'#EF9944',
     	success: (res)=>{
     		if (res.confirm) {
     			uni.navigateBack({