续期优化

ghsApp/src/admin/home/workbench.vue

@@ -133,7 +133,7 @@
 			<view>为了加快系统的开发进度，实现大家需要的<text style="font-weight:bold;color:#3385FF;">上下游连通</text>、<text style="font-weight:bold;color:#3385FF;">连麦芽田一键发跑腿</text>、<text style="font-weight:bold;color:#3385FF;">会员和充值</text>、<text style="font-weight:bold;color:#3385FF;">散客到店自助下单</text>等重要功能</view>
 			<view style="margin-top:24upx;">特向您收取未来时间的年费，感谢您对公司的支持</view>
 			<view style="margin-top:24upx;">当前系统到期时间：{{ currentDeadline }}</view>
-			<view style="margin-top:24upx;">续期一年到期时间：{{ newDeadline }}</view>
+			<view style="margin-top:24upx;">续期一年到期时间：<text style="color:#3385FF;">{{ newDeadline }}</text></view>
 			<view style="margin-top:40upx;text-align:center;">
 				<button class="admin-button-com big default" @click="closeRenew()">稍后再说</button>
         		<button class="admin-button-com big blue" @click="startRenew()" style="margin-left:80upx;">续期一年</button>
@@ -281,6 +281,8 @@ export default {
 			})
 		},
 		startRenew(){
+			this.$util.pageTo({ url: "/admin/shop/renewSuccess"})
+			return false
 			renewShop().then(res=>{
 				if(res.code == 1){
 					wexinPay(res.data, this.getSuccess, this.getError)
@@ -288,7 +290,7 @@ export default {
 			})
 		},
 		getSuccess(){
-
+			this.$util.pageTo({ url: "/admin/shop/renewSuccess"})
 		},
 		getError(){
 

ghsApp/src/admin/shop/renewSuccess.vue

@@ -0,0 +1,158 @@
+<template>
+    <view class="app-content">
+      <view class="billing_box_bg">
+        <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>
+          <button class="admin-button-com big" style="width:45vw;margin-top:20upx;" @click="goBack">返回</button>
+        </view>
+      </view>
+    </view>
+  </template>
+  <script>
+  import { mapGetters } from "vuex";
+  import {currentShop} from "@/api/shop";
+  export default {
+    name: "renewSuccess",
+    data() {
+      return {
+        deadline:''
+      }
+    },
+    onLoad () {
+    },
+    methods: {
+      init(){
+        let that = this
+        currentShop().then(res => {
+          if(res.code == 1){
+            that.deadline = res.data.deadline
+          }
+        })
+      }
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  .go-back{
+      width: 80%;
+      height: 80upx;
+      color: #FFFFFF;
+      margin-top: 50upx;
+      background: #3385FF;
+      border-radius: 10upx;
+      font-size:30upx;
+  }
+  .title{
+      font-weight:700;
+      margin-bottom:30upx;
+      font-size:30upx;
+  }
+  .product-area{
+      width:730upx;
+      height:90upx;
+      display:flex;
+      align-items:center;
+      .first-area{
+          border-bottom:1upx solid #e4e2e2;
+          position:relative;
+      width:550upx;
+          .name{
+              width:280upx;
+              overflow: hidden;
+              text-overflow:ellipsis;
+              white-space: nowrap;
+              display:inline-block;
+              font-weight:bold;
+              font-size:28upx;
+          }
+          .cg-cost{
+              font-weight:bold;
+              font-size:27upx;
+              color:red;
+              position:absolute;
+              left:480upx;
+              top:8upx;
+          }
+          .cost-price{
+              font-weight:bold;
+              font-size:27upx;
+              color:blue;
+              position:absolute;
+              left:515upx;
+              top:18upx;
+          }
+          input{
+              border:1upx solid #cccccc;
+              display:inline-block;
+              width:135upx;
+              margin-left:10upx;
+              margin-right:30upx;
+              text-align:center;
+              font-size:30upx;
+          }
+      }
+      .second-area{
+          float:left;
+          color:#646464;
+          margin-top:10upx;
+          .one{
+              color:red;
+          }
+          .two{
+              color:#CCCCCC;
+          }
+      }
+  }
+  .billing_box_bg {
+    position: relative;
+    padding: 30upx 30upx;
+    display: flex;
+    flex-direction: column;
+    background-color: #f5f5f5;
+    .top-view {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 299upx;
+      background: #3385ff;
+      border-radius: 0upx 0upx 83upx 83upx;
+    }
+    .result-view {
+      position: relative;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding: 30upx 70upx 70upx 70upx;
+      width: 100%;
+      background: #ffffff;
+      border-radius: 20upx;
+      z-index: 1;
+      .iconchenggong {
+        font-size: 170upx;
+        color: $mainColor1;
+      }
+      .result-title {
+        margin: 20upx 0 50upx;
+        font-size: 32upx;
+      }
+      .close_btn {
+        line-height: 88upx;
+        text-align: center;
+        width: 550upx;
+        height: 88upx;
+        border: 1px solid #dddddd;
+        border-radius: 8upx;
+        font-size: 32upx;
+        color: #666;
+      }
+    }
+    .admin-button-com {
+      margin-bottom: 20upx;
+      width: 100%;
+    }
+  }
+  </style>

ghsApp/src/pages.json

@@ -197,6 +197,7 @@
 			"pages": [
 				{"path": "list","style": {"navigationBarTitleText": "门店"}},
 				{"path": "add","style": {"navigationBarTitleText": ""}},
+				{"path": "renewSuccess","style": {"navigationBarTitleText":"续期成功"}},
 				{"path": "print","style": {"navigationBarTitleText": "小票机"}},
 				{"path": "wcPrint","style": {"navigationBarTitleText": "采购小票机"}},
 				{"path": "trumpet","style": {"navigationBarTitleText": "云音箱"}},