Payment flow refine

rc-busness/pages/personal/settlement.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="settlement">
     <Myheader></Myheader>
-    <div class="rc-main">
-      <tabs></tabs>
-    </div>
+	<div class="rc-top"></div>
     <div class="rc_contline"></div>
     <div class="rc-main">
       <div class="address-list">
@@ -28,7 +26,7 @@
             <span>{{ item.address }}</span>
           </div>
         </div>
-        <div class="mypersonal add">
+        <div class="mypersonal add" :class="useraddress.length>0?'':'show'">
           <div
             class="my-delivery"
             @click="addAddress"
@@ -67,10 +65,12 @@
             <span>配送方式:</span>
             <i>{{ shopprice.price }}</i>
           </li>
+		  <!--
           <li>
             <span> 活动促销:</span>
             <i>{{ shopprice.distribution }}</i>
           </li>
+		  -->
           <li>
             <span>商品总价:</span>
             <i class="red">{{ sumPrice }}</i>
@@ -162,6 +162,14 @@ export default {
   meta: { title: "订单结算" },
   data() {
     return {
+	  crumbs:[
+		  {
+		  	path:'/productdetails/productlist/',
+		  },
+		  {
+			path:'/personal/settlement'
+		  }
+	  ],
       goldmedal: [],
       dialogAddTitle: "",
       addressstype: null,
@@ -276,7 +284,9 @@ export default {
       let orderAddress = this.useraddress.filter((item) => item.isDefault);
       let postData = [];
       this.goldmedal.forEach((item) => {
+		  let basePoint = (item.basePoint?item.basePoint:0);
         let oneProduct = {
+		  basePoint:basePoint,
           productName: item.productName,
           buyCount: item.buyCount,
           productId: item.productCode,
@@ -354,7 +364,7 @@ export default {
             postData[0].orderAddress.addressPhoneNumber,
           // wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz",
           // wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz",
-          wxPay: res.data,
+          wxPay: res.msg,
         };
         this.$router.push({
           path: "/personal/userpay",