shish 4 lat temu
rodzic
commit
7dffd2ecb8

+ 7 - 7
ghsApp/src/admin/billing/toPay.vue

@@ -29,16 +29,16 @@
           <view style="margin-bottom:20upx;">
           <view style="margin-bottom:20upx;">
               <button @click="changePayWay(0)" class="admin-button-com middle" :class="payWay == 0 ? 'blue' : 'default'">微信</button>
               <button @click="changePayWay(0)" class="admin-button-com middle" :class="payWay == 0 ? 'blue' : 'default'">微信</button>
               <button @click="changePayWay(1)" style="margin-left:40upx;" class="admin-button-com middle" :class="payWay == 1 ? 'blue' : 'default'">支付宝</button>
               <button @click="changePayWay(1)" style="margin-left:40upx;" class="admin-button-com middle" :class="payWay == 1 ? 'blue' : 'default'">支付宝</button>
-              <button @click="changePayWay(2)" style="margin-left:40upx;" class="admin-button-com middle" :class="payWay == 2 ? 'blue' : 'default'">欠款</button>
+              <button @click="changePayWay(2)" style="margin-left:40upx;" class="admin-button-com middle" :class="payWay == 2 ? 'blue' : 'default'">欠款</button>
           </view>
           </view>
           <image mode="widthFix" style="width:350upx;margin:0 auto;" :src="payQrCodeUrl"></image>
           <image mode="widthFix" style="width:350upx;margin:0 auto;" :src="payQrCodeUrl"></image>
           </view>
           </view>
         </view>
         </view>
         <view style="margin-top:35upx;">
         <view style="margin-top:35upx;">
-            <button style="width:25vh;" @click="goBack()" class="admin-button-com big default">返回首页</button>
+            <button style="width:28vh;" @click="goBack()" class="admin-button-com big default">返回首页</button>
         </view>
         </view>
-        <view v-if="orderInfo.orderType == 1" style="color:#CCCCCC;margin-top:20upx;">10分钟后,订单状态将自动变成欠款 <text @click="cancelOrder()" style="color:#666666;margin-left:10upx;text-decoration:underline;">取消订单</text></view>
-        <view v-else style="color:#CCCCCC;margin-top:20upx;">客户下单,10分钟后未付款自动取消</view>
+        <view v-if="orderInfo.orderType == 1" style="color:#CCCCCC;margin-top:20upx;">10分钟后未付款,订单自动变成欠款 <text @click="cancelOrder()" style="color:#666666;margin-left:10upx;text-decoration:underline;">取消订单</text></view>
+        <view v-else style="color:#CCCCCC;margin-top:20upx;">客户下单,10分钟后未付款自动取消</view>
       </view>
       </view>
     </view>
     </view>
   </view>
   </view>
@@ -230,7 +230,7 @@ export default {
       // 使用icon
       // 使用icon
       .icon {
       .icon {
         .iconfont {
         .iconfont {
-          font-size: 170upx;
+          font-size: 130upx;
         }
         }
       }
       }
       // 一个按钮
       // 一个按钮
@@ -265,13 +265,13 @@ export default {
 }
 }
 .wait {
 .wait {
   color: #ffa92e;
   color: #ffa92e;
-  font-size: 40upx;
+  font-size: 30upx;
   font-weight: 700;
   font-weight: 700;
   margin: 20upx 0;
   margin: 20upx 0;
 }
 }
 .balance{
 .balance{
   margin-top:30upx;
   margin-top:30upx;
-  font-size:33upx;
+  font-size:28upx;
   font-weight: bold;
   font-weight: bold;
 }
 }
 </style>
 </style>

+ 1 - 1
hdApp/src/pagesPurchase/order.vue

@@ -79,7 +79,7 @@ export default {
 		},
 		},
     enterShop(item) {
     enterShop(item) {
       const { id } = item
       const { id } = item
-      this.pageTo({url: '/pagesPurchase/ghsProduct',query:{id:id},type: 2})
+      this.pageTo({url: '/pagesPurchase/ghsProduct',query:{id:id}})
     },
     },
     init() {
     init() {
       this.getGHSList()
       this.getGHSList()

+ 4 - 10
hdApp/src/pagesPurchase/particulars.vue

@@ -5,17 +5,12 @@
       <view class="result-view">
       <view class="result-view">
         <view :class="['iconfont', 'iconchenggong']"></view>
         <view :class="['iconfont', 'iconchenggong']"></view>
         <view class="result-title">支付成功</view>
         <view class="result-title">支付成功</view>
-
-        <button v-if="loginInfo.admin.subscribe == 0" class="admin-button-com blue big" @click="openMind">开启动态提醒</button>
-
-        <button v-if="loginInfo.admin.subscribe == 0" class="admin-button-com big" @click="goDetail">订单详情</button>
-        <button v-if="loginInfo.admin.subscribe == 1" class="admin-button-com blue big" @click="goDetail">订单详情</button>
-        <button class="admin-button-com big" @click="goClose">返回首页</button>
+        <button class="admin-button-com blue big" @click="goDetail">订单详情</button>
+        <button class="admin-button-com big" @click="goClose">返回列表</button>
       </view>
       </view>
     </view>
     </view>
   </view>
   </view>
 </template>
 </template>
-
 <script>
 <script>
 export default {
 export default {
   name: "AppResult",
   name: "AppResult",
@@ -38,7 +33,7 @@ export default {
       this.pageTo({ url: "/pagesClient/official/warn"})
       this.pageTo({ url: "/pagesClient/official/warn"})
     },
     },
     goClose () {
     goClose () {
-      this.pageTo({ url: "/admin/home/workbench", type: 3 })
+      uni.navigateBack()
     },
     },
     goDetail() {
     goDetail() {
       this.pageTo({url: '/pagesPurchase/purDetails?status=2&id=' + this.option.id, type: 3})
       this.pageTo({url: '/pagesPurchase/purDetails?status=2&id=' + this.option.id, type: 3})
@@ -46,7 +41,6 @@ export default {
   },
   },
 };
 };
 </script>
 </script>
-
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .billing_box_bg {
 .billing_box_bg {
   position: relative;
   position: relative;
@@ -97,4 +91,4 @@ export default {
     width: 100%;
     width: 100%;
   }
   }
 }
 }
-</style>
+</style>