续期与购买

ghsApp/src/admin/shop/renew.vue

@@ -94,7 +94,6 @@ export default {
                 that.hasRenew = res.data.hasRenew ? res.data.hasRenew : 0
                 that.currentDeadline = res.data.currentDeadline
                 that.newDeadline = res.data.newDeadline
-                that.renewType = res.data.renewType?res.data.renewType:0
             }
         })
     },
@@ -106,13 +105,20 @@ export default {
 
         },
 		startRenew(type,price){
-            // #ifdef APP-PLUS
             let that = this
+            // #ifdef APP-PLUS
             let type = uni.getSystemInfoSync().platform
             that.$msg("APP不能操作，请打开微信小程序操作")
             // #endif
             // #ifdef MP-WEIXIN
             uni.showLoading({mask:true})
+            if(type == 1){
+                if(Number(price) <= 0){
+                    that.$msg("请输入金额")
+                    return false
+                }
+            }
+            this.renewType = type
             renewShop({price:price,type:type}).then(res=>{
                 uni.hideLoading()
                 if(res.code == 1){
@@ -122,10 +128,9 @@ export default {
             // #endif
         },
 		getSuccess(){
-			this.$util.pageTo({url:"/admin/shop/renewSuccess",type:2})
+			this.$util.pageTo({url:"/admin/shop/renewSuccess?type="+this.renewType,type:2})
 		},
 		getError(){
-
         },
         closeRenew(){
             uni.navigateBack()

ghsApp/src/admin/shop/renewSuccess.vue

@@ -4,8 +4,8 @@
         <view class="top-view"> </view>
         <view class="result-view">
           <view :class="['iconfont', 'iconchenggong']"></view>
-          <view class="result-title">续期成功</view>
-          <view class="result-title">已延长到：{{ deadline?deadline.substr(0,10):'' }}</view>
+          <view class="result-title">支付成功</view>
+          <view class="result-title" v-if="type == 0">已延长到：{{ deadline?deadline.substr(0,10):'' }}</view>
           <button class="admin-button-com big" style="width:45vw;margin-top:20upx;" @click="goBack">返回</button>
         </view>
       </view>
@@ -18,10 +18,12 @@
     name: "renewSuccess",
     data() {
       return {
-        deadline:''
+        deadline:'',
+        type:0
       }
     },
     onLoad () {
+      this.type = this.option.type?this.option.type:0
     },
     methods: {
       goBack(){

ghsApp/src/pages.json

@@ -222,7 +222,7 @@
 				{"path": "selectShop","style": {"navigationBarTitleText": "选择门店"}},
 				{"path": "wl","style": {"navigationBarTitleText": "物流列表"}},
 				{"path": "myShop","style": {"navigationBarTitleText": "我的门店"}},
-				{"path": "renew","style": {"navigationBarTitleText": "续期"}},
+				{"path": "renew","style": {"navigationBarTitleText": "续期与购买"}},
 				{"path": "expressSet","style": {"navigationBarTitleText": "跑腿设置"}}
 			]
 		},

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -14,7 +14,7 @@
 						<view class="flex title" v-if="info.status == 3"> 入库前请确认售价: </view>
 						<view class="flex title" v-else> 确认售价: </view>
 						<view class="flex title">
-							<text style="font-size:22upx;font-weight:normal;color:#CCCCCC;">
+							<text style="font-size:24upx;font-weight:normal;color:#CCCCCC;">
 								<text style="color:black;font-weight:bold;margin:0 3upx 0 0;">花材名称</text>/
 								<text style="color:red;font-weight:normal;margin:0 3upx 0 3upx;">进价</text>/
 								<text style="color:black;font-weight:normal;margin:0 3upx 0 3upx;">本次成本</text>/