电子卡券支付成功原生页

config/dev.env.js

@@ -18,6 +18,7 @@ module.exports = merge(prodEnv, {//zjgyl
   // BASE_URL:"'http://172.16.1.18:3000'",
   BASE_URL:"'https://test-m-shop.mayi888.cn'",
   ADMIN_URL:"'https://test-ant.mayi888.cn'",
+  GUIDE_URL:"'https://guide-m.mayi888.cn'",
   // BASE_URL:"'http://192.168.137.1:3004'",
 
   OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"',

config/prod.env.js

@@ -3,6 +3,7 @@ module.exports = {
   SHOP_MIXID:"'ant'",
   NODE_ENV: '"production"',
   BASE_URL:"'https://shop.mayi888.com'",
+  GUIDE_URL:"'https://m-guide.mayi888.com'",
   ADMIN_URL:"'https://admin.mayi888.com'",
   
   OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',

src/api/order.js

@@ -12,5 +12,9 @@ export default {
     // 查询订单详情
     orderDetail(data) {
       return requestPOST(`${process.env.OLSHOP_URL}/order/detail?orderSn=${data.orderSn}`)
-  },
+    },
+    //获取电子卡券订单卡券
+    getElectronicCardRedeemCode(data){
+      return requestGET(`${process.env.OLSHOP_URL}/order/getElectronicCardRedeemCode?orderSn=${data}`)
+    }
  }

src/pages/paySuccess/index.vue

 <template>
   <!-- 支付成功页 -->
-  <div class="paySuccess" v-show="showPage">
+  <div class="paySuccess" v-if="showPage" :style="{'--main-color':themeColor['--main-color'],'--minor-color':themeColor['--minor-color']}">
     <ThemeDataPlant :pageCode="11"></ThemeDataPlant>
-    <div style="margin-top: 60px;"></div>
-    <div v-for="(item, index) in pageData" :key="index">
-      <!-- 其他组件 -->
-      <div
-        v-if="item.componentCode == 'text-text' && item.componentInfo.visible == 1"
-      >
-        <text-text :datas="item"></text-text>
+    <PayElectronCard v-if="orderDetail.orderType==15" :orderDetail="orderDetail"></PayElectronCard>
+    <div v-else>
+      <div style="margin-top: 60px;"></div>
+      <div v-for="(item, index) in pageData" :key="index">
+        <!-- 其他组件 -->
+        <div
+          v-if="item.componentCode == 'text-text' && item.componentInfo.visible == 1"
+        >
+          <text-text :datas="item"></text-text>
+        </div>
+        <div
+          v-if="item.componentCode == 'rich-text' && item.componentInfo.visible == 1"
+        >
+          <rich-text :datas="item"></rich-text>
+        </div>
+        <div
+          v-if="item.componentCode == 'photo-gallery' &&item.componentInfo.visible == 1"
+        >
+          <photo-gallery :datas="item"></photo-gallery>
+        </div>
+        <div
+          v-if="item.componentCode == 'interval' && item.componentInfo.visible == 1"
+        >
+          <interval :datas="item"></interval>
+        </div>
+        <div
+          v-if="item.componentCode == 'partition' && item.componentInfo.visible == 1"
+        >
+          <partition :datas="item"></partition>
+        </div>
+        <div
+          v-if="item.componentCode == 'notice' && item.componentInfo.visible == 1"
+        >
+          <notice :datas="item"></notice>
+        </div>
+        <pay-success-info
+          v-if="item.componentCode=='pay-success-info'  && item.componentInfo.visible==1"
+          :render="true"
+          :datas="item"
+          :giftsKey="giftsKey"
+          :routeQuery="routeQuery"
+          :orderDetail="orderDetail"
+          :totalMoney="totalMoney"
+        />
       </div>
-      <div
-        v-if="item.componentCode == 'rich-text' && item.componentInfo.visible == 1"
-      >
-        <rich-text :datas="item"></rich-text>
-      </div>
-      <div
-        v-if="item.componentCode == 'photo-gallery' &&item.componentInfo.visible == 1"
-      >
-        <photo-gallery :datas="item"></photo-gallery>
-      </div>
-      <div
-        v-if="item.componentCode == 'interval' && item.componentInfo.visible == 1"
-      >
-        <interval :datas="item"></interval>
-      </div>
-      <div
-        v-if="item.componentCode == 'partition' && item.componentInfo.visible == 1"
-      >
-        <partition :datas="item"></partition>
-      </div>
-      <div
-        v-if="item.componentCode == 'notice' && item.componentInfo.visible == 1"
-      >
-        <notice :datas="item"></notice>
-      </div>
-      <pay-success-info
-        v-if="item.componentCode=='pay-success-info'  && item.componentInfo.visible==1"
-        :render="true"
-        :datas="item"
-        :giftsKey="giftsKey"
-        :routeQuery="routeQuery"
-        :orderDetail="orderDetail"
-        :totalMoney="totalMoney"
-      />
     </div>
     <!-- 分销员弹框入口 -->
     <van-popup
@@ -76,9 +79,10 @@ import order from "@/api/order";
 import spokesman from "@/api/spokesman";
 import { getMiniProgram, query_isEntry } from "@/utils/mayi_fenxiao";
 import { serialize } from "@/utils/index";
-import { checkTabbarPage, checkShowConditionIds } from "@/utils/mayi";
+import { checkTabbarPage, checkShowConditionIds, themeColor } from "@/utils/mayi";
 import ThemeDataPlant from "../../components/ThemeDataPlant";
 import paySuccessInfo from "../../components/paySuccess/paySuccessInfo";
+import PayElectronCard from "../../components/paySuccess/PayElectronCard";
 import text from "@/components/content/text";
 import richText from "../../components/basicTool/rich-text";
 import interval from "@/components/basicTool/interval/index.vue";
@@ -112,6 +116,12 @@ export default {
       pageInfo: {},
       pageData: {},
       showPage: false,
+      systemInfo : {},
+      tabbarHeight : 0,
+      themeColor:{
+        '--main-color':"",
+        '--minor-color':"",
+      },
     };
   },
   components: {
@@ -121,6 +131,7 @@ export default {
     interval,
     partition,
     paySuccessInfo,
+    PayElectronCard
   },
   computed: {},
   onLoad(options) {
@@ -142,6 +153,19 @@ export default {
         that.init(params);
       };
     }
+    this.systemInfo = wx.getSystemInfoSync()
+    console.log(this.systemInfo,'-----------systemInfo')
+    let menuButtonInfo = wx.getMenuButtonBoundingClientRect()
+    console.log(menuButtonInfo,'menuButtonInfo')
+    this.tabbarHeight = (menuButtonInfo.top - this.systemInfo.statusBarHeight) * 2 + menuButtonInfo.height + this.systemInfo.statusBarHeight
+    console.log(this.tabbarHeight,'-----------tabbarHeight')
+    if(themeColor['--main-color']!='#ffffff'){
+      this.themeColor = themeColor
+    }else {
+      this.mpApp.themeColorCallBack=(res)=>{
+        this.themeColor = res
+      }
+    }
   },
   onShow() {
     console.log("--paySuccess-onShow");
@@ -161,6 +185,7 @@ export default {
             this.title = "拼团详情"
           }else {
             this.title = "支付成功"
+            this.showPage = true;
           }
           this.splitStatus=res.data.splitStatus;
           this.orderId = res.data.orderId;
@@ -169,7 +194,6 @@ export default {
             this.goodsId =
               res.data.noShipmentOrderItems[0].terminalProductGoodsId;
           }
-          this.showPage = true;
 
           //查询是否是分销员
           getMiniProgram().then(res1 => {
@@ -443,6 +467,25 @@ export default {
 
 <style lang="scss" scoped>
 .paySuccess {
+  position: relative;
+  width: 100vw;
+  height: 100vh;
+  overflow-y: auto;
+  .tabbar{
+    position: sticky;
+    top: 0;
+    z-index: 9999;
+    width: 100%;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    padding-left: 12px;
+    .tab-back{
+      /deep/.van-icon-arrow-left{
+        font-size: 22px;
+      }
+    }
+  }
 }
 .spokemanEntry {
   /deep/.van-popup{