Merge branch 'orderbuoy' into 'master'

订单悬浮标

See merge request !7

package-lock.json

@@ -1128,14 +1128,14 @@
       "dev": true
     },
     "@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "http://npmprivate.quantgroups.com/@popperjs%2fcore/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
+      "version": "2.9.3",
+      "resolved": "http://npmprivate.quantgroups.com/@popperjs%2fcore/-/core-2.9.3.tgz",
+      "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ=="
     },
     "@qg/cherry-ui": {
-      "version": "2.21.9",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.9.tgz",
-      "integrity": "sha512-1I+BmuVl4fAcVfFXurxi/02GdEnP8zNpAx+Wgy8GkHtGLbd8yxJzqV5CaGkMR42r2iG5nio10NofM13/E+NEzQ==",
+      "version": "2.22.0",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.22.0.tgz",
+      "integrity": "sha512-v4hCYTiW/gPPaqvQ3JFSpgaS/BBOR/LQewLyAGv424UmiFi55Jc/W52rEgQdycVjEOdlVpRJnrWCSYcsEX1Ogw==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",
@@ -9019,9 +9019,9 @@
       }
     },
     "parse-headers": {
-      "version": "2.0.3",
-      "resolved": "http://npmprivate.quantgroups.com/parse-headers/-/parse-headers-2.0.3.tgz",
-      "integrity": "sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA=="
+      "version": "2.0.4",
+      "resolved": "http://npmprivate.quantgroups.com/parse-headers/-/parse-headers-2.0.4.tgz",
+      "integrity": "sha512-psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw=="
     },
     "parse-json": {
       "version": "5.0.0",

package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@better-scroll/core": "^2.0.0-beta.6",
-    "@qg/cherry-ui": "^2.21.9",
+    "@qg/cherry-ui": "^2.22.0",
     "@qg/js-bridge": "^1.1.9",
     "@qg/qg-scroll": "^1.4.2",
     "@qg/ui-request": "0.0.20",

src/service/cherryUI.service.js

@@ -33,7 +33,8 @@ import {
   AuthcodeField,
   CouponList,
   Swipe,
-  SwipeItem
+  SwipeItem,
+  BackTop
 } from '@qg/cherry-ui';
 import DialogFn from '@qg/cherry-ui/src/dialog/func';
 // import "@qg/cherry-ui/dist/cherry.css";
@@ -70,6 +71,7 @@ Vue.use(AuthcodeField);
 Vue.use(CouponList);
 Vue.use(Swipe);
 Vue.use(SwipeItem);
+Vue.use(BackTop);
 
 // const _proto = Vue.prototype;
 // const proto = Object.create(_proto);

src/views/orderDetail/index.vue

@@ -190,7 +190,7 @@ export default {
     },
     contractCS() {
       window.location.href =
-        'https://www.sobot.com/chat/h5/v2/index.html?sysnum=84ed0ad93caa47b0a9d1600824546b35&source=2';
+        'https://kdspstatic.91xr.cn/kdsp/mine/service/customer-service/customer-service-prod2.html';
     },
     openCancelPopup() {
       this.$dialog({

src/views/orderList/components/List.vue

@@ -129,7 +129,7 @@ export default {
           buttons_name: '返回充值中心'
         },
         () => {
-          this.$router.replace({ path: '/home' });
+          this.$router.replace({ path: '/vipLife' });
         }
       );
     }

src/views/pay/index.vue

@@ -103,7 +103,6 @@ import { goUrlExtends } from './extends';
 import cookies from '@/service/cookieStorage.service';
 import {
   codeArr,
-  payTypeE,
   CREDIT_PAY,
   PAY_SUCCESS,
   creditStatus,

src/views/vipLife/index.vue

@@ -30,6 +30,11 @@
         立即充值
       </cr-button>
     </div>
+    <cr-back-top
+      :list="[{ icon: 'orders-o', txt: '订单' }]"
+      :show-back-top="false"
+      @click="goOrderList"
+    />
     <!-- v-show="!hideFixedBottom" -->
   </div>
 </template>
@@ -44,6 +49,7 @@ import AccountInput from './components/AccountInput.vue';
 import { throttle } from '@/service/utils.service';
 import { isPhone } from '@/service/validation.service';
 import { ITEM_WIDTH } from './components/constant';
+import localStorage from '@/service/localStorage.service';
 export default {
   name: 'VipLife',
   components: {
@@ -137,6 +143,7 @@ export default {
       const [res] = await rechargeApi.getSpuList();
       if (res) {
         this.account = res?.userPhoneInfo?.phoneNo;
+        localStorage.set('phoneNo', this.account);
         this.spuData = res.vipLife;
         this.updateSpuInfo(this.spuData[this.currentTab - 1].itemList[0]);
         this.getSkuListDebounce();
@@ -190,7 +197,12 @@ export default {
         return;
       }
       res?.orderNo && this.$router.push({ path: '/pay', query: { orderNo: res.orderNo } });
-    }, 1000)
+    }, 1000),
+    goOrderList() {
+      this.$track.registeredEvents('h5_OtherRechargePageOrderSuspendedBtnClick', {}, () => {
+        this.$router.push({ name: 'orderList' });
+      });
+    }
   }
 };
 </script>