feat(vipCenter): 用户中心主题样式样式修改

src/components/fistAddPv.vue

@@ -6,13 +6,12 @@
 -->
 <template>
   <div>
-    <div id="firstPv"
+    <div id="firstPv" style="width: 700px; height: 400px"></div>
-         style="width: 700px; height: 400px"></div>
   </div>
 </template>
 
 <script>
-import * as api from '@/api/activity.js'
+import * as api from "@/api/activity.js";
 export default {
   // mounted() {
   //   this.upDateCover()
@@ -21,31 +20,31 @@ export default {
     upDateCover() {
       api.achieveDay().then((res) => {
         let arr1 = res.data.map((item) => {
-          return item.settleDate
+          return item.settleDate;
-        })
+        });
         let arr2 = res.data.map((item) => {
-          return item.aNewPv
+          return item.aNewPv;
-        })
+        });
         let arr3 = res.data.map((item) => {
-          return item.bNewPv
+          return item.bNewPv;
-        })
+        });
-        this.drawChart(arr1, arr2, arr3)
+        this.drawChart(arr1, arr2, arr3);
-      })
+      });
     },
     drawChart(arr1, arr2, arr3) {
-      let myChart = this.$echarts.init(document.getElementById('firstPv'))
+      let myChart = this.$echarts.init(document.getElementById("firstPv"));
       // 指定图表的配置项和数据
       let option = {
         title: {
-          text: '',
+          text: "",
-          subtext: '业绩(万)',
+          subtext: "业绩",
         },
         tooltip: {
-          trigger: 'axis',
+          trigger: "axis",
         },
         legend: {
-          top: 'bottom',
+          top: "bottom",
-          data: ['左区', '右区'],
+          data: ["左区", "右区"],
           itemWidth: 20, // 长方形宽度
           itemHeight: 10, // 长方形高度
         },
@@ -55,9 +54,9 @@ export default {
             interval: 0,
             // rotate: 45,
             textStyle: {
-              color: '#000',
+              color: "#000",
-              fontSize: '10',
+              fontSize: "10",
-              itemSize: '',
+              itemSize: "",
             },
           },
           axisTick: {
@@ -68,19 +67,19 @@ export default {
           splitLine: {
             show: true,
             lineStyle: {
-              type: 'dashed',
+              type: "dashed",
             },
           },
         },
         series: [
           {
-            name: '左区',
+            name: "左区",
-            type: 'line',
+            type: "line",
             data: arr2,
-            symbol: 'none',
+            symbol: "none",
             itemStyle: {
               normal: {
-                color: '#5A64FF',
+                color: "#5A64FF",
               },
             },
             lineStyle: {
@@ -90,13 +89,13 @@ export default {
             },
           },
           {
-            name: '右区',
+            name: "右区",
-            type: 'line',
+            type: "line",
             data: arr3,
-            symbol: 'none',
+            symbol: "none",
             itemStyle: {
               normal: {
-                color: '#01C4FF',
+                color: "#01C4FF",
               },
             },
             lineStyle: {
@@ -106,13 +105,12 @@ export default {
             },
           },
         ],
-      }
+      };
       // 使用刚指定的配置项和数据显示图表。
-      myChart.setOption(option)
+      myChart.setOption(option);
     },
   },
-}
+};
 </script>
 
-<style>
+<style></style>
-</style>

src/components/honoraryAward.vue

@@ -81,8 +81,7 @@
             </div>
           </div>
           <div class="money">
-            {{ "左区" }}：{{ dataList.memberAwardsUnderVO.aSumRealPv
+            {{ "左区" }}：{{ dataList.memberAwardsUnderVO.aSumRealPv }}
-            }}{{ "万" }}
           </div>
         </div>
         <div class="max-right">
@@ -144,8 +143,7 @@
             </div>
           </div>
           <div class="money">
-            {{ "右区" }}：{{ dataList.memberAwardsUnderVO.bSumRealPv
+            {{ "右区" }}：{{ dataList.memberAwardsUnderVO.bSumRealPv }}
-            }}{{ "万" }}
           </div>
         </div>
       </div>

src/components/marketDynamics/consanguinityPv.vue

@@ -1,32 +1,32 @@
 <template>
   <div class="yjfb">
-    <div class="qiu1" style="cursor: pointer;" @click="goDetail(1,1)">
+    <div class="qiu1" style="cursor: pointer" @click="goDetail(1, 1)">
       <div class="num">{{ achieveData.leftCoun || 0 }}</div>
-      <div class="btom">{{ '左区人数' }}</div>
+      <div class="btom">{{ "左区人数" }}</div>
     </div>
-    <div class="qiu2" style="cursor: pointer;" @click="goDetail(1,2)">
+    <div class="qiu2" style="cursor: pointer" @click="goDetail(1, 2)">
       <div class="num">{{ achieveData.leftAchieve || 0 }}</div>
-      <div class="btom">{{ '左区业绩（万）' }}</div>
+      <div class="btom">{{ "左区业绩" }}</div>
     </div>
-    <div class="qiu4" style="cursor: pointer;" @click="goDetail(1,3)">
+    <div class="qiu4" style="cursor: pointer" @click="goDetail(1, 3)">
       <div class="num">{{ achieveData.leftDirectAchieve || 0 }}</div>
-      <div class="btom">{{'左区'}}{{'血缘业绩（万）'}}</div>
+      <div class="btom">{{ "左区" }}{{ "血缘业绩" }}</div>
     </div>
-    <div class="qiu3" style="cursor: pointer;" @click="goDetail(3,4)">
+    <div class="qiu3" style="cursor: pointer" @click="goDetail(3, 4)">
       <div class="num">{{ achieveData.directAchieve || 0 }}</div>
-      <div class="btom">{{ '血缘业绩（万）' }}</div>
+      <div class="btom">{{ "血缘业绩" }}</div>
     </div>
-    <div class="qiu4" style="cursor: pointer;" @click="goDetail(2,3)">
+    <div class="qiu4" style="cursor: pointer" @click="goDetail(2, 3)">
       <div class="num">{{ achieveData.rightDirectAchieve || 0 }}</div>
-      <div class="btom">{{'右区'}}{{'血缘业绩（万）'}}</div>
+      <div class="btom">{{ "右区" }}{{ "血缘业绩" }}</div>
     </div>
-    <div class="qiu2" style="cursor: pointer;" @click="goDetail(2,2)">
+    <div class="qiu2" style="cursor: pointer" @click="goDetail(2, 2)">
       <div class="num">{{ achieveData.rightAchieve || 0 }}</div>
-      <div class="btom">{{ '右区业绩（万）' }}</div>
+      <div class="btom">{{ "右区业绩" }}</div>
     </div>
-    <div class="qiu1" style="cursor: pointer;" @click="goDetail(2,1)">
+    <div class="qiu1" style="cursor: pointer" @click="goDetail(2, 1)">
       <div class="num">{{ achieveData.rightCount || 0 }}</div>
-      <div class="btom">{{ '右区人数' }}</div>
+      <div class="btom">{{ "右区人数" }}</div>
     </div>
   </div>
 </template>
@@ -47,7 +47,7 @@ export default {
     // },
     achieveData: {
       type: Object,
-    }
+    },
   },
   mounted() {
     // this.getFgDataList()
@@ -115,7 +115,8 @@ export default {
     width: 253px;
     height: 253px;
     margin: 0 8px;
-    background: linear-gradient(208deg, #667AFF 0%, #6B7CEA 100%);    display: flex;
+    background: linear-gradient(208deg, #667aff 0%, #6b7cea 100%);
+    display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
@@ -126,7 +127,8 @@ export default {
     border-radius: 50%;
     margin: 0 10px;
     margin-top: 8px;
-    background: linear-gradient(153deg, #65FF61 0%, #48FF2A 100%);    display: flex;
+    background: linear-gradient(153deg, #65ff61 0%, #48ff2a 100%);
+    display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;

src/components/marketDynamics/recommendedCommunity.vue

@@ -22,13 +22,13 @@
         {
           value: 0,
           age: 0,
-            name: '大区',
+          name: "大区",
           itemStyle: { color: "#2982ff" },
         },
         {
           value: 0,
           age: 0,
-            name: '小区',
+          name: "小区",
           itemStyle: { color: "#01c291" },
         },
       ],
@@ -58,7 +58,7 @@
     },
     ageChart(datas) {
       var myChart = echarts.init(document.getElementById("main3"));
-        let that = this
+      let that = this;
       var option = {
         legend: {
           // 图例
@@ -83,8 +83,7 @@
                   "人" +
                   "\n " +
                   "业绩：" +
-                    data.data.value +
+                  data.data.value
-                    that.$t('S_C_58')
                 );
               },
               lineHeight: 25, // 行高

src/components/mounthPvCompare.vue

@@ -6,15 +6,12 @@
 -->
 <template>
   <div>
-    <div id="mounthData"
+    <div id="mounthData" style="width: 700px; height: 400px"></div>
-         style="width: 700px; height: 400px">
-
-    </div>
   </div>
 </template>
 
 <script>
-import * as api from '@/api/activity.js'
+import * as api from "@/api/activity.js";
 export default {
   props: {
     time: {
@@ -35,31 +32,31 @@ export default {
         })
         .then((res) => {
           let arr1 = res.data.map((item) => {
-            return item.date
+            return item.date;
-          })
+          });
           let arr2 = res.data.map((item) => {
-            return item.aNewPv
+            return item.aNewPv;
-          })
+          });
           let arr3 = res.data.map((item) => {
-            return item.bNewPv
+            return item.bNewPv;
-          })
+          });
-          this.drawChart(arr1, arr2, arr3)
+          this.drawChart(arr1, arr2, arr3);
-        })
+        });
     },
     drawChart(arr1, arr2, arr3) {
       // 基于准备好的dom，初始化echarts实例  这个和上面的main对应
-      let myChart = this.$echarts.init(document.getElementById('mounthData'))
+      let myChart = this.$echarts.init(document.getElementById("mounthData"));
       // 指定图表的配置项和数据
       let option = {
         title: {
-          text: '',
+          text: "",
-          subtext: '业绩(万)',
+          subtext: "业绩",
         },
         tooltip: {},
         legend: {
-          top: 'bottom',
+          top: "bottom",
-          bottom: '5%',
+          bottom: "5%",
-          data: ['左区', '右区'],
+          data: ["左区", "右区"],
         },
         xAxis: {
           data: arr1,
@@ -71,41 +68,40 @@ export default {
           splitLine: {
             show: true,
             lineStyle: {
-              type: 'dashed',
+              type: "dashed",
             },
           },
         },
         series: [
           {
-            name: '左区',
+            name: "左区",
-            type: 'bar',
+            type: "bar",
             data: arr2,
             itemStyle: {
               normal: {
                 barBorderRadius: [10, 10, 0, 0],
-                color: '#FE4C4B',
+                color: "#FE4C4B",
               },
             },
           },
           {
-            name: '右区',
+            name: "右区",
-            type: 'bar',
+            type: "bar",
             data: arr3,
             itemStyle: {
               normal: {
                 barBorderRadius: [10, 10, 0, 0],
-                color: '#FFAE36',
+                color: "#FFAE36",
               },
             },
           },
         ],
-      }
+      };
       // 使用刚指定的配置项和数据显示图表。
-      myChart.setOption(option)
+      myChart.setOption(option);
     },
   },
-}
+};
 </script>
 
-<style>
+<style></style>
-</style>

src/components/performance.vue

@@ -3,14 +3,13 @@
     <div class="styles">
       <el-form>
         <el-col :span="12">
-            <el-select v-model="texts"
+          <el-select v-model="texts" @change="selectTime" placeholder="">
-                       @change="selectTime"
+            <el-option
-                       placeholder="">
+              v-for="item in deliList"
-                <el-option v-for="item in deliList"
-
               :key="item.value"
               :label="item.label"
-                           :value="item.value">
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-col>
@@ -19,31 +18,47 @@
     <div class="right-lines">
       <div class="item-s" v-for="item in list">
         <div>{{ item.name }}</div>
-                <div class="bg-color" :style="{backgroundColor:`${item.color}`}"></div>
+        <div
+          class="bg-color"
+          :style="{ backgroundColor: `${item.color}` }"
+        ></div>
       </div>
     </div>
     <!--        <div class="lines"></div>-->
     <div class="flex-s">
-            <div id="main1" style="width: 100%;margin-top: 10px"  :style="myChartStyle"></div>
+      <div
+        id="main1"
+        style="width: 100%; margin-top: 10px"
+        :style="myChartStyle"
+      ></div>
     </div>
   </div>
 </template>
 
 <script>
 import * as echarts from "echarts";
-import {getDayType, getIndexAddAchieve, getMemberRecommend} from "@/api/index";
+import {
+  getDayType,
+  getIndexAddAchieve,
+  getMemberRecommend,
+} from "@/api/index";
 import { formatSeconds } from "@/util/common";
 export default {
   name: "recommendTime",
   data() {
     return {
-            list:[{"name":'左区首购',"color":"#FF5151"},
+      list: [
-                {"name":'左区复购',"color":"#BB0909"},
+        { name: "左区首购", color: "#FF5151" },
-                {"name":'右区首购',"color":"#FFAE36"},
+        { name: "左区复购", color: "#BB0909" },
-                {"name":'右区复购',"color":"#935801"}
+        { name: "右区首购", color: "#FFAE36" },
+        { name: "右区复购", color: "#935801" },
+      ],
+      texts: "",
+      deliList: [
+        { label: "近七日", value: 7 },
+        { label: "近十四日", value: 14 },
+        { label: "近三十日", value: 30 },
       ],
-            texts:'',
-            deliList:[{"label":'近七日',"value":7},{"label":'近十四日',"value":14},{"label":'近三十日',"value":30}],
       myChartStyle: {
         float: "center",
         width: "700px",
@@ -54,39 +69,39 @@ export default {
       sexData: [
         {
           data: [150, 230, 224, 218, 135, 147, 260],
-                    type: 'line',
+          type: "line",
-                    color:'#FE9A02',
+          color: "#FE9A02",
           label: {
             show: false,
-                        position:'right',
+            position: "right",
           },
         },
       ],
-        }
+    };
   },
   mounted() {
     this.selected();
   },
   methods: {
     selectTime(data) {
-            this.texts =data
+      this.texts = data;
       this.getData();
     },
     selected() {
       getDayType().then((res) => {
-                this.deliList = res.data
+        this.deliList = res.data;
         this.ageChart(res.data);
         this.getData(res.data[0].value);
-                this.texts = res.data[0].label
+        this.texts = res.data[0].label;
-            })
+      });
     },
     getData(value) {
-            getIndexAddAchieve({"dayType":this.texts || value}).then((res)=>{
+      getIndexAddAchieve({ dayType: this.texts || value }).then((res) => {
         this.ageChart(res.data);
-            })
+      });
     },
     ageChart(data) {
-            var myChart = echarts.init(document.getElementById('main1'));
+      var myChart = echarts.init(document.getElementById("main1"));
       let time = [];
       let time1 = [];
       let arr1 = [];
@@ -97,17 +112,17 @@ export default {
         if (item.settleDate) {
           // let time1=item.settleDate.split("-");
           // let json = time1[1]+'-'+time1[2]
-                    time.push(item.settleDate)
+          time.push(item.settleDate);
         }
-                arr1.push(item.repANewPv)
+        arr1.push(item.repANewPv);
-                arr2.push(item.repBNewPv)
+        arr2.push(item.repBNewPv);
-                arr3.push(item.bNewPv)
+        arr3.push(item.bNewPv);
-                arr4.push(item.aNewPv)
+        arr4.push(item.aNewPv);
-            })
+      });
-            console.error(time)
+      console.error(time);
       var option = {
         title: {
-                    text: '业绩（万）'
+          text: "业绩",
         },
         tooltip: {
           // _8:function (params){
@@ -124,25 +139,25 @@ export default {
           top: "70px",
           right: "30px",
           width: "auto",
-                    orient: 'vertical',
+          orient: "vertical",
           itemHeight: 21,
-                    itemWidth:39
+          itemWidth: 39,
         },
         grid: {
-                    left: '0%',
+          left: "0%",
-                    right: '4%',
+          right: "4%",
-                    bottom: '3%',
+          bottom: "3%",
-                    containLabel: true
+          containLabel: true,
         },
         xAxis: {
-                    type: 'category',
+          type: "category",
           data: time,
           axisLine: {
             show: true,
             lineStyle: {
               color: "#333",
-                            width: '1',    // 坐标轴线线宽
+              width: "1", // 坐标轴线线宽
-                            type: 'solid',    // 坐标轴线线的类型（solid实线类型；dashed虚线类型；dotted点状类型）
+              type: "solid", // 坐标轴线线的类型（solid实线类型；dashed虚线类型；dotted点状类型）
             },
           },
           axisTick: {
@@ -150,86 +165,85 @@ export default {
             inside: true, // 坐标轴刻度是否朝内，默认朝外
             length: 5, // 坐标轴刻度的长度
             lineStyle: {
-                            color: '#FFF',     // 刻度线的颜色
+              color: "#FFF", // 刻度线的颜色
               width: 10, // 坐标轴刻度线宽
-                            type: 'solid',    // 坐标轴线线的类型（solid实线类型；dashed虚线类型；dotted点状类型）
+              type: "solid", // 坐标轴线线的类型（solid实线类型；dashed虚线类型；dotted点状类型）
             },
           },
           splitLine: {
-                        show: false
+            show: false,
           },
           axisLabel: {
-                        type: 'category',
+            type: "category",
             interval: 0,
             textStyle: {
-                            color: '#000',
+              color: "#000",
-                            fontSize: '10',
+              fontSize: "10",
-                            itemSize: '',
+              itemSize: "",
             },
             formatter: function (data) {
-                            return data
+              return data;
-                        }
+            },
-                    }
+          },
         },
         yAxis: {
-                    type: 'value',
+          type: "value",
           splitLine: {
             show: true,
             lineStyle: {
               color: "#CCCCCC",
               type: "dashed", //虚线
-                            width: 2
+              width: 2,
-                        }
+            },
-                    }
+          },
         },
         series: [
           {
             data: arr4,
-                        type: 'line',
+            type: "line",
-                        color:'#FF5151',
+            color: "#FF5151",
             label: {
               show: false,
-                            position:'right',
+              position: "right",
             },
             formatter: function (data) {
-                           console.error(data)
+              console.error(data);
-                        }
+            },
           },
           {
             data: arr1,
-                        type: 'line',
+            type: "line",
-                        color:'#BB0909',
+            color: "#BB0909",
             label: {
               show: false,
-                            position:'right',
+              position: "right",
             },
           },
           {
             data: arr3,
-                        type: 'line',
+            type: "line",
-                        color:'#FE9A02',
+            color: "#FE9A02",
             label: {
               show: false,
-                            position:'right',
+              position: "right",
             },
           },
           {
             data: arr2,
-                        type: 'line',
+            type: "line",
-                        color:'#935801',
+            color: "#935801",
             label: {
               show: false,
-                            position:'right',
+              position: "right",
+            },
           },
-                    }
         ],
       };
 
       myChart.setOption(option);
-
     },
-    }
+  },
-}
+};
 </script>
 
 <style scoped lang="scss">

src/components/placementPerformance.vue

@@ -20,17 +20,16 @@ export default {
     return {
       texts: "",
       pieData: [
-      
         {
           value: 0,
           age: 0,
-          name: '左区',
+          name: "左区",
           itemStyle: { color: "#EE5858" },
         },
         {
           value: 0,
           age: 0,
-          name: '右区',
+          name: "右区",
           itemStyle: { color: "#FBB046" },
         },
       ],
@@ -60,7 +59,7 @@ export default {
     },
     ageChart(datas) {
       var myChart = echarts.init(document.getElementById("main2"));
-      let that = this
+      let that = this;
       var option = {
         legend: {
           // 图例
@@ -75,7 +74,6 @@ export default {
             type: "pie",
             label: {
               show: true,
-              // formatter:'{b}:   {c}人\n 业绩:  {d}万',
               formatter: function (data) {
                 return (
                   data.data.name +
@@ -84,8 +82,7 @@ export default {
                   "人" +
                   "\n " +
                   "业绩：" +
-                  data.data.value +
+                  data.data.value
-                  that.$t('S_C_58') 
                 );
               },
               lineHeight: 25, // 行高

src/components/realPerformances.vue

@@ -6,14 +6,12 @@
 -->
 <template>
   <div>
-        <div id="mounthData1"
+    <div id="mounthData1" :style="myChartStyle"></div>
-        :style="myChartStyle">
-        </div>
   </div>
 </template>
 
 <script>
-import * as api from '@/api/activity.js'
+import * as api from "@/api/activity.js";
 import { getPerformance } from "@/api/index";
 export default {
   props: {
@@ -26,13 +24,13 @@ export default {
   data() {
     return {
       myChartStyle: {
-        float: 'center',
+        float: "center",
-        width: '700px',
+        width: "700px",
-        height: '450px',
+        height: "450px",
-        paddingTop: '0',
+        paddingTop: "0",
         // margin: "20px",
       },
-      }
+    };
   },
   mounted() {
     // this.upDateCover()
@@ -40,42 +38,41 @@ export default {
   },
   methods: {
     upDateCover(val) {
-            let arr2=[]
+      let arr2 = [];
-            let arr3=[]
+      let arr3 = [];
       getPerformance({
         month: val || this.time,
-                })
+      }).then((res) => {
-                .then((res) => {
+        arr2.push(res.data.leftGrandTotal);
-                    arr2.push(res.data.leftGrandTotal)
+        arr2.push(res.data.firstLeftPurchaseTotal);
-                    arr2.push(res.data.firstLeftPurchaseTotal)
+        arr2.push(res.data.firstLeftRepurchaseTotal);
-                    arr2.push(res.data.firstLeftRepurchaseTotal)
+        arr3.push(res.data.rightGrandTotal);
-                    arr3.push(res.data.rightGrandTotal)
+        arr3.push(res.data.firstRightPurchaseTotal);
-                    arr3.push(res.data.firstRightPurchaseTotal)
+        arr3.push(res.data.firstRightRepurchaseTotal);
-                    arr3.push(res.data.firstRightRepurchaseTotal)
         // arr2.push(3)
         // arr2.push(5)
         // arr2.push(10)
         // arr3.push(3)
         // arr3.push(5)
         // arr3.push(10)
-                    this.drawChart(arr2, arr3)
+        this.drawChart(arr2, arr3);
-                })
+      });
     },
     drawChart(arr2, arr3) {
-            let arr1 =['累计业绩','首购累计业绩','复购累计业绩']
+      let arr1 = ["累计业绩", "首购累计业绩", "复购累计业绩"];
       // 基于准备好的dom，初始化echarts实例  这个和上面的main对应
-            let myChart = this.$echarts.init(document.getElementById('mounthData1'))
+      let myChart = this.$echarts.init(document.getElementById("mounthData1"));
       // 指定图表的配置项和数据
       let option = {
         title: {
-                    text: '',
+          text: "",
-                    subtext: '业绩(万)',
+          subtext: "业绩",
           left: 40,
         },
         tooltip: {},
         legend: {
-                    top: 'bottom',
+          top: "bottom",
-                    data: ['左区', '右区'],
+          data: ["左区", "右区"],
           itemHeight: 20,
           itemWidth: 40,
           bottom: 0,
@@ -90,41 +87,40 @@ export default {
           splitLine: {
             show: true,
             lineStyle: {
-                            type: 'dashed',
+              type: "dashed",
             },
           },
         },
         series: [
           {
-                        name: '左区',
+            name: "左区",
-                        type: 'bar',
+            type: "bar",
             data: arr2,
             itemStyle: {
               normal: {
                 barBorderRadius: [10, 10, 0, 0],
-                                color: '#01C291',
+                color: "#01C291",
               },
             },
           },
           {
-                        name: '右区',
+            name: "右区",
-                        type: 'bar',
+            type: "bar",
             data: arr3,
             itemStyle: {
               normal: {
                 barBorderRadius: [10, 10, 0, 0],
-                                color: '#FE4C4B',
+                color: "#FE4C4B",
               },
             },
           },
         ],
-            }
+      };
       // 使用刚指定的配置项和数据显示图表。
-            myChart.setOption(option)
+      myChart.setOption(option);
     },
   },
-}
+};
 </script>
 
-<style>
+<style></style>
-</style>

src/components/repAddPv.vue

@@ -12,15 +12,12 @@
 -->
 <template>
   <div>
-    <div id="repPv"
+    <div id="repPv" style="width: 700px; height: 400px"></div>
-         style="width: 700px; height: 400px">
-
-    </div>
   </div>
 </template>
 
 <script>
-import * as api from '@/api/activity.js'
+import * as api from "@/api/activity.js";
 export default {
   // mounted() {
   //   this.upDateCover()
@@ -29,31 +26,31 @@ export default {
     upDateCover() {
       api.achieveDay().then((res) => {
         let arr1 = res.data.map((item) => {
-          return item.settleDate
+          return item.settleDate;
-        })
+        });
         let arr2 = res.data.map((item) => {
-          return item.repANewPv
+          return item.repANewPv;
-        })
+        });
         let arr3 = res.data.map((item) => {
-          return item.repBNewPv
+          return item.repBNewPv;
-        })
+        });
-        this.drawChart(arr1, arr2, arr3)
+        this.drawChart(arr1, arr2, arr3);
-      })
+      });
     },
     drawChart(arr1, arr2, arr3) {
-      let myChart = this.$echarts.init(document.getElementById('repPv'))
+      let myChart = this.$echarts.init(document.getElementById("repPv"));
       // 指定图表的配置项和数据
       let option = {
         title: {
-          text: '',
+          text: "",
-          subtext: '业绩(万)',
+          subtext: "业绩",
         },
         tooltip: {
-          trigger: 'axis',
+          trigger: "axis",
         },
         legend: {
-          top: 'bottom',
+          top: "bottom",
-          data: ['左区', '右区'],
+          data: ["左区", "右区"],
           itemWidth: 20, // 长方形宽度
           itemHeight: 10, // 长方形高度
         },
@@ -66,9 +63,9 @@ export default {
             interval: 0,
             // rotate: 45,
             textStyle: {
-              color: '#000',
+              color: "#000",
-              fontSize: '10',
+              fontSize: "10",
-              itemSize: '',
+              itemSize: "",
             },
           },
         },
@@ -76,19 +73,19 @@ export default {
           splitLine: {
             show: true,
             lineStyle: {
-              type: 'dashed',
+              type: "dashed",
             },
           },
         },
         series: [
           {
-            name: '左区',
+            name: "左区",
-            type: 'line',
+            type: "line",
             data: arr2,
-            symbol: 'none',
+            symbol: "none",
             itemStyle: {
               normal: {
-                color: '#FF5A5A',
+                color: "#FF5A5A",
               },
             },
             lineStyle: {
@@ -98,13 +95,13 @@ export default {
             },
           },
           {
-            name: '右区',
+            name: "右区",
-            type: 'line',
+            type: "line",
             data: arr3,
-            symbol: 'none',
+            symbol: "none",
             itemStyle: {
               normal: {
-                color: '#FFAE36',
+                color: "#FFAE36",
               },
             },
             lineStyle: {
@@ -114,13 +111,12 @@ export default {
             },
           },
         ],
-      }
+      };
       // 使用刚指定的配置项和数据显示图表。
-      myChart.setOption(option)
+      myChart.setOption(option);
     },
   },
-}
+};
 </script>
 
-<style>
+<style></style>
-</style>

src/components/secondary-password/index.vue

@@ -0,0 +1,100 @@
+<template>
+  <el-dialog
+    class="password-dialog"
+    title="二级密码"
+    :visible.sync="dialogVisible"
+    width="400px"
+    center
+    :close-on-click-modal="false"
+    :before-close="handleClose"
+  >
+    <div class="pwd-container">
+      <div class="tit">请输入二级密码</div>
+      <el-input v-model="password" type="password"></el-input>
+      <el-button
+        :loading="loading"
+        class="confirm-btn"
+        type="primary"
+        @click="confirmBtnHandle"
+      >
+        <span>确定</span>
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { checkPwd } from "@/api/wallet";
+export default {
+  name: "SecondaryPassword",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      password: "",
+      loading: false,
+    };
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:visible", val);
+      },
+    },
+  },
+  methods: {
+    confirmBtnHandle() {
+      this.loading = true;
+      checkPwd({ pwd: this.password })
+        .then((res) => {
+          if (res.code == 200) {
+            this.password = "";
+            this.dialogVisible = false;
+            this.$emit("validPwd", true);
+          } else {
+            this.$emit("validPwd", false);
+          }
+        })
+        .catch(() => {
+          this.$emit("validPwd", false);
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    handleClose() {
+      this.dialogVisible = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.password-dialog {
+  margin-top: 120px;
+  .pwd-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .tit {
+      font-size: 16px;
+      font-family: PingFang SC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #666666;
+      text-align: center;
+      margin: 10px 0;
+    }
+    .confirm-btn {
+      margin-top: 20px;
+      width: 100%;
+    }
+  }
+}
+</style>

src/views/goodsDetails/index.vue

@@ -844,7 +844,7 @@ export default {
           this.goodDetail = res.data;
           let sl = this.goodDetail.sales + "";
           if (sl >= 10000) {
-            sl = sl.substring(0, sl.length - 4) + "万" + "+";
+            sl = sl.substring(0, sl.length - 4) + "+";
           }
           this.goodDetail.sales = sl;
           this.mainImgUrl = res.data.videoUrl;

src/views/index/components/sidebarUserInfo.vue

@@ -53,7 +53,7 @@
                 }"
               ></div>
               <div class="cha">
-                左区 {{ awards.aNewPv }}万/右区 {{ awards.bNewPv }}万
+                左区 {{ awards.aNewPv }}/右区 {{ awards.bNewPv }}
               </div>
             </div>
           </div>
@@ -73,7 +73,7 @@
                 }"
               ></div>
               <div class="cha">
-                左区 {{ awards.aMonthPv }}万/右区 {{ awards.bMonthPv }}万
+                左区 {{ awards.aMonthPv }}/右区 {{ awards.bMonthPv }}
               </div>
             </div>
           </div>
@@ -93,7 +93,7 @@
                 }"
               ></div>
               <div class="cha">
-                左区 {{ awards.aSumPv }}万/右区 {{ awards.bSumPv }}万
+                左区 {{ awards.aSumPv }}/右区 {{ awards.bSumPv }}
               </div>
             </div>
           </div>

src/views/performance/index.vue

@@ -23,12 +23,10 @@
             <div class="box">
               <div class="titles">{{ startDate }} 至 {{ endDate }}</div>
               <div class="echarts">
-                    <div class="title_s">{{'目标业绩'}}(PV)</div>
+                <div class="title_s">{{ "目标业绩" }}(PV)</div>
                 <div class="e-chat">
                   <div class="list" v-for="item in list">
-                          <div class="tops">
+                    <div class="tops"></div>
-
-                          </div>
                     <div class="process" :style="{ height: item.percentage }">
                       <div class="money">{{ item.percentage }}</div>
                     </div>
@@ -40,14 +38,16 @@
                   </div>
                 </div>
               </div>
-                <div class="titles" style="margin-top: 40px">{{ startDate1 }} 至 {{endDate1}}</div>
+              <div class="titles" style="margin-top: 40px">
+                {{ startDate1 }} 至 {{ endDate1 }}
+              </div>
               <div class="echarts">
-                    <div class="title_s" style="margin-top: 250px" >{{'目标业绩'}}(金额)</div>
+                <div class="title_s" style="margin-top: 250px">
+                  {{ "目标业绩" }}(金额)
+                </div>
                 <div class="e-chat" style="margin-top: 40px">
                   <div class="list" v-for="item in list1">
-                            <div class="tops">
+                    <div class="tops"></div>
-
-                            </div>
                     <div class="process" :style="{ height: item.percentage }">
                       <div class="money">{{ item.percentage }}</div>
                     </div>
@@ -78,10 +78,6 @@ import {getPerFormance,getPerFormanceAmount} from "@/api/register";
 export default {
   data() {
     return {
-       // list:[{"name":"20万","percent":15,num:20},{"name":"40万","percent":25,num:40},
-       //     {"name":"60万","percent":22,num:60},{"name":"80万","percent":20,num:80},
-       //     {"name":"100万","percent":10,num:100}
-       // ],
       list: [],
       list1: [],
       xData: [20, 40, 60, 80, 100], //横坐标
@@ -97,14 +93,14 @@ export default {
         memberCode: "",
         memberName: "",
       },
-      startDate:'',
+      startDate: "",
-      endDate:'',
+      endDate: "",
-      startDate1:'',
+      startDate1: "",
-      endDate1:'',
+      endDate1: "",
       navList: [
         { name: "认证资质", url: "/superStudio" },
-        { name: '注册业绩', url: "/performance" },
+        { name: "注册业绩", url: "/performance" },
-        { name: '专属礼包', url: "/giftBag" },
+        { name: "专属礼包", url: "/giftBag" },
       ],
     };
   },
@@ -117,19 +113,19 @@ export default {
   methods: {
     getPerFormance() {
       getPerFormance().then((res) => {
-              this.startDate = res.data.startDate
+        this.startDate = res.data.startDate;
-              this.endDate = res.data.endDate
+        this.endDate = res.data.endDate;
-              this.list = res.data.targetPerformanceList
+        this.list = res.data.targetPerformanceList;
-          })
+      });
     },
     getPerFormanceAmount() {
       getPerFormanceAmount().then((res) => {
-              this.startDate1 = res.data.startDate
+        this.startDate1 = res.data.startDate;
-              this.endDate1 = res.data.endDate
+        this.endDate1 = res.data.endDate;
-              this.list1 = res.data.targetPerformanceList
+        this.list1 = res.data.targetPerformanceList;
-          })
+      });
-      }
+    },
-      }
+  },
 };
 </script>
 <style>
@@ -164,7 +160,6 @@ export default {
   bottom: 0;
   justify-content: center;
   margin-left: 135px;
-
 }
 .money {
   position: absolute;
@@ -177,7 +172,6 @@ export default {
   justify-content: center;
   align-items: center;
   display: flex;
-
 }
 .e-chat {
   display: flex;
@@ -186,7 +180,7 @@ export default {
 .list {
   width: 128px;
   height: 184px;
-    background: #F3F3F3;
+  background: #f3f3f3;
   margin-right: 40px;
   border-radius: 7px 7px 0 0;
 }
@@ -216,7 +210,7 @@ export default {
   //height: 475px;
   border-radius: 10px 10px 10px 10px;
   opacity: 1;
-  border: 1px solid #CCCCCC;
+  border: 1px solid #cccccc;
   margin: 40px 0 40px 40px;
   padding: 30px;
 }

src/views/shareDetails/index.vue

@@ -11,35 +11,42 @@
  * @Date: 2023-01-12 16:21:41
 -->
 <template>
-  <div class="contain"
+  <div class="contain" ref="box">
-       ref="box">
     <!-- 用户头 -->
     <personInfo></personInfo>
-    <Sidebar :showCar="true"
+    <Sidebar
+      :showCar="true"
       @showShare="showShare"
       @showCar="showCar"
-             ref="sideBar"></Sidebar>
+      ref="sideBar"
+    ></Sidebar>
 
     <!-- 面包屑 -->
     <div class="mianbao">
       <el-breadcrumb separator-class="el-icon-arrow-right">
-        <el-breadcrumb-item :to="{ path: '/' }">{{'首页'}}</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/' }">{{
-        <el-breadcrumb-item v-if="specialArea!=18&&specialArea!=19"
+          "首页"
-                            :to="{ path: '/shoppingMall?id=' + specialArea }">{{ labelName }}</el-breadcrumb-item>
+        }}</el-breadcrumb-item>
-        <el-breadcrumb-item v-else
+        <el-breadcrumb-item
-                            :to="{ path: '/spaceMallList' }">{{ labelName }}</el-breadcrumb-item>
+          v-if="specialArea != 18 && specialArea != 19"
-        <el-breadcrumb-item>{{'商品详情'}}</el-breadcrumb-item>
+          :to="{ path: '/shoppingMall?id=' + specialArea }"
+          >{{ labelName }}</el-breadcrumb-item
+        >
+        <el-breadcrumb-item v-else :to="{ path: '/spaceMallList' }">{{
+          labelName
+        }}</el-breadcrumb-item>
+        <el-breadcrumb-item>{{ "商品详情" }}</el-breadcrumb-item>
       </el-breadcrumb>
     </div>
     <div class="details_t">
       <!-- 轮播图 -->
-      <Swiper :mainImgUrls="mainImgUrl"
+      <Swiper :mainImgUrls="mainImgUrl" :imgUrlLists="imgUrlList"></Swiper>
-              :imgUrlLists="imgUrlList"></Swiper>
       <!-- 商品信息 -->
       <div class="details_c">
         <div class="dis_flex">
-          <div class="qzbq"
+          <div class="qzbq" v-if="goodDetail.prefixLabelTarget">
-               v-if="goodDetail.prefixLabelTarget">[{{ goodDetail.prefixLabelTarget.label }}]</div>
+            [{{ goodDetail.prefixLabelTarget.label }}]
+          </div>
           <div class="c_tit1">
             {{ goodDetail.waresName }}
           </div>
@@ -51,26 +58,31 @@
           <div class="c_bai_b">
             <div class="dis_flex just">
               <div class="dis_flex">
-                <div class="tit5">{{ userInfo.currencyIcon }}{{ goodDetail.waresPrice |numberToCurrency }}</div>
+                <div class="tit5">
+                  {{ userInfo.currencyIcon
+                  }}{{ goodDetail.waresPrice | numberToCurrency }}
+                </div>
                 <!-- <div class="tit6">{{ goodDetail.goodsAchive }}</div> -->
               </div>
-              <div class="tit7">{{'累计销售'}}</div>
+              <div class="tit7">{{ "累计销售" }}</div>
             </div>
             <div class="dis_flex just m10">
               <div class="tit4 dis_flex">
-                <div style="margin-right:20px">PV:{{ goodDetail.waresAchieve|numberToCurrency }} </div>
+                <div style="margin-right: 20px">
-                <div v-show="goodDetail.specialArea == 13">BV:{{ goodDetail.goodsAssAchive }} </div>
+                  PV:{{ goodDetail.waresAchieve | numberToCurrency }}
+                </div>
+                <div v-show="goodDetail.specialArea == 13">
+                  BV:{{ goodDetail.goodsAssAchive }}
+                </div>
               </div>
               <div class="tit5">{{ goodDetail.sales | seles }}</div>
             </div>
             <div class="dis_flex just m10">
-              <div class="dis_flex"
+              <div class="dis_flex" v-if="goodDetail.giftNames">
-                   v-if="goodDetail.giftNames">
+                <div class="tit8">{{ "赠品" }}:</div>
-                <div class="tit8">{{ '赠品'}}:</div>
                 <div class="tit9">{{ goodDetail.giftNames }}</div>
               </div>
               <div v-else></div>
-
             </div>
           </div>
         </div>
@@ -97,70 +109,75 @@
         </div> -->
         <div class="gui">
           <div class="gui_b">
-            <div class="gui_bt">{{ '规格' }}:</div>
+            <div class="gui_bt">{{ "规格" }}:</div>
             <div class="gui_bb">
-              <div v-for="item,index in goodDetail.waresSkuList"
+              <div
+                v-for="(item, index) in goodDetail.waresSkuList"
                 :key="item.pkId"
-                   class="gui_i">
+                class="gui_i"
+              >
                 <div class="gui_ia">
-                  <div @click.stop="tapSku(index)"
+                  <div
-                       :class="['gui_ii',hasChecked==item.pkId?'gui_a':'']">
+                    @click.stop="tapSku(index)"
-                    <img :src="item.image"
+                    :class="['gui_ii', hasChecked == item.pkId ? 'gui_a' : '']"
-                         alt="">
+                  >
+                    <img :src="item.image" alt="" />
                     <div class="gui_iit">{{ item.specValueNames }}</div>
                   </div>
                 </div>
               </div>
-            
             </div>
           </div>
-
         </div>
         <!-- 数量 -->
-        <div class="dis_flex"
+        <div class="dis_flex" v-if="userInfo.registerFans == 0">
-             v-if="userInfo.registerFans == 0">
+          <div>{{ "数量" }}：</div>
-          <div>{{ '数量' }}：</div>
+          <el-input-number v-model="num" :min="1"></el-input-number>
-          <el-input-number v-model="num"
-                           :min="1"></el-input-number>
         </div>
-        <div class="addCar"
+        <div class="addCar" @click="toAddCar">{{ "加入购物车" }}</div>
-             @click="toAddCar">{{ '加入购物车' }}</div>
         <!-- <div class="addCar"
              v-if="userInfo.registerFans == 0"
              @click="goBuy">{{'立即购买'}}</div> -->
         <!-- {{ '服务承诺' }} -->
         <div class="dis_flex fw">
-          <div>{{ '服务承诺' }}:</div>
+          <div>{{ "服务承诺" }}:</div>
-          <div class="fw_i"
+          <div
+            class="fw_i"
             v-for="item in goodDetail.ensureLabelList"
-               :key="item.pkId">{{ item.label }}</div>
+            :key="item.pkId"
+          >
+            {{ item.label }}
+          </div>
         </div>
       </div>
       <!-- 推荐 -->
       <!-- 商品列表 -->
       <div class="goodList">
-        <div class="tited">{{ '精品推荐' }}</div>
+        <div class="tited">{{ "精品推荐" }}</div>
-        <div class="good_i"
+        <div
+          class="good_i"
           v-for="item in goodList"
           :key="item.pkId"
-             @click="goDetails(item)">
+          @click="goDetails(item)"
-          <img class="goodImg"
+        >
-               :src="item.cover1"
+          <img class="goodImg" :src="item.cover1" alt="" />
-               alt="">
           <div class="goodBtm">
             <div class="disFlex">
-              <div class="tit5">{{ userInfo.currencyIcon }}{{ item.waresPrice |numberToCurrency }}</div>
+              <div class="tit5">
+                {{ userInfo.currencyIcon
+                }}{{ item.waresPrice | numberToCurrency }}
+              </div>
               <div class="tit2"></div>
             </div>
             <div class="disFlex">
               <div class="tit3">{{ item.waresName }}</div>
             </div>
             <div class="disFlex">
+              <div class="tit4">{{ "销量" }}:{{ item.sales | seles }}</div>
               <div class="tit4">
-                {{'销量'}}:{{ item.sales |seles}}
+                {{ "业绩" }}:{{
-              </div>
+                  item.waresAchieve | toThousandthAndKeepDecimal
-              <div class="tit4">
+                }}
-                {{ '业绩' }}:{{ item.waresAchieve|toThousandthAndKeepDecimal }}
               </div>
             </div>
           </div>
@@ -169,33 +186,34 @@
     </div>
 
     <div class="menuList">
-      <div :class="['menu_i', isMenu == 0 ? 'actMenu' : '']"
+      <div
-           @click="isMenu =0">
+        :class="['menu_i', isMenu == 0 ? 'actMenu' : '']"
-        {{'商品介绍'}}
+        @click="isMenu = 0"
+      >
+        {{ "商品介绍" }}
       </div>
-      <div :class="['menu_i', isMenu == 1 ? 'actMenu' : '']"
+      <div
-           @click="isMenu =1">
+        :class="['menu_i', isMenu == 1 ? 'actMenu' : '']"
-        {{'售后保障'}}
+        @click="isMenu = 1"
+      >
+        {{ "售后保障" }}
       </div>
     </div>
     <div class="xian"></div>
     <div class="allDetail">
-      <div v-show="isMenu==0"
+      <div v-show="isMenu == 0" v-html="goodDetail.description"></div>
-           v-html="goodDetail.description"></div>
+      <div v-show="isMenu == 1" v-html="goodDetail.afterGuarantee"></div>
-      <div v-show="isMenu==1"
-           v-html="goodDetail.afterGuarantee"></div>
     </div>
-
   </div>
 </template>
 
 <script>
-import personInfo from '@/components/personInfo.vue'
+import personInfo from "@/components/personInfo.vue";
-import Swiper from '@/components/Swiper.vue'
+import Swiper from "@/components/Swiper.vue";
-import Sidebar from '@/components/Sidebar.vue'
+import Sidebar from "@/components/Sidebar.vue";
-import * as api from '@/api/goods.js'
+import * as api from "@/api/goods.js";
-import { memLevel } from '@/api/register.js'
+import { memLevel } from "@/api/register.js";
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
 
 export default {
   components: {
@@ -206,15 +224,15 @@ export default {
   data() {
     return {
       isMenu: 0,
-      specialArea: '',
+      specialArea: "",
-      waresCode: '',
+      waresCode: "",
       goodList: [
         {
-          waresCode: '1',
+          waresCode: "1",
           cover1:
-            'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg',
+            "https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg",
-          waresPrice: '1980.00',
+          waresPrice: "1980.00",
-          waresName: '海之圣超饱和富氢水杯（粉色），你值得拥有',
+          waresName: "海之圣超饱和富氢水杯（粉色），你值得拥有",
         },
       ],
       goodDetail: {
@@ -223,40 +241,38 @@ export default {
       },
       isClick: 0,
       num: 1,
-      mainImgUrl: '',
+      mainImgUrl: "",
       imgUrlList: [],
-      labelName: '',
+      labelName: "",
-      countDown: '',
+      countDown: "",
-      pkId: '',
+      pkId: "",
-      source: '',
+      source: "",
-      hasChecked: '',
+      hasChecked: "",
-    }
+    };
   },
   filters: {
     seles(value) {
-          
       if (value > 999) {
-            return 999 + '+'
+        return 999 + "+";
       } else {
-            return value
+        return value;
-          }
-            
       }
     },
+  },
   computed: {
-    ...mapGetters(['userInfo']),
+    ...mapGetters(["userInfo"]),
   },
   watch: {
     $route: {
       immediate: true,
       handler(n) {
-        this.specialArea = this.$route.query.specialArea
+        this.specialArea = this.$route.query.specialArea;
-        this.pkId = Number(this.$route.query.pkId)
+        this.pkId = Number(this.$route.query.pkId);
-        this.source = this.$route.query.source
+        this.source = this.$route.query.source;
-        this.labelName = this.$route.query.label
+        this.labelName = this.$route.query.label;
-        this.getDetails()
+        this.getDetails();
-        this.$store.dispatch('SpecialQuantity', this.specialArea)
+        this.$store.dispatch("SpecialQuantity", this.specialArea);
-        this.getRecGoods()
+        this.getRecGoods();
       },
     },
   },
@@ -270,7 +286,7 @@ export default {
   },
   methods: {
     showShare() {
-            this.$refs.sideBar.getShare(this.specialArea)
+      this.$refs.sideBar.getShare(this.specialArea);
     },
     goBuy() {
       let data = {
@@ -278,31 +294,34 @@ export default {
         pkId: this.pkId,
         source: 0, // 海粉商品渠道ID
         waresSkuList: [],
-      }
+      };
       this.goodDetail.waresSkuList.forEach((item) => {
         if (item.pkId == this.hasChecked) {
-          data.waresSkuList.push({ pkTWares: this.goodDetail.pkId,pkTWaresSku:item.pkId})
+          data.waresSkuList.push({
+            pkTWares: this.goodDetail.pkId,
+            pkTWaresSku: item.pkId,
+          });
         }
-      })
+      });
       this.$router.push({
-        path: 'shareConfirm',
+        path: "shareConfirm",
         query: {
           specialArea: 21,
           allData: JSON.stringify([data]),
           hasChecked: this.hasChecked,
         },
-      })
+      });
     },
     goDetails(item) {
       this.$router.replace({
-        path: '/shareDetails',
+        path: "/shareDetails",
         query: {
           pkId: item.pkId,
           specialArea: this.specialArea,
           label: this.labelName,
           source: 0,
         },
-      })
+      });
     },
     getRecGoods() {
       api
@@ -311,13 +330,13 @@ export default {
         })
         .then((res) => {
           if (res.code == 200) {
-            res.rows.splice(2)
+            res.rows.splice(2);
-            this.goodList = res.rows
+            this.goodList = res.rows;
           }
-        })
+        });
     },
     showCar() {
-      this.$refs.sideBar.getCarList(this.specialArea)
+      this.$refs.sideBar.getCarList(this.specialArea);
     },
     toAddCar() {
       let obj = {
@@ -326,61 +345,69 @@ export default {
         pkId: this.pkId, // 海粉商品ID
         source: 0, // 海粉商品渠道ID
         productGroup: [],
-      }
+      };
       this.goodDetail.waresSkuList.forEach((item) => {
         if (item.pkId == this.hasChecked) {
-          obj.productGroup.push(item.productGroup[0])
+          obj.productGroup.push(item.productGroup[0]);
         }
-      })
+      });
       api.addShopping(obj).then((res) => {
-        this.$store.dispatch('SpecialQuantity', this.specialArea)
+        this.$store.dispatch("SpecialQuantity", this.specialArea);
         this.$message({
-          message: '购物车添加成功',
+          message: "购物车添加成功",
-          type: 'success',
+          type: "success",
-        })
+        });
-      })
+      });
     },
     getNum(index, cndex, quantity) {
       // 数量为0，关闭高亮
       if (quantity == 0) {
         this.$set(
           this.goodDetail.productParams[index].waresItemsParamsList[cndex],
-          'checked',
+          "checked",
           false
-        )
+        );
       } else {
         this.$set(
           this.goodDetail.productParams[index].waresItemsParamsList[cndex],
-          'checked',
+          "checked",
           true
-        )
+        );
       }
-      let ggNum = 0
+      let ggNum = 0;
       this.goodDetail.productParams[index].waresItemsParamsList.forEach(
         (item) => {
-          ggNum += item.quantity
+          ggNum += item.quantity;
         }
-      )
+      );
       if (this.goodDetail.productParams[index].quantity - quantity >= 0) {
         this.goodDetail.productParams[index].waresItemsParamsList.forEach(
           (stem, sndex) => {
             if (sndex != cndex) {
               this.$set(
                 stem,
-                'maxNum',
+                "maxNum",
                 this.goodDetail.productParams[index].quantity -
                   (ggNum - stem.quantity)
-              )
+              );
             }
           }
-        )
+        );
       }
     },
     tapSku(index) {
-      this.hasChecked = this.goodDetail.waresSkuList[index].pkId
+      this.hasChecked = this.goodDetail.waresSkuList[index].pkId;
       // this.goodDetail.waresPrice = this.goodDetail.waresSkuList[index].price
-      this.$set(this.goodDetail,'waresPrice',this.goodDetail.waresSkuList[index].price)
+      this.$set(
-      this.$set(this.goodDetail,'waresAchieve',this.goodDetail.waresSkuList[index].achieve)
+        this.goodDetail,
+        "waresPrice",
+        this.goodDetail.waresSkuList[index].price
+      );
+      this.$set(
+        this.goodDetail,
+        "waresAchieve",
+        this.goodDetail.waresSkuList[index].achieve
+      );
       // this.goodDetail.waresAchieve = this.goodDetail.waresSkuList[index].waresAchieve
     },
     getDetails() {
@@ -390,13 +417,13 @@ export default {
           source: this.source,
         })
         .then((res) => {
-          this.goodDetail = res.data
+          this.goodDetail = res.data;
-          let sl = this.goodDetail.sales + ''
+          let sl = this.goodDetail.sales + "";
           if (sl >= 10000) {
-            sl = sl.substring(0, sl.length - 4) + '万'+'+'
+            sl = sl.substring(0, sl.length - 4) + "+";
           }
-          this.goodDetail.sales = sl
+          this.goodDetail.sales = sl;
-          this.mainImgUrl = res.data.videoUrl || res.data.cover1
+          this.mainImgUrl = res.data.videoUrl || res.data.cover1;
           this.imgUrlList = [
             res.data.cover,
             res.data.cover1,
@@ -405,43 +432,51 @@ export default {
             res.data.cover4,
             res.data.cover5,
             res.data.cover6,
-          ]
+          ];
           this.imgUrlList = this.imgUrlList.filter(
             (item) => item && item.trim()
-          )
+          );
-          this.hasChecked = this.goodDetail.waresSkuList[0].pkId
+          this.hasChecked = this.goodDetail.waresSkuList[0].pkId;
-          this.$set(this.goodDetail,'waresPrice',this.goodDetail.waresSkuList[0].price)
+          this.$set(
-      this.$set(this.goodDetail,'waresAchieve',this.goodDetail.waresSkuList[0].achieve)
+            this.goodDetail,
-        })
+            "waresPrice",
+            this.goodDetail.waresSkuList[0].price
+          );
+          this.$set(
+            this.goodDetail,
+            "waresAchieve",
+            this.goodDetail.waresSkuList[0].achieve
+          );
+        });
     },
     downTime() {
-      let that = this
+      let that = this;
       this.clockTime = setInterval(() => {
         if (
           that.goodDetail.deliveryTimeMs &&
           that.goodDetail.deliveryTimeMs > 0
         ) {
-          that.countDown = this.getTime(this.goodDetail.deliveryTimeMs--)
+          that.countDown = this.getTime(this.goodDetail.deliveryTimeMs--);
         } else {
-          that.countDown = '0天00时00分00秒'
+          that.countDown = "0天00时00分00秒";
         }
-      }, 1000)
+      }, 1000);
     },
     getTime(time) {
       // 转换为式分秒
-      let d = parseInt(time / 60 / 60 / 24) //计算剩余天数\
+      let d = parseInt(time / 60 / 60 / 24); //计算剩余天数\
-      d = d < 10 ? '0' + d : d
+      d = d < 10 ? "0" + d : d;
-      let h = parseInt((time / 60 / 60) % 24)
+      let h = parseInt((time / 60 / 60) % 24);
-      h = h < 10 ? '0' + h : h
+      h = h < 10 ? "0" + h : h;
-      let m = parseInt((time / 60) % 60)
+      let m = parseInt((time / 60) % 60);
-      m = m < 10 ? '0' + m : m
+      m = m < 10 ? "0" + m : m;
-      let s = parseInt(time % 60)
+      let s = parseInt(time % 60);
-      s = s < 10 ? '0' + s : s
+      s = s < 10 ? "0" + s : s;
       // 作为返回值返回
-      return d + '天' + h + '小时' + m + '分' + s + '秒'
+      return d + "天" + h + "小时" + m + "分" + s + "秒";
     },
   },
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -566,7 +601,7 @@ export default {
       font-size: 16px;
     }
     .coloNum {
-      color: #00417C;
+      color: #00417c;
       font-weight: 600;
       margin: 0 10px;
     }
@@ -695,7 +730,7 @@ export default {
 .tit1 {
   font-size: 18px;
   font-weight: 600;
-  color: #00417C;
+  color: #00417c;
   margin-right: 10px;
   margin-bottom: 5px;
 }
@@ -721,7 +756,7 @@ export default {
 .tit5 {
   font-size: 24px;
   font-weight: 600;
-  color: #00417C;
+  color: #00417c;
 }
 .tit6 {
   font-size: 14px;
@@ -737,7 +772,7 @@ export default {
 .tit8 {
   font-size: 18px;
   font-weight: 400;
-  color: #00417C;
+  color: #00417c;
 }
 .tit9 {
   font-size: 18px;
@@ -769,7 +804,7 @@ export default {
     cursor: pointer;
   }
   .actMenu {
-    border-bottom: 5px solid #00417C;
+    border-bottom: 5px solid #00417c;
   }
 }
 .xian {

src/views/vipCenter/index.vue

@@ -8,10 +8,10 @@
   <div class="main">
     <div>
       <!-- 公告弹窗 -->
-      <notice-popup
+      <!-- <notice-popup
         :userInfo="userInfo"
         :publishLocationIndex="index"
-      ></notice-popup>
+      ></notice-popup> -->
     </div>
     <sidebarUserInfo></sidebarUserInfo>
     <div class="main_r">
@@ -30,7 +30,7 @@
       <div class="xian"></div>
 
       <!-- 钱包 -->
-      <div v-show="isMenu == 0 && cango">
+      <div v-show="isMenu == 0 && walletVisible">
         <!-- <walletComments></walletComments> -->
         <div class="bartopbox">
           <div class="flexbox">
@@ -113,19 +113,10 @@
         </div>
       </div>
     </div>
-    <el-dialog
+    <SecondaryPassword
-      class="pswdialog"
-      :title="'二级密码'"
       :visible.sync="pswShow"
-      width="30%"
+      @validPwd="validPwd"
-      center
+    ></SecondaryPassword>
-      :close-on-click-modal="false"
-      :before-close="handleClose"
-    >
-      <div class="tit">{{ "请输入二级密码" }}</div>
-      <el-input v-model="password" type="password"></el-input>
-      <div class="btn" @click="surePsw">{{ "确定" }}</div>
-    </el-dialog>
   </div>
 </template>
 
@@ -148,14 +139,15 @@ import monthlyHistory from "@/components/selfService/monthlyHistory.vue";
 import selfPickOrders from "@/components/selfService/selfPickOrders.vue";
 import selfCancleOrder from "@/components/selfService/selfCancleOrder.vue";
 import existRealName from "@/components/selfService/existRealName.vue";
-import noticePopup from "@/components/noticePopup.vue";
+import SecondaryPassword from "@/components/secondary-password/index.vue";
+// import noticePopup from "@/components/noticePopup.vue";
 import { mapGetters } from "vuex";
-import { checkPwd, checkIfShow } from "@/api/wallet.js";
+import { checkIfShow } from "@/api/wallet.js";
 import * as api from "@/api/goods.js";
 
 export default {
   components: {
-    noticePopup,
+    // noticePopup,
     carryGoods,
     delar,
     activity,
@@ -174,6 +166,7 @@ export default {
     monthlyHistory,
     selfCancleOrder,
     existRealName,
+    SecondaryPassword,
   },
   computed: {
     ...mapGetters(["userInfo"]),
@@ -277,13 +270,13 @@ export default {
       pkAccountId: "",
       pswShow: false,
       password: "",
-      cango: false,
+      walletVisible: false,
       theselfHeader: [],
     };
   },
   watch: {
     $route(n, o) {
-      this.cango = false;
+      this.walletVisible = false;
       this.isMenu = n.query.id;
       if (this.isMenu == 0) {
         this.password = "";
@@ -476,26 +469,11 @@ export default {
         }
       });
     },
-    surePsw() {
-      checkPwd({ pwd: this.password }).then((res) => {
-        if (res.code == 200) {
-          this.cango = true;
-          this.password = "";
-          this.pswShow = false;
-        }
-      });
-    },
-    handleClose() {
-      this.pswShow = false;
-    },
     goMenu(id) {
       if (id == 0) {
         this.password = "";
         this.pswShow = true;
       }
-      // if (id == 5) {
-
-      // }
       this.$router.push({
         path: "/vipCenter",
         query: { id: id },
@@ -512,6 +490,11 @@ export default {
     handleLink2(id) {
       this.atabActive = id;
     },
+    validPwd(valid) {
+      if (valid) {
+        this.walletVisible = true;
+      }
+    },
   },
 };
 </script>
@@ -520,31 +503,7 @@ export default {
 ::v-deep .el-carousel__container {
   height: 500px;
 }
-::v-deep .pswdialog {
+
-  margin-top: 120px;
-}
-.tit {
-  font-size: 16px;
-  font-family: PingFang SC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #666666;
-  text-align: center;
-  margin: 10px 0;
-}
-.btn {
-  line-height: 50px;
-  width: 180px;
-  // height: 50px;
-  background: #d5251d;
-  border-radius: 6px 6px 6px 6px;
-  text-align: center;
-  font-size: 18px;
-  font-weight: 500;
-  color: #ffffff;
-  margin: 0 auto;
-  margin-top: 25px;
-  cursor: pointer;
-}
 .bartopbox {
   margin-top: 20px;
   .flexbox {
@@ -568,7 +527,7 @@ export default {
 }
 .act {
   color: #ffffff;
-  background: rgba(192, 31, 31, 1);
+  background: var(--primary-color);
 }
 .main {
   min-height: 100vh;
@@ -599,7 +558,7 @@ export default {
         cursor: pointer;
       }
       .actMenu {
-        border-bottom: 5px solid #00417C;
+        border-bottom: 5px solid #00417c;
       }
     }
     .xian {