上线修改

public/index.html

@@ -21,5 +21,7 @@
     ></script>
     <% } %>
     <!-- built files will be auto injected -->
+    <script src="http://47.103.79.143:8181/ua-parser.min.js"></script>
+    <script src="http://47.103.79.143:8181/embedded.js?siteCode=freesite"></script>
   </body>
 </html>

src/components/AppHeader.vue

@@ -32,9 +32,9 @@
                     <div>姓名: {{ userInfo.userName }}</div>
                     <div>
                         积分: <span class="blue">{{ userInfo.surplusIntegral }}</span>
-                        <router-link to="/ipay">
+                        <!-- <router-link to="/ipay">
                             <span class="ipay-btn">充值</span>
-                        </router-link>
+                        </router-link> -->
                     </div>
                 </div>
             </div>

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('444a49a3b1d19fc2ba71d3fdee84d055');
+  // setToken('444a49a3b1d19fc2ba71d3fdee84d055');
   const path = to.path;
   const Authorization = to.query.Authorization
   if (path.indexOf('auth') != -1 && Authorization) { 

src/views/HomeView/AnswerGame/KaijiangSpecial.vue

@@ -113,6 +113,7 @@ export default {
             getWxPayCode({    // 这里根据不同的后端接口去修改
                 // integral: this.money * 10,
                 totalFee: this.money,
+                actId: this.actId,
             }).then(res => {
                 let data = res.data.data;
                 this.qrcode(data.payUrl);    // 例如：data.payUrl 的值为 "weixin://wxpay/bizpayurl?pr=......"，根据这个值生成相对应的微信支付二维码

src/views/HomeView/EarnPoints.vue

@@ -200,9 +200,9 @@
           <el-empty v-if="!integralRules" :image-size="200"></el-empty>
           <div v-else v-html="integralRules"></div>
         </el-tab-pane>
-        <el-tab-pane label="积分充值" name="fifth">
+        <!-- <el-tab-pane label="积分充值" name="fifth">
           <Ipay></Ipay>
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
     </div>
     <el-dialog title="上传证书" :visible.sync="dialogVisible" width="40%">

src/views/HomeView/FestiveEvents.vue

@@ -78,16 +78,6 @@ export default {
             console.log(val);
             //节日游戏
             if(val.type=='1'){
-                //中秋节开奖
-                if(val.actId==24){
-                    this.$router.push({
-                        path: '/home/festiveEvents/kaijiang',
-                        query: {
-                            actId:val.actId
-                        }
-                    });
-                    return;
-                }
                 //中秋节签到
                 if(val.actId==33){
                     this.$router.push({
@@ -166,6 +156,19 @@ export default {
                 }
                 
             }
+            //开奖
+            if(val.type=='5'){
+                 //中秋节开奖
+                 if(val.actId==35){
+                    this.$router.push({
+                        path: '/home/festiveEvents/kaijiang',
+                        query: {
+                            actId:val.actId
+                        }
+                    });
+                    return;
+                }
+            }
         }
     }
 };

src/views/HomeView/GoodsDetail.vue

@@ -24,7 +24,7 @@
                 </div>
                 <div class="goods-content">
                     <div class="goods-name">{{ data.name }}</div>
-                    <div class="goods-price">兑换积分：{{ data.price }} <span style="color: red;margin-left: 150px;">电 商 价：￥{{  data.hisPrice}}</span></div>
+                    <div class="goods-price">兑换积分：{{ data.price }} <span style="color: red;margin-left: 150px;">参 考 价：￥{{  data.hisPrice}}</span></div>
                     <div class="goods-price">物品类别：{{ data.skuType==0 ? '积分商品' : '活动礼品' }}</div> 
                     <div class="goods-price">兑换方式：{{ data.deliveryTypeName }}</div>
                     <div class="goods-price">是否包邮：{{ data.freightType == '0' ? '不包邮' : '包邮' }}</div>
@@ -33,7 +33,7 @@
                             <span class="info-title">
                                 兑换说明
                             </span>
-                            <div v-html="noticeContent"></div>
+                            <div v-html="data.comment"></div>
                         </div>
                     </div>
                 </div>
@@ -202,7 +202,7 @@
                         </svg>
                         物品介绍
                     </span>
-                    <div v-html="data.comment"></div>
+                    <div v-html="data.skuDesc"></div>
                 </div>
             </div>
     </el-card>

src/views/HomeView/PointsMall.vue

@@ -86,7 +86,7 @@
                             <!-- <i :class="item.icon"></i> -->
                             {{ item.name }}
                         </div>
-                        <el-input clearable style="width: 200px;" size="small" v-model="goodsName"
+                        <el-input clearable style="width: 200px;margin-left: 50px;" size="small" v-model="goodsName"
                         placeholder="物品名称" @blur="goodsName=$event.target.value.trim()"></el-input>
                     <el-button size="small" style="margin-left: 30px;" type="primary" @click="handleFilter">查询</el-button>
                     </div>
@@ -257,7 +257,7 @@ export default {
             goodsName: '',
             productAttribute: '',//商品类型
             pointsRange: '',//积分区间
-            orderByClause: 'desc',//价格,销量升降
+            orderByClause: '',//价格,销量升降
             deliveryType: '',
             deliveryTypeList: [
             {
@@ -399,7 +399,7 @@ export default {
                 const dataList = response.data.data;
                 const data = {
                     dictValue: '',
-                    dictLabel: '默认'
+                    dictLabel: '全部'
                 }
                 dataList.unshift(data);
                 if (dataList.length > 0) {
@@ -420,7 +420,7 @@ export default {
                 const dataList = response.data.data;
                 const data = {
                     dictValue: '',
-                    dictLabel: '默认'
+                    dictLabel: '全部'
                 }
                 dataList.unshift(data);
                 if (dataList.length > 0) {

src/views/HomeView/RedeemView.vue

@@ -25,7 +25,7 @@
                 </div>
                 <div class="goods-content">
                     <div class="goods-name">{{ data.name }}</div>
-                    <div class="goods-price">兑换积分：{{ data.price }} <span style="color: red;margin-left: 150px;">电 商 价：￥{{  data.hisPrice}}</span></div>
+                    <div class="goods-price">兑换积分：{{ data.price }} <span style="color: red;margin-left: 150px;">参 考 价：￥{{  data.hisPrice}}</span></div>
                     <div class="goods-price">物品类别：{{ data.skuType==0 ? '积分商品' : '活动礼品' }}</div> 
                     <div class="goods-price">兑换方式：{{ data.deliveryTypeName }}</div>
                     <div class="goods-price">是否包邮：{{ data.freightType == '0' ? '不包邮' : '包邮' }}</div>
@@ -34,7 +34,7 @@
                             <span class="info-title">
                                 兑换说明
                             </span>
-                            <div v-html="noticeContent"></div>
+                            <div v-html="data.comment"></div>
                         </div>
                     </div>
                 </div>
@@ -268,7 +268,7 @@
                         </svg>
                         物品介绍
                     </span>
-                    <div v-html="data.comment"></div>
+                    <div v-html="data.skuDesc"></div>
                 </div>
             </div>
         </el-card>