定位等

hdApp/src/admin/billing/affirmGhs.vue

@@ -484,8 +484,8 @@ export default {
 				success: function (res) {
 					if (res.confirm) {
 						createOrder(parameter).then(res => {
-							const {data: { orderSn,realPrice }} = res;
-							self.pageTo({url: `/pagesPurchase/wechatPay?type=2&orderSn=${orderSn}&realPrice=${realPrice}`, type: 2})
+							const {data: { orderSn,realPrice,count }} = res;
+							self.pageTo({url: `/pagesPurchase/wechatPay?type=2&orderSn=${orderSn}&realPrice=${realPrice}&count=${count}`, type: 2})
 							setTimeout(() => {
 								uni.removeStorageSync('selectCouponInfo')
 								self.resetSelectInfoByType(self.pageType);

hdApp/src/components/app-area-sel.vue

@@ -3,12 +3,12 @@
 		<bottom-popup class="popup-wrap" :show="showPopup" @close="hidePopup">
 			<div class="map-wrap">
 				<div class="map-top-tit-wrap">
-					<div class="map-top-tit">选择收货地址</div>
+					<div class="map-top-tit">填写地址</div>
 					<app-close icon="iconguanbi" @close="hidePopup" />
 				</div>
 				<!-- 搜索 -->
 				<div class="map-search">
-					<app-search-module ref="aaaaa" placeholder="请输入你的收货地址" :focus="false" @input="searchFn"/>
+					<app-search-module ref="aaaaa" placeholder="请填写地址" :focus="false" @input="searchFn"/>
 				</div>
 				<!-- 地图 -->
 				<!-- <div class="map-box">

hdApp/src/pagesClient/official/apply.vue

@@ -205,7 +205,8 @@ export default {
   onShow() {
   	let self = this
 			uni.getLocation({
-				type: 'wgs84',
+				type: 'gcj02',
+        isHighAccuracy:true,
 				success: function (res) {
 					mapResolve({lat:res.latitude,long:res.longitude}).then((obj) => {
 

hdApp/src/pagesClient/official/result.vue

@@ -24,9 +24,15 @@ export default {
     },
     methods:{
       close() {
-        this.pageTo({url: '/admin/home/workbench', type: 4})
-        uni.setStorageSync('HOME_REFRESH', '1')
+        // this.pageTo({url: '/admin/home/workbench', type: 4})
+        // uni.setStorageSync('HOME_REFRESH', '1')
+        // uni.removeStorageSync('HOME_STATUS_STROAGE_SHOW')
+
+        uni.removeStorageSync('OPEN_SHOP_ID')
         uni.removeStorageSync('HOME_STATUS_STROAGE_SHOW')
+        this.$store.commit("setLoginInfo", {})
+        this.pageTo({url: "/admin/home/workbench",type: 3})
+
       }
     }
 };

hdApp/src/pagesPurchase/wechatPay.vue

@@ -19,9 +19,11 @@
             <span class="app-size-36 app-bold">{{ realPrice || '0.00'}}</span>
           </div>
           <div class="order-num app-color-3">订单号: {{ orderSn || ''}}</div>
+          <div v-if="count >0" class="order-num app-color-3" style="margin-top:18rpx;font-size:26rpx;"><span style="font-weight:bold;padding-right:8rpx;">{{count}}</span>秒后订单失效</div>
+          <div v-else class="order-num app-color-3" style="margin-top:12rpx;font-size:26rpx;">订单已失效</div>
         </block>
         <block>
-          <div class="call-one-btn">
+          <div v-if="count >0" class="call-one-btn">
             <button
               class="button-com green pay-wx"
               @click="postponePay"
@@ -38,6 +40,23 @@
               v-if="type === '2'"
             >余额支付</button>
           </div>
+          <div v-else class="call-one-btn">
+            <button
+              class="button-com default pay-wx"
+              disabled="true"
+              v-if="type === '2'"
+            >延期支付</button>
+            <button
+              class="button-com default pay-wx"
+              disabled="true"
+              v-if="type ==='1' || type === '2'"
+            >微信支付</button>
+            <button
+              class="button-com default pay-wx"
+              disabled="true"
+              v-if="type === '2'"
+            >余额支付</button>
+          </div>
         </block>
       </div>
     </div>
@@ -80,13 +99,24 @@ export default {
       orderSn: '',
       realPrice: '',
       _type: '1',
-      pageId: ''
+      pageId: '',
+      count:10
     };
   },
   onLoad (options) {
     this.orderSn = options.orderSn;
     this.realPrice = options.realPrice;
     this.type = options.type
+    let that = this
+    this.count = options.count
+    let t =setInterval(function(){
+      if(that.count > 0){
+        that.count--
+      }else{
+        clearInterval(t);
+      }
+    },1000);
+
   },
   computed: {
     ...mapGetters(["getLoginInfo", 'getDictionariesInfo']),