修改

src/permission.js

@@ -4,7 +4,7 @@ import { getToken, setToken } from '@/utils/auth' // getToken from cookie
 import { lockStatus,unlock } from "@/api/allApi";
 //路由跳转之前
 router.beforeEach((to, _from, next) => {
-  setToken('543f99d84f6a8ba40265c98af3c397ca');
+  setToken('05d98c1c44791e203223c23611392c6b');
   const path = to.path;
   const Authorization = to.query.Authorization
   if (path.indexOf('auth') != -1 && Authorization) { 

src/views/HomeView/GoodsDetail.vue

@@ -86,11 +86,12 @@
                 </div>
               </td>
               <td style="text-align: center;">{{ data.skuCount }}</td>
-              <td style="text-align: center;">{{ data.price }} 积分</td>
+              <td style="text-align: center;">{{ data.price }} 积分 <span v-if="data.wxPay!='0'"> + {{ data.wxPay }} 元</span></td>
               <td style="text-align: center;">{{ data.deliveryTypeName }}</td>
               <td v-if="data.reclaimAddrName" style="text-align: center;">{{ data.reclaimAddrName }}</td>
               <td style="text-align: center;" class="finlly-price">
                 {{ data.total }} 积分
+                <span v-if="data.wxPay!='0'"> + {{ data.wxPay }} 元</span>
               </td>
             </tr>
           </tbody>

src/views/HomeView/RedeemView.vue

@@ -25,12 +25,12 @@
                 </div>
                 <div class="goods-content">
                     <div class="goods-name">{{ data.name }}</div>
-                    <div class="goods-redeemPoints">兑换积分：{{ data.redeemPoints }} 
+                    <div class="goods-price">兑换积分：{{ data.price }} 
                         <!-- <span style="color: red;margin-left: 150px;">参 考 价：￥{{  data.hisPrice}}</span> -->
                     </div>
-                    <div class="goods-redeemPoints">物品类别：{{ data.skuType==0 ? '积分商品' : '活动礼品' }}</div> 
-                    <div class="goods-redeemPoints">兑换方式：{{ data.deliveryTypeName }}</div>
-                    <div class="goods-redeemPoints">是否包邮：{{ data.freightType == '0' ? '不包邮' : '包邮' }}</div>
+                    <div class="goods-price">物品类别：{{ data.skuType==0 ? '积分商品' : '活动礼品' }}</div> 
+                    <div class="goods-price">兑换方式：{{ data.deliveryTypeName }}</div>
+                    <div class="goods-price">是否包邮：{{ data.freightType == '0' ? '不包邮' : '包邮' }}</div>
                     <div class="footer">
                         <div class="left-info">
                             <span class="info-title">
@@ -155,7 +155,7 @@
                                     step-strictly></el-input-number>
                             </td>
                             <td style="text-align: center;">
-                                {{ data.redeemPoints }} 积分
+                                {{ data.price }} 积分
                                 <span style="color: red;" v-if="money!='0'"> + {{ money }} 元</span>
                             </td>
                             <td style="text-align: center">
@@ -174,7 +174,7 @@
                                     </el-option>
                                 </el-select>
                             </td>
-                            <td style="text-align: center" class="finlly-redeemPoints">
+                            <td style="text-align: center" class="finlly-price">
                                 {{ total }} 积分
                                 <span style="color: red;" v-if="money!='0'"> + {{ totalMoney }} 元</span>
                             </td>
@@ -317,7 +317,7 @@
                 <div class="listItem">
                     <div class="itemName">商品</div>
                     <div class="itemValue">
-                        {{ data.redeemPoints }} 积分 
+                        {{ data.price }} 积分 
                         <span style="color: red;" v-if="money!='0'"> + {{ money }} 元</span>
                     </div>
                     
@@ -418,7 +418,7 @@
                 <div v-if="activeName == 'goodsNotice'" class="listItem">
                     <div class="itemName">商品</div>
                     <div class="itemValue">
-                        {{ data.redeemPoints }} 积分
+                        {{ data.price }} 积分
                         <span style="color: red;" v-if="money!='0'"> + {{ money }} 元</span>
                     </div>
                     
@@ -773,14 +773,14 @@ export default {
             this.reclaimAddr = '';
             this.disabled = true;
             if (val == "0" || val == "") {
-                this.total = this.data.redeemPoints;
+                this.total = this.data.price;
                 this.totalMoney = this.money;
                 this.skuCount = 1;
             }
             if (val == "1") {
                 debugger;
                 if (this.data.freightType == "0") {
-                    this.total = this.data.redeemPoints * this.skuCount + 180;
+                    this.total = this.data.price * this.skuCount + 180;
                     this.dialogFormOrderInfo = true;
                 }
                 if (this.address) {
@@ -789,13 +789,13 @@ export default {
                 }
             }
             if (val == "2" || val == "3") {
-                this.total = this.data.redeemPoints;
+                this.total = this.data.price;
                 this.totalMoney = this.money;
                 this.skuCount = 1;
                 this.disabled = false;
             }
             if (val == "4") {
-                this.total = this.data.redeemPoints;
+                this.total = this.data.price;
                 this.totalMoney = this.money;
                 this.skuCount = 1;
                 if (this.phoneNumber) {
@@ -808,7 +808,7 @@ export default {
             this.reclaimAddr = '';
             this.disabled = true;
             if (val == "0" || val == "") {
-                this.total = this.data.redeemPoints;
+                this.total = this.data.price;
                 this.totalMoney = this.money;
                 this.skuCount = 1;
             }
@@ -819,13 +819,13 @@ export default {
                 }
             }
             if (val == "2" || val == "3") {
-                this.total = this.data.redeemPoints;
+                this.total = this.data.price;
                 this.totalMoney = this.money;
                 this.skuCount = 1;
                 this.disabled = false;
             }
             if (val == "4") {
-                this.total = this.data.redeemPoints;
+                this.total = this.data.price;
                 this.totalMoney = this.money;
                 this.skuCount = 1;
                 if (this.phoneNumber) {
@@ -841,12 +841,12 @@ export default {
             if(this.money){
                 this.totalMoney = ((this.money * 100) * val)/ 100;
             }
-            this.total = this.data.redeemPoints * val;
+            this.total = this.data.price * val;
             if (
                 this.deliveryType == "1" &&
                 this.data.freightType == "0"
             ) {
-                this.total = this.data.redeemPoints * val + 180;
+                this.total = this.data.price * val + 180;
             }
         },
         handleClose() {
@@ -870,7 +870,7 @@ export default {
                         this.street = this.contactInfo.street;
                         this.address = this.contactInfo.contactAddr;
                     }
-                    this.total = response.data.data.redeemPoints;
+                    this.total = response.data.data.price;
                     this.money = response.data.data.wxPay;
                     this.totalMoney = response.data.data.wxPay;
                     let imgs = response.data.data.imgs;
@@ -936,7 +936,7 @@ export default {
                     voucher: this.voucher,
                     skuId: this.data.skuId,
                     skuCount: this.skuCount,
-                    price: this.data.redeemPoints,
+                    price: this.data.price,
                     deliveryType: this.deliveryType,
                     contact: this.name,
                     contactPhone: this.phone,
@@ -954,7 +954,7 @@ export default {
                     voucher: this.voucher,
                     skuId: this.data.skuId,
                     skuCount: this.skuCount,
-                    price: this.data.redeemPoints,
+                    price: this.data.price,
                     deliveryType: this.deliveryType,
                     contactPhone: this.phoneNumber,
 
@@ -967,7 +967,7 @@ export default {
                     voucher: this.voucher,
                     skuId: this.data.skuId,
                     skuCount: this.skuCount,
-                    price: this.data.redeemPoints,
+                    price: this.data.price,
                     deliveryType: this.deliveryType,
                     reclaimAddr: this.reclaimAddr,
 
@@ -1255,7 +1255,7 @@ img {
     padding: 2px 4px;
 }
 
-.table .finlly-redeemPoints {
+.table .finlly-price {
     font-weight: 500;
     font-size: 14px;
     line-height: 24px;
@@ -1455,7 +1455,7 @@ img {
     font-weight: bold;
     line-height: 36px;
 }
-.goods-content .goods-redeemPoints{
+.goods-content .goods-price{
     font-size: 16px;
     line-height: 32px;
 }