Merge branch 'dev4.6.2.1' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.1

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_purchase.css

@@ -1032,3 +1032,69 @@
 .origin-price .price-num {
   text-decoration: line-through;
 }
+
+/* 弹出框样式 */
+.back-tip-wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+  height: 6.7rem;
+  padding-top: .48rem;
+  padding-bottom: .56rem;
+  width: calc(100% - 0.72rem * 2);
+  background-image: url(/common-module/area-pack/images/messageCard@2x.png);
+  background-repeat: no-repeat;
+  background-size: contain;
+  background-position: center center;
+  background-color: transparent;
+}
+.back-tip-wrapper .b-t-title {
+  width: 2.12rem;
+}
+.back-tip-wrapper .b-t-title img {
+  width: 100%;
+}
+.back-tip-wrapper .b-t-content {
+  margin-top: .24rem;
+  max-width: 4.4rem;
+  flex: 1;
+}
+.back-tip-wrapper .b-t-content-item {
+  margin-bottom: .24rem;
+  padding: .06rem .2rem;
+  width: 100%;
+  color: #5E5E64;
+  font-size: .28rem;
+  line-height: .44rem;
+  text-align: center;
+  border-radius: .16rem;
+}
+.b-t-content-item.bg-f-orange {
+  font-size: .24rem;
+  line-height: .4rem;
+  color: #D69E55;
+  background-color: #FAE7CA;
+}
+.b-t-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.b-t-footer .button {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 2.2rem;
+  height: .8rem;
+  font-size: .36rem;
+  color: #D69E55;
+  border-radius: .7rem;
+  border: 1px solid #D69E55;
+  background-color: transparent;
+}
+.b-t-footer .button.confirm {
+  margin-left: .4rem;
+  color: #fff;
+  background-color: #D69E55;
+}

src/jfw/modules/app/src/web/templates/commonPay/paySuccess.html

@@ -108,6 +108,7 @@
 <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
+<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/utils.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
 <script>
     $(function () {
@@ -175,8 +176,7 @@
         } else {
             payData = new Date();
         }
-        $(".paytime").text(payData.getFullYear() + "年" + (payData.getMonth() + 1) + "月" + payData.getDate() + "日");
-
+        $(".paytime").text(new Date(payData).pattern('yyyy年MM月dd日 HH:mm:ss'));
 
         if (!price) {
             $(".pay_mode").hide();

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_purchase.html

@@ -10,6 +10,7 @@
   <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.css'>
   <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}'>
   <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/public_.css?v={{Msg "seo" "version"}}'/>
+  <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
   <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/appbutton.css?v={{Msg "seo" "version"}}'/>
   <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/vip_purchase.css?v={{Msg "seo" "version"}}'>
   <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css'/>
@@ -285,6 +286,26 @@
       <!-- vue组件 -->
       <div class="vip-footer fixed-bottom-box p15" id="goods-order-vue">
         <pay-order-template ref="couponRef" :config="$data" @update="updateS"></pay-order-template>
+        <van-popup v-model="dialog.backTip" get-container="body" class="back-tip-wrapper" :close-on-click-overlay="false">
+          <div class="b-t-title">
+            <img src="/common-module/area-pack/images/messageTitle@3x.png" alt="">
+          </div>
+          <div class="b-t-content">
+            <div class="b-t-content-item">
+              多订阅1个省份，获取商机概率<br />增加一倍，邀您体验！
+            </div>
+            <div class="b-t-content-item bg-f-orange">
+              支持用户增加订阅区域时使用，每增购1个省可获取该省的招标采购信息
+            </div>
+            <div class="b-t-content-item bg-f-orange">
+              按时间（月/季/年）、订阅省份个数计价，19.9元省/月起。
+            </div>
+          </div>
+          <div class="b-t-footer">
+            <button class="button cancel" @click="dialog.backTip = false;history.back()">取消</button>
+            <button class="button confirm" @click="toBuyAreaPack">去购买</button>
+          </div>
+        </van-popup>
       </div>
       <div class="fixed-bottom-box p15" style="display: none;">
         {{if not .T.isTrial }}
@@ -503,9 +524,9 @@
   <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
   <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
   <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
-  <!--<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
   <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/price.js?v={{Msg "seo" "version"}}"></script>
   <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+  <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/js/vip-size-template.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/js/vip-coupon-template.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/coupon/js/pay-order-template.js?v={{Msg "seo" "version"}}'></script>
@@ -761,6 +782,11 @@
       el: '#goods-order-vue',
       data: function () {
         return {
+          sessKey: '$data-vipsubscribe_new_goods_order',
+          dialog: {
+            backTip: false,
+            backTipShowCount: 0
+          },
           type: 'vip',
           initPrice: 0, // 原价
           realPrice: 0, // 实付价
@@ -784,8 +810,41 @@
       },
       mounted () {
         this.init(this.$data)
+        this.restoreState()
+        this.addBackTip()
       },
       methods: {
+        toBuyAreaPack: function () {
+          this.dialog.backTip = false
+          this.saveState()
+          location.href = '/jyapp/areaPack/page/buy'
+        },
+        restoreState: function () {
+          var k = sessionStorage.getItem(this.sessKey)
+          if (k) {
+            Object.assign(this.dialog, JSON.parse(k))
+
+            sessionStorage.removeItem(this.sessKey)
+          }
+          return !!k
+        },
+        saveState: function () {
+          sessionStorage.setItem(this.sessKey, JSON.stringify(this.dialog))
+        },
+        addBackTip: function () {
+          var _this = this
+          var pushContent = {
+            info: 'back',
+            url: '#tip'
+          }
+          if (!history.state && this.dialog.backTipShowCount < 1) {
+            history.pushState(pushContent, null, pushContent.url);
+          }
+          $(window).on('popstate', function () {
+            _this.dialog.backTip = true
+            _this.dialog.backTipShowCount++
+          })
+        },
         // 更新价格相关
         updatePrice: function (before) {
           var curCoupon = JSON.parse(sessionStorage.getItem('vip-cur-select-coupon'))

src/web/staticres/common-module/order-list/js/order-detail.js

@@ -292,12 +292,12 @@ var vm = new Vue({
         {
           label: '下单时间',
           split: '：',
-          text: new Date(createTime).pattern('yyyy.MM.dd HH:mm')
+          text: new Date(createTime).pattern('yyyy.MM.dd HH:mm:ss')
         },
         {
           label: '支付时间',
           split: '：',
-          text: payTime ? new Date(payTime).pattern('yyyy.MM.dd HH:mm') : ''
+          text: payTime ? new Date(payTime).pattern('yyyy.MM.dd HH:mm:ss') : ''
         },
         {
           label: '支付方式',

src/web/staticres/vipsubscribe/css/vip_purchase.css

@@ -1037,3 +1037,69 @@ html, body {
   width: 20px;
   height: 20px;
 }
+
+/* 弹出框样式 */
+.back-tip-wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+  height: 6.7rem;
+  padding-top: .48rem;
+  padding-bottom: .56rem;
+  width: calc(100% - 0.72rem * 2);
+  background-image: url(/common-module/area-pack/images/messageCard@2x.png);
+  background-repeat: no-repeat;
+  background-size: contain;
+  background-position: center center;
+  background-color: transparent;
+}
+.back-tip-wrapper .b-t-title {
+  width: 2.12rem;
+}
+.back-tip-wrapper .b-t-title img {
+  width: 100%;
+}
+.back-tip-wrapper .b-t-content {
+  margin-top: .24rem;
+  max-width: 4.4rem;
+  flex: 1;
+}
+.back-tip-wrapper .b-t-content-item {
+  margin-bottom: .24rem;
+  padding: .06rem .2rem;
+  width: 100%;
+  color: #5E5E64;
+  font-size: .28rem;
+  line-height: .44rem;
+  text-align: center;
+  border-radius: .16rem;
+}
+.b-t-content-item.bg-f-orange {
+  font-size: .24rem;
+  line-height: .4rem;
+  color: #D69E55;
+  background-color: #FAE7CA;
+}
+.b-t-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.b-t-footer .button {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 2.2rem;
+  height: .8rem;
+  font-size: .36rem;
+  color: #D69E55;
+  border-radius: .7rem;
+  border: 1px solid #D69E55;
+  background-color: transparent;
+}
+.b-t-footer .button.confirm {
+  margin-left: .4rem;
+  color: #fff;
+  background-color: #D69E55;
+}

src/web/templates/weixin/commonPay/paySuccess.html

@@ -89,6 +89,7 @@
 </div>
 </body>
 <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/big-member/js/utils.js?v={{Msg "seo" "version"}}"></script>
 <script>
     $(function () {
         var payTime = {{.T.payTime}}
@@ -148,7 +149,7 @@
         } else {
             payData = new Date();
         }
-        $(".paytime").text(payData.getFullYear() + "年" + (payData.getMonth() + 1) + "月" + payData.getDate() + "日");
+        $(".paytime").text(new Date(payData).pattern('yyyy年MM月dd日 HH:mm:ss'));
         if (!price) {
             $(".pay_mode").hide();
             $(".success-price").hide();

src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -12,6 +12,7 @@
     <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
     <link rel="stylesheet" href="/vipsubscribe/css/vip_purchase.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/css/vip-size-template.css?v={{Msg "seo" "version"}}' />
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/css/vip-coupon-template.css?v={{Msg "seo" "version"}}' />
@@ -256,6 +257,26 @@
             <!-- vue组件 -->
             <div class="fixed-bottom-box p15" id="goods-order-vue">
               <pay-order-template ref="couponRef" :config="$data" @update="updateS"></pay-order-template>
+              <van-popup v-model="dialog.backTip" get-container="body" class="back-tip-wrapper" :close-on-click-overlay="false">
+                <div class="b-t-title">
+                  <img src="/common-module/area-pack/images/messageTitle@3x.png" alt="">
+                </div>
+                <div class="b-t-content">
+                  <div class="b-t-content-item">
+                    多订阅1个省份，获取商机概率<br />增加一倍，邀您体验！
+                  </div>
+                  <div class="b-t-content-item bg-f-orange">
+                    支持用户增加订阅区域时使用，每增购1个省可获取该省的招标采购信息
+                  </div>
+                  <div class="b-t-content-item bg-f-orange">
+                    按时间（月/季/年）、订阅省份个数计价，19.9元省/月起。
+                  </div>
+                </div>
+                <div class="b-t-footer">
+                  <button class="button cancel" @click="dialog.backTip = false;history.back()">取消</button>
+                  <button class="button confirm" @click="toBuyAreaPack">去购买</button>
+                </div>
+              </van-popup>
             </div>
             <div class="fixed-bottom-box p15" style="display: none;">
                 {{if not .T.isTrial }}
@@ -475,6 +496,7 @@
         <!--<script src='{{Msg "seo" "cdn"}}/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
         <script src="/vipsubscribe/js/price.js?v={{Msg "seo" "version"}}"></script>
         <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+        <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
         <script src='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/js/vip-size-template.js?v={{Msg "seo" "version"}}'></script>
         <script src='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/js/vip-coupon-template.js?v={{Msg "seo" "version"}}'></script>
         <script src='{{Msg "seo" "cdn"}}/common-module/coupon/js/pay-order-template.js?v={{Msg "seo" "version"}}'></script>
@@ -738,6 +760,11 @@
               el: '#goods-order-vue',
               data: function () {
                 return {
+                  sessKey: '$data-vipsubscribe_new_goods_order',
+                  dialog: {
+                    backTip: false,
+                    backTipShowCount: 0
+                  },
                   type: 'vip',
                   initPrice: 0, // 原价
                   realPrice: 0, // 实付价
@@ -761,8 +788,41 @@
               },
               mounted () {
                 this.init(this.$data)
+                this.restoreState()
+                this.addBackTip()
               },
               methods: {
+                toBuyAreaPack: function () {
+                  this.dialog.backTip = false
+                  this.saveState()
+                  location.href = '/areaPack/wx/page/buy'
+                },
+                restoreState: function () {
+                  var k = sessionStorage.getItem(this.sessKey)
+                  if (k) {
+                    Object.assign(this.dialog, JSON.parse(k))
+
+                    sessionStorage.removeItem(this.sessKey)
+                  }
+                  return !!k
+                },
+                saveState: function () {
+                  sessionStorage.setItem(this.sessKey, JSON.stringify(this.dialog))
+                },
+                addBackTip: function () {
+                  var _this = this
+                  var pushContent = {
+                    info: 'back',
+                    url: '#tip'
+                  }
+                  if (!history.state && this.dialog.backTipShowCount < 1) {
+                    history.pushState(pushContent, null, pushContent.url);
+                  }
+                  $(window).on('popstate', function () {
+                    _this.dialog.backTip = true
+                    _this.dialog.backTipShowCount++
+                  })
+                },
                 // 更新价格相关
                 updatePrice: function (before) {
                   console.log( '原价：' + before)