update

mobile-code/src/admin/ad/add.vue

@@ -114,8 +114,8 @@ export default {
 				style: 0,
 				url: '',
 				goodsId: '',
-				startTime: '',
-				endTime: ''
+				startTime: 0,
+				endTime: 0
 			},
 			// imgList: [],
 			goodsData: {}

mobile-code/src/b-config.js

@@ -0,0 +1,2 @@
+// 项目配置--由bat脚本变更
+export const ProjectName = 'business'

mobile-code/src/m-manifest.json → mobile-code/src/b-manifest.json

@@ -90,7 +90,7 @@
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "获取位置信息后为您提供个性化推荐"
+                "desc" : "请点击确定"
             }
         }
     },
@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.m.huaml.com",
+                    "target": "http://api.b.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

mobile-code/src/b-pages.json

@@ -0,0 +1,318 @@
+{
+	"pages": [
+		{
+			"path": "admin/home/workbench",
+			"style": {
+				"navigationBarTitleText": "工作台"
+			}
+		},
+		{
+			"path": "admin/home/order",
+			"style": {
+				"navigationBarTitleText": "订单"
+			}
+		},
+		{
+			"path": "admin/home/member",
+			"style": {
+				"navigationBarTitleText": "客户"
+			}
+		},
+		{
+			"path": "pages/common/redirect",
+			"style": {
+				"navigationBarTitleText": "加载中..."
+			}
+		},
+		{
+			"path": "pages/common/webview",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		}
+	],
+	"subPackages": [
+		{
+			"root": "admin/order",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "详情"
+					}
+				},
+				{
+					"path": "ship",
+					"style": {
+						"navigationBarTitleText": "发货"
+					}
+				},
+				{
+					"path": "fill-form",
+					"style": {
+						"navigationBarTitleText": "填写收花人"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/member",
+			"pages": [
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加客户"
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "客户详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/interest",
+			"pages": [
+				{
+					"path": "invite",
+					"style": {
+						"navigationBarTitleText": "邀请列表"
+					}
+				},
+				{
+					"path": "my-invite",
+					"style": {
+						"navigationBarTitleText": "我的邀请"
+					}
+				},
+				{
+					"path": "setting",
+					"style": {
+						"navigationBarTitleText": "奖励设置"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/coupon",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "优惠券"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/ad",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "广告列表"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加广告"
+					}
+				},
+				{
+					"path": "sel-goods",
+					"style": {
+						"navigationBarTitleText": "商品选择"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/staff",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "员工管理"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加员工"
+					}
+				},
+				{
+					"path": "sel-member",
+					"style": {
+						"navigationBarTitleText": "客户列表"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/setting",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "设置"
+					}
+				},
+				{
+					"path": "wx-menu",
+					"style": {
+						"navigationBarTitleText": "微信菜单设置"
+					}
+				},
+				{
+					"path": "coupon",
+					"style": {
+						"navigationBarTitleText": "新人领券设置"
+					}
+				},
+				{
+					"path": "level",
+					"style": {
+						"navigationBarTitleText": "会员等级设置"
+					}
+				},
+				{
+					"path": "password",
+					"style": {
+						"navigationBarTitleText": "密码设置"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/goodsManage",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "商品管理"
+					}
+				},
+				{
+					"path": "category",
+					"style": {
+						"navigationBarTitleText": "分类管理"
+					}
+				},
+				{
+					"path": "add",
+					"style": {
+						"navigationBarTitleText": "添加商品"
+					}
+				},
+				{
+					"path": "img-store",
+					"style": {
+						"navigationBarTitleText": "图库管理"
+					}
+				},
+				{
+					"path": "goods-name",
+					"style": {
+						"navigationBarTitleText": "填写商品信息"
+					}
+				},
+				{
+					"path": "freight",
+					"style": {
+						"navigationBarTitleText": "运费设置"
+					}
+				},
+				{
+					"path": "price-increase",
+					"style": {
+						"navigationBarTitleText": "节假日自动涨价"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/statistics",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "数据统计"
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/assets",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "收入明细"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/chat",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "客服",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		},
+		{
+			"root": "admin/template",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "选择模板"
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		// #ifdef H5
+		"navigationStyle": "custom",
+		// #endif
+		"navigationBarBackgroundColor": "#fff",
+		"navigationBarTitleText": "花卉宝",
+		"navigationBarTextStyle": "black"
+	},
+	"tabBar": {
+		"color": "#C0C4CC",
+		"selectedColor": "#3385FF",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "admin/home/workbench",
+				"iconPath": "static/images/admin/workbench-no.png",
+				"selectedIconPath": "static/images/admin/workbench-is.png",
+				"text": "工作台"
+			},
+			{
+				"pagePath": "admin/home/order",
+				"iconPath": "static/images/admin/order-no.png",
+				"selectedIconPath": "static/images/admin/order-is.png",
+				"text": "订单"
+			},
+			{
+				"pagePath": "admin/home/member",
+				"iconPath": "static/images/admin/member-no.png",
+				"selectedIconPath": "static/images/admin/member-is.png",
+				"text": "客户"
+			}
+		]
+	}
+}
+

mobile-code/src/m-uni.scss → mobile-code/src/b-uni.scss

@@ -12,7 +12,7 @@ $imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色
-$mainColor: #FF2842;
+$mainColor: #3385FF;
 $mainColor1: #049E2C;
 $auxiliaryColor2: #ff6900;
 

mobile-code/src/components/app-delivery.vue

@@ -114,7 +114,7 @@ export default {
 				receiveFullAddress: '', // 收花人完整地址，从腾讯地图接口获取
 				// bookName: '', // 订花人姓名
 				bookMobile: '', // 订花人手机号
-				reachTime: '', // 配送时间
+				reachTime: 0, // 配送时间
 				reachPeriod: '0', // 配送时段，0上午1下午2晚上
 				needCard: '1', // 是否要贺卡 0不要 1要
 				cardInfo: '', // 贺卡信息

mobile-code/src/config.js

@@ -1,2 +1,2 @@
-// 项目配置--由bat脚本变更
-export const ProjectName = 'business'
+// 项目配置--由bat脚本自动变更
+export const ProjectName = 'mobile'

mobile-code/src/m-config.js

@@ -1,2 +0,0 @@
-// 项目配置--由bat脚本自动变更
-export const ProjectName = 'mobile'

mobile-code/src/m-pages.json

@@ -1,203 +0,0 @@
-{
-	"pages": [
-		{
-			"path": "pages/home/index",
-			"style": {
-				"navigationBarTitleText": "加载中..."
-			}
-		},
-		{
-			"path": "pages/home/category",
-			"style": {
-				"navigationBarTitleText": "分类"
-			}
-		},
-		{
-			"path": "pages/home/shop",
-			"style": {
-				"navigationBarTitleText": "门店"
-			}
-		},
-		{
-			"path": "pages/home/user",
-			"style": {
-				"navigationBarTitleText": "我的"
-			}
-		},
-		{
-			"path": "pages/common/redirect",
-			"style": {
-				"navigationBarTitleText": "加载中..."
-			}
-		},
-		{
-			"path": "pages/common/webview",
-			"style": {
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
-		}
-	],
-	"subPackages": [
-		{
-			"root": "pages/user",
-			"pages": [
-				{
-					"path": "register",
-					"style": {
-						"navigationBarTitleText": "注册"
-					}
-				},
-				{
-					"path": "password",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/goods",
-			"pages": [
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "详情"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/pay",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "支付"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/callback",
-			"pages": [
-				{
-					"path": "index"
-				}
-			]
-		},
-		{
-			"root": "pages/coupon",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "优惠券",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/order",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "订单列表",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "订单列表"
-					}
-				},
-				{
-					"path": "buy",
-					"style": {
-						"navigationBarTitleText": "订单确认"
-					}
-				},
-				{
-					"path": "comment",
-					"style": {
-						"navigationBarTitleText": "评价"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/interest",
-			"pages": [
-				{
-					"path": "invite",
-					"style": {
-						"navigationBarTitleText": "邀请排行",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "level",
-					"style": {
-						"navigationBarTitleText": "会员等级",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/chat",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "客服",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		}
-	],
-	"globalStyle": {
-		// #ifdef H5
-		"navigationStyle": "custom",
-		// #endif
-		"navigationBarBackgroundColor": "#fff",
-		"navigationBarTitleText": "花卉宝",
-		"navigationBarTextStyle": "black"
-	},
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#fa436a",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/home/index",
-				"iconPath": "static/images/common/home-no.png",
-				"selectedIconPath": "static/images/common/home-is.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/home/category",
-				"iconPath": "static/images/common/category-no.png",
-				"selectedIconPath": "static/images/common/category-is.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/home/shop",
-				"iconPath": "static/images/common/shop-no.png",
-				"selectedIconPath": "static/images/common/shop-is.png",
-				"text": "门店"
-			},
-			{
-				"pagePath": "pages/home/user",
-				"iconPath": "static/images/common/user-no.png",
-				"selectedIconPath": "static/images/common/user-is.png",
-				"text": "我的"
-			}
-		]
-	}
-}
-

mobile-code/src/manifest.json

@@ -90,7 +90,7 @@
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "请点击确定"
+                "desc" : "获取位置信息后为您提供个性化推荐"
             }
         }
     },
@@ -121,7 +121,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.b.huaml.com",
+                    "target": "http://api.m.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {

mobile-code/src/pages.json

@@ -1,21 +1,27 @@
 {
 	"pages": [
 		{
-			"path": "admin/home/workbench",
+			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "工作台"
+				"navigationBarTitleText": "加载中..."
+			}
+		},
+		{
+			"path": "pages/home/category",
+			"style": {
+				"navigationBarTitleText": "分类"
 			}
 		},
 		{
-			"path": "admin/home/order",
+			"path": "pages/home/shop",
 			"style": {
-				"navigationBarTitleText": "订单"
+				"navigationBarTitleText": "门店"
 			}
 		},
 		{
-			"path": "admin/home/member",
+			"path": "pages/home/user",
 			"style": {
-				"navigationBarTitleText": "客户"
+				"navigationBarTitleText": "我的"
 			}
 		},
 		{
@@ -34,225 +40,109 @@
 	],
 	"subPackages": [
 		{
-			"root": "admin/order",
+			"root": "pages/user",
 			"pages": [
 				{
-					"path": "detail",
+					"path": "register",
 					"style": {
-						"navigationBarTitleText": "详情"
+						"navigationBarTitleText": "注册"
 					}
 				},
 				{
-					"path": "ship",
-					"style": {
-						"navigationBarTitleText": "发货"
-					}
-				},
-				{
-					"path": "fill-form",
+					"path": "password",
 					"style": {
-						"navigationBarTitleText": "填写收花人"
+						"navigationBarTitleText": "修改密码"
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/member",
+			"root": "pages/goods",
 			"pages": [
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": "添加客户"
-					}
-				},
 				{
 					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "客户详情"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/interest",
-			"pages": [
-				{
-					"path": "invite",
-					"style": {
-						"navigationBarTitleText": "邀请列表"
-					}
-				},
-				{
-					"path": "my-invite",
-					"style": {
-						"navigationBarTitleText": "我的邀请"
-					}
-				},
-				{
-					"path": "setting",
-					"style": {
-						"navigationBarTitleText": "奖励设置"
+						"navigationBarTitleText": "详情"
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/coupon",
+			"root": "pages/pay",
 			"pages": [
 				{
-					"path": "list",
+					"path": "index",
 					"style": {
-						"navigationBarTitleText": "优惠券"
+						"navigationBarTitleText": "支付"
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/ad",
+			"root": "pages/callback",
 			"pages": [
 				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "广告列表"
-					}
-				},
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": "添加广告"
-					}
-				},
-				{
-					"path": "sel-goods",
-					"style": {
-						"navigationBarTitleText": "商品选择"
-					}
+					"path": "index"
 				}
 			]
 		},
 		{
-			"root": "admin/staff",
+			"root": "pages/coupon",
 			"pages": [
 				{
 					"path": "list",
 					"style": {
-						"navigationBarTitleText": "员工管理"
-					}
-				},
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": "添加员工"
-					}
-				},
-				{
-					"path": "sel-member",
-					"style": {
-						"navigationBarTitleText": "客户列表"
+						"navigationBarTitleText": "优惠券",
+						"enablePullDownRefresh": true
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/setting",
+			"root": "pages/order",
 			"pages": [
 				{
 					"path": "list",
 					"style": {
-						"navigationBarTitleText": "设置"
-					}
-				},
-				{
-					"path": "wx-menu",
-					"style": {
-						"navigationBarTitleText": "微信菜单设置"
+						"navigationBarTitleText": "订单列表",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
-					"path": "coupon",
+					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "新人领券设置"
+						"navigationBarTitleText": "订单列表"
 					}
 				},
 				{
-					"path": "level",
+					"path": "buy",
 					"style": {
-						"navigationBarTitleText": "会员等级设置"
+						"navigationBarTitleText": "订单确认"
 					}
 				},
 				{
-					"path": "password",
+					"path": "comment",
 					"style": {
-						"navigationBarTitleText": "密码设置"
+						"navigationBarTitleText": "评价"
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/goodsManage",
+			"root": "pages/interest",
 			"pages": [
 				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "商品管理"
-					}
-				},
-				{
-					"path": "category",
-					"style": {
-						"navigationBarTitleText": "分类管理"
-					}
-				},
-				{
-					"path": "add",
-					"style": {
-						"navigationBarTitleText": "添加商品"
-					}
-				},
-				{
-					"path": "img-store",
-					"style": {
-						"navigationBarTitleText": "图库管理"
-					}
-				},
-				{
-					"path": "goods-name",
-					"style": {
-						"navigationBarTitleText": "填写商品信息"
-					}
-				},
-				{
-					"path": "freight",
+					"path": "invite",
 					"style": {
-						"navigationBarTitleText": "运费设置"
+						"navigationBarTitleText": "邀请排行",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
-					"path": "price-increase",
-					"style": {
-						"navigationBarTitleText": "节假日自动涨价"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/statistics",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "数据统计"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/assets",
-			"pages": [
-				{
-					"path": "list",
+					"path": "level",
 					"style": {
-						"navigationBarTitleText": "收入明细"
+						"navigationBarTitleText": "会员等级",
+						"enablePullDownRefresh": true
 					}
 				}
 			]
@@ -268,17 +158,6 @@
 					}
 				}
 			]
-		},
-		{
-			"root": "admin/template",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "选择模板"
-					}
-				}
-			]
 		}
 	],
 	"globalStyle": {
@@ -291,26 +170,32 @@
 	},
 	"tabBar": {
 		"color": "#C0C4CC",
-		"selectedColor": "#3385FF",
+		"selectedColor": "#fa436a",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
-				"pagePath": "admin/home/workbench",
-				"iconPath": "static/images/admin/workbench-no.png",
-				"selectedIconPath": "static/images/admin/workbench-is.png",
-				"text": "工作台"
+				"pagePath": "pages/home/index",
+				"iconPath": "static/images/common/home-no.png",
+				"selectedIconPath": "static/images/common/home-is.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/home/category",
+				"iconPath": "static/images/common/category-no.png",
+				"selectedIconPath": "static/images/common/category-is.png",
+				"text": "分类"
 			},
 			{
-				"pagePath": "admin/home/order",
-				"iconPath": "static/images/admin/order-no.png",
-				"selectedIconPath": "static/images/admin/order-is.png",
-				"text": "订单"
+				"pagePath": "pages/home/shop",
+				"iconPath": "static/images/common/shop-no.png",
+				"selectedIconPath": "static/images/common/shop-is.png",
+				"text": "门店"
 			},
 			{
-				"pagePath": "admin/home/member",
-				"iconPath": "static/images/admin/member-no.png",
-				"selectedIconPath": "static/images/admin/member-is.png",
-				"text": "客户"
+				"pagePath": "pages/home/user",
+				"iconPath": "static/images/common/user-no.png",
+				"selectedIconPath": "static/images/common/user-is.png",
+				"text": "我的"
 			}
 		]
 	}

mobile-code/src/pages/pay/index.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="app-content">
-		<block v-if="option.pageStatus == 'recharge'">
+	<div class="app-content pay-wrap">
+		<!-- <block v-if="option.pageStatus == 'recharge'">
 			<div class="tabs-wrap">充值</div>
 		</block>
 		<block v-else>
 			<div class="tabs-wrap">付款</div>
-		</block>
+		</block>-->
 		<!-- <block v-else>
 			<app-tabs :tabs="tabs" :currentTab="tabIndex" :isFixed="true" :borderLeft="true" @change="tabChange" itemWidth="50%" />
 		</block>-->
@@ -48,18 +48,15 @@
 					<span class="app-size-30">{{ shopUser.userAsset.balance }}</span>
 				</div>
 			</div>
-			<button class="button-com red" @click="tabIndex = tabIndex == 0 ? 1 : 0">{{ tabIndex == 0 ? '我要配送' : '无需配送' }}</button>
+			<!-- 查看更多 -->
+			<div class="view-more" :class="{'open' : tabIndex == 1}" @click="tabIndex = tabIndex == 0 ? 1 : 0">
+				<div class="view-more-text">{{ tabIndex == 0 ? '填写收花人' : '收起' }}</div>
+				<i class="iconfont iconjiantouxia"></i>
+			</div>
+			<!-- 查看更多 -->
 			<block v-if="tabIndex == 1">
 				<app-delivery-module ref="appDelivery" />
 			</block>
-			<!-- 可选优惠 -->
-			<div class="module-com discount-wrap" v-if="!$util.isEmpty(shopUser) && shopUser.userAsset.member && shopUser.userAsset.getCouponNum">
-				<div class="module-tit">可选优惠</div>
-				<div class="module-det">
-					<app-coupon-sel ref="couponSel" :price="amount" :discountArr="['member', 'coupon']" />
-				</div>
-			</div>
-
 			<!-- 匿名派送 -->
 			<block v-if="tabIndex == 1">
 				<div class="none-name-delivery flex-center">
@@ -67,6 +64,13 @@
 					<span class="none-name-text">匿名派送</span>
 				</div>
 			</block>
+			<!-- 可选优惠 -->
+			<div class="module-com discount-wrap" v-if="!$util.isEmpty(shopUser) && shopUser.userAsset.member && shopUser.userAsset.getCouponNum">
+				<div class="module-tit">可选优惠</div>
+				<div class="module-det">
+					<app-coupon-sel ref="couponSel" :price="amount" :discountArr="['member', 'coupon']" />
+				</div>
+			</div>
 			<!-- 按钮 -->
 			<div class="btn-wrap">
 				<button v-if="!$util.isEmpty(shopUser) && shopUser.userAsset.balance && shopUser.userAsset.balance != '0.00'" class="button-com red" @click="balancePayFn">余额支付</button>
@@ -177,6 +181,10 @@
 				}
 				getOrderShop().then(res => {
 					this.inpFocus = true
+					console.log(res)
+					uni.setNavigationBarTitle({
+						title: `您正在向${res.shop.merchantName}付款`
+					})
 				})
 				if (isLogin()) {
 					getShopUser()
@@ -293,8 +301,9 @@
 <style lang="scss">
 	.app-content {
 		// min-height: 0;
-		padding-top: 100px;
-		// padding-bottom: 120px;
+		// padding-top: 100px;
+		min-height: calc(100vh - 20px);
+		padding-top: 20px;
 	}
 	.tabs-wrap {
 		position: fixed;
@@ -327,6 +336,7 @@
 			border-top-left-radius: 20px;
 			border-top-right-radius: 20px;
 			padding: 50px 80px 28px;
+			margin-bottom: 0 !important;
 			.balance {
 				margin-top: 30px;
 				color: $fontColor2;
@@ -412,5 +422,29 @@
 				}
 			}
 		}
+
+		// 查看更多
+		.view-more {
+			width: 100%;
+			// padding-top: 10px;
+			padding-bottom: 20px;
+			margin-bottom: 20px;
+			font-size: 28px;
+			@include disFlex(center, center);
+			background-color: #fff;
+			color: #3385ff;
+			.view-more-text {
+				margin-right: 14px;
+			}
+			i {
+				font-size: 30px;
+				font-weight: 600;
+			}
+			&.open {
+				i {
+					transform: rotate(180deg);
+				}
+			}
+		}
 	}
 </style>

mobile-code/src/pages/user/register.vue

@@ -50,7 +50,7 @@ export default {
 				mobile: '',
 				code: '',
 				realName: '',
-				birthday: ''
+				birthday: 0
 			},
 			isSend: 0,
 			countDown: 59,

mobile-code/src/static/css/reset.scss

@@ -123,6 +123,15 @@ image {
 	}
 }
 
+// 支付页样式修改
+.pay-wrap {
+    .delivery-wrap {
+        .gift-wrap {
+            margin-bottom: 0 !important;
+        }
+    }
+}
+
 uni-button::after {
     border: none;
 }

mobile-code/src/static/iconfont/iconfont.css

@@ -1,27 +1,27 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://at.alicdn.com/t/font_1525256_gha7j3zx3x.eot');
-  src: url('https://at.alicdn.com/t/font_1525256_gha7j3zx3x.eot?#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_1525256_gha7j3zx3x.woff2') format('woff2'),
-  url('https://at.alicdn.com/t/font_1525256_gha7j3zx3x.woff') format('woff'),
-  url('https://at.alicdn.com/t/font_1525256_gha7j3zx3x.ttf') format('truetype'),
-  url('https://at.alicdn.com/t/font_1525256_gha7j3zx3x.svg#iconfont') format('svg');
+  src: url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.eot');
+  src: url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
+  url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.woff2') format('woff2'),
+  url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.woff') format('woff'),
+  url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.ttf') format('truetype'),
+  url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
 }
 
 .iconfont {
   font-family: "iconfont" !important;
-  font-size: 32px;
+  font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
-.iconchangjianwentixiangguanwenti2:before {
-  content: "\e679";
+.iconjiantouxia:before {
+  content: "\e61a";
 }
 
-.icondagou:before {
-  content: "\e607";
+.iconshenheweitongguo:before {
+  content: "\e774";
 }
 
 .iconsanjiao_xia:before {
@@ -32,112 +32,128 @@
   content: "\e643";
 }
 
-.iconcaidan:before {
-  content: "\e65d";
+.icondagou:before {
+  content: "\e607";
 }
 
 .iconshezhi:before {
   content: "\e645";
 }
 
-.icondaizhifu:before {
-  content: "\e733";
+.iconcaidan:before {
+  content: "\e65d";
 }
 
-.iconshoujihao:before {
-  content: "\e734";
+.iconxiaoxi2:before {
+  content: "\e76f";
 }
 
-.iconxiangyou:before {
-  content: "\e735";
+.iconmorentu:before {
+  content: "\e76e";
 }
 
-.iconhaopingxingxing:before {
-  content: "\e736";
+.icongou:before {
+  content: "\e76d";
 }
 
-.iconmine:before {
-  content: "\e737";
+.iconbianjijiage1:before {
+  content: "\e76c";
 }
 
-.iconstore:before {
-  content: "\e738";
+.iconchenggong:before {
+  content: "\e76b";
 }
 
-.iconhome:before {
-  content: "\e739";
+.iconfahuo:before {
+  content: "\e75d";
 }
 
-.iconclassification:before {
-  content: "\e73a";
+.iconshouye:before {
+  content: "\e75e";
 }
 
-.iconyiguoqi:before {
-  content: "\e73b";
+.icontianjiatuku:before {
+  content: "\e767";
 }
 
-.iconyishiyong:before {
-  content: "\e73c";
+.iconxinrenlingquanshezhi:before {
+  content: "\e768";
 }
 
-.iconsearch:before {
-  content: "\e73d";
+.iconhuiyuandengjishezhi:before {
+  content: "\e769";
 }
 
-.iconclose:before {
-  content: "\e73e";
+.iconweixin:before {
+  content: "\e76a";
 }
 
-.icondianhua:before {
-  content: "\e73f";
+.iconcaidanlan:before {
+  content: "\e75c";
 }
 
-.iconditu:before {
-  content: "\e740";
+.icontupiantianjia:before {
+  content: "\e75f";
 }
 
-.iconxiaoxi:before {
-  content: "\e741";
+.icondelete:before {
+  content: "\e760";
 }
 
-.icondianpu:before {
-  content: "\e742";
+.iconxiaoxi1:before {
+  content: "\e761";
 }
 
-.iconfenxiang:before {
-  content: "\e743";
+.iconxiala:before {
+  content: "\e762";
 }
 
-.iconxuanzhong:before {
-  content: "\e744";
+.icontianjiakehu:before {
+  content: "\e766";
 }
 
-.iconweixuanzhong:before {
-  content: "\e745";
+.iconweixingongzhonghao:before {
+  content: "\e763";
 }
 
-.icontupian:before {
-  content: "\e746";
+.iconshoujihao1:before {
+  content: "\e764";
 }
 
-.iconxiaochengxu:before {
-  content: "\e747";
+.iconweixinlaiyuan:before {
+  content: "\e765";
 }
 
-.iconzhifubao:before {
-  content: "\e748";
+.iconkehuxuanzhong:before {
+  content: "\e755";
 }
 
-.iconkefu:before {
-  content: "\e749";
+.iconkehuweixuanzhong:before {
+  content: "\e756";
 }
 
-.iconshanchu:before {
-  content: "\e74a";
+.icongongzuotaiweixuanzhong:before {
+  content: "\e757";
 }
 
-.iconguanbi:before {
-  content: "\e74b";
+.icongongzuotaixuanzhong:before {
+  content: "\e758";
+}
+
+.icondingdanweixuanzhong:before {
+  content: "\e759";
+}
+
+.icondingdanxuanzhong:before {
+  content: "\e75a";
+}
+
+.iconcaozuo:before {
+  content: "\e751";
+}
+
+.iconcaozuojihuo:before {
+  content: "\e752";
 }
 
 .iconfenxiang1:before {
@@ -160,14 +176,6 @@
   content: "\e750";
 }
 
-.iconcaozuo:before {
-  content: "\e751";
-}
-
-.iconcaozuojihuo:before {
-  content: "\e752";
-}
-
 .iconzhiding:before {
   content: "\e753";
 }
@@ -176,111 +184,107 @@
   content: "\e754";
 }
 
-.iconkehuxuanzhong:before {
-  content: "\e755";
-}
-
-.iconkehuweixuanzhong:before {
-  content: "\e756";
+.iconguanbi:before {
+  content: "\e74b";
 }
 
-.icongongzuotaiweixuanzhong:before {
-  content: "\e757";
+.iconshanchu:before {
+  content: "\e74a";
 }
 
-.icongongzuotaixuanzhong:before {
-  content: "\e758";
+.iconkefu:before {
+  content: "\e749";
 }
 
-.icondingdanweixuanzhong:before {
-  content: "\e759";
+.icontupian:before {
+  content: "\e746";
 }
 
-.icondingdanxuanzhong:before {
-  content: "\e75a";
+.iconxiaochengxu:before {
+  content: "\e747";
 }
 
-.iconcaidanlan:before {
-  content: "\e75c";
+.iconzhifubao:before {
+  content: "\e748";
 }
 
-.iconfahuo:before {
-  content: "\e75d";
+.iconchangjianwentixiangguanwenti2:before {
+  content: "\e679";
 }
 
-.iconshouye:before {
-  content: "\e75e";
+.iconxuanzhong:before {
+  content: "\e744";
 }
 
-.icontianjiatuku:before {
-  content: "\e767";
+.iconweixuanzhong:before {
+  content: "\e745";
 }
 
-.iconxinrenlingquanshezhi:before {
-  content: "\e768";
+.iconfenxiang:before {
+  content: "\e743";
 }
 
-.iconhuiyuandengjishezhi:before {
-  content: "\e769";
+.iconxiaoxi:before {
+  content: "\e741";
 }
 
-.iconweixin:before {
-  content: "\e76a";
+.icondianpu:before {
+  content: "\e742";
 }
 
-.icontupiantianjia:before {
-  content: "\e75f";
+.icondianhua:before {
+  content: "\e73f";
 }
 
-.icondelete:before {
-  content: "\e760";
+.iconditu:before {
+  content: "\e740";
 }
 
-.iconxiaoxi1:before {
-  content: "\e761";
+.iconsearch:before {
+  content: "\e73d";
 }
 
-.iconxiala:before {
-  content: "\e762";
+.iconclose:before {
+  content: "\e73e";
 }
 
-.iconweixingongzhonghao:before {
-  content: "\e763";
+.icondaizhifu:before {
+  content: "\e733";
 }
 
-.iconshoujihao1:before {
-  content: "\e764";
+.iconshoujihao:before {
+  content: "\e734";
 }
 
-.iconweixinlaiyuan:before {
-  content: "\e765";
+.iconxiangyou:before {
+  content: "\e735";
 }
 
-.icontianjiakehu:before {
-  content: "\e766";
+.iconhaopingxingxing:before {
+  content: "\e736";
 }
 
-.iconchenggong:before {
-  content: "\e76b";
+.iconmine:before {
+  content: "\e737";
 }
 
-.iconbianjijiage1:before {
-  content: "\e76c";
+.iconstore:before {
+  content: "\e738";
 }
 
-.icongou:before {
-  content: "\e76d";
+.iconhome:before {
+  content: "\e739";
 }
 
-.iconmorentu:before {
-  content: "\e76e";
+.iconclassification:before {
+  content: "\e73a";
 }
 
-.iconxiaoxi2:before {
-  content: "\e76f";
+.iconyiguoqi:before {
+  content: "\e73b";
 }
 
-.iconshenheweitongguo:before {
-  content: "\e774";
+.iconyishiyong:before {
+  content: "\e73c";
 }
 

mobile-code/src/uni.scss

@@ -12,7 +12,7 @@ $imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色
-$mainColor: #3385FF;
+$mainColor: #FF2842;
 $mainColor1: #049E2C;
 $auxiliaryColor2: #ff6900;