Merge branch 'master' into dev

App.vue

@@ -5,15 +5,15 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			// url: 'https://hsg.dctpay.com/crest',
+			url: 'https://hsg.dctpay.com/crest',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// brestUrl: 'https://hsg.dctpay.com/brest',
+			brestUrl: 'https://hsg.dctpay.com/brest',
-			// imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
+			imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			url: 'https://hsgcs.dctpay.com/crest',
+			// url: 'https://hsgcs.dctpay.com/crest',
-			brestUrl: 'https://hsgcs.dctpay.com/brest',
+			// brestUrl: 'https://hsgcs.dctpay.com/brest',
-			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			// imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
 			brestUserInfo: '',
 			bresthighAgent: '',
@@ -29,7 +29,7 @@
 			balanceCardNo: '',
 			identificationCode: '',
 			//公司id
-			companyId:'',
+			companyId: '',
 			// h5获取信息
 			h5code: '',
 			//门店ID
@@ -58,9 +58,9 @@
 			pelletoilList: ''
 
 		},
-		onLaunch: function() {
+		onLaunch: function() {},
-		},
 		onShow: function() {
+			// #ifdef H5
 			let that = this;
 			uni.getStorage({
 				key: 'openId',
@@ -112,7 +112,8 @@
 				success(e) {
 					if (e.data) {
 						if (that.globalData.accountId == '000001&key' || that.globalData.accountId ==
-							'000000&gasKey' || that.globalData.accountId == '000009&key' || that.globalData.accountId == '0000010&key') {
+							'000000&gasKey' || that.globalData.accountId == '000009&key' || that.globalData
+							.accountId == '0000010&key') {
 							that.globalData.staffCode = e.data;
 						} else {
 							that.globalData.mchId = e.data;
@@ -130,6 +131,24 @@
 				}
 			})
 			
+			uni.getStorage({
+				key: 'cityName',
+				success(e) {
+					if (e.data) {
+						that.globalData.cityName = e.data;
+					}
+				}
+			})
+			
+			uni.getStorage({
+				key: 'qianzhuCityName',
+				success(e) {
+					if (e.data) {
+						that.globalData.qianzhuCityName = e.data;
+					}
+				}
+			})
+
 			uni.getStorage({
 				key: 'companyId',
 				success(e) {
@@ -155,6 +174,7 @@
 					}
 				}
 			})
+			// #endif
 		},
 		onHide: function() {}
 	}

pages/tabBar/home/home.vue

@@ -546,6 +546,14 @@
 							key: "cityId",
 							data: res.return_data.regionId
 						})
+						uni.setStorage({
+							key: "cityName",
+							data: res.return_data.provinceName
+						})
+						uni.setStorage({
+							key: "qianzhuCityName",
+							data: res.return_data.cityName
+						})
 						uni.setStorage({
 							key: "companyId",
 							data: res.return_data.companyId

pages/user/coupon/coupon.vue

@@ -248,7 +248,21 @@
 					uni.navigateTo({
 						url: '../../../subPages/recharge/recharge'
 					})
-				} else {
+				} else if (e.highDiscount.useScope == 4) {
+					app.globalData.distinguishid = 1;
+					uni.navigateTo({
+						url: '/qianzhu-KFC/buffet-order/buffet-order'
+					})
+				} else if (e.highDiscount.useScope == 5) {
+					app.globalData.distinguishid = 2;
+					uni.navigateTo({
+						url:  '/qianzhu-KFC/buffet-order/buffet-order'
+					})
+				} else if (e.highDiscount.useScope == 6) {
+					uni.navigateTo({
+						url: '/member-Recharge/choicepage/choicepage'
+					})
+				} else{
 					uni.navigateTo({
 						url: '../mineCouponsDestails/mineCouponsDestails?id=' + e.id
 					})

subPages/coupon-packge-details/coupon-packge-details.vue

@@ -66,7 +66,7 @@
 		<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券包</view>
 			<view class="width92 height110 tccs mart10" v-for="product in goodsData.discountList" :key="product.id">
-				<image mode="widthFix" class="flleft" src="../../static/img/logo.png"></image>
+				<image mode="widthFix" class="flleft" :src="imageUrl+product.discountDetail.discountImg"></image>
 				<view class="tcrig">
 					<view class="font16 fontwig6 fcor333 text2">{{ product.discountDetail.discountName}}</view>
 					<view class="font14 fcor999 mart5">数量: x{{product.num}}</view>