Merge branch 'master' of http://114.67.93.201/xulili/ybf

ybf_wx/src/views/mainSale/active/main/index.vue

@@ -4,8 +4,8 @@
             <div class="manInfo-logos">
                 <img class="logos-logo" :src="test.manInfo.logoUrl">
             </div>
-            <div class="manInfo-name">{{test.manInfo.barFrom}}的专柜：{{test.manInfo.barName}}</div>
-            <div class="manInfo-switch">
+            <div class="manInfo-name"  @click="manInfoClick">{{test.manInfo.barFrom}}的专柜：{{test.manInfo.barName}}</div>
+            <div class="manInfo-switch" @click="switchBarClick">
                 <div class="switch-text">切换</div>
                 <img class="switch-icon" :src="test.manInfo.icon['1']">
             </div>
@@ -21,7 +21,7 @@
                     <img class="menu-logo" :src="test.menuInfo.icon['1']">
                     <div class="menu-text">优惠券核销</div>
                 </div>
-                <div class="menu">
+                <div class="menu" @click="menu02Click">
                     <img class="menu-logo" :src="test.menuInfo.icon['2']">
                     <div class="menu-text">任务列表</div>
                 </div>
@@ -31,7 +31,7 @@
                 </div>
             </div>
             <div class="menus-row">
-                <div class="menu">
+                <div class="menu" @click="menu04Click">
                     <img class="menu-logo" :src="test.menuInfo.icon['4']">
                     <div class="menu-text">专柜维护</div>
                 </div>
@@ -39,7 +39,7 @@
                     <img class="menu-logo" :src="test.menuInfo.icon['5']">
                     <div class="menu-text">活动模版</div>
                 </div>
-                <div class="menu">
+                <div class="menu"  @click="menu06Click">
                     <img class="menu-logo" :src="test.menuInfo.icon['6']">
                     <div class="menu-text">商品管理</div>
                 </div>
@@ -203,21 +203,30 @@
                 this.test.menuBarInfo.icon.now = this.test.menuBarInfo.icon.ua
                 this.test.menuBarInfo.icon.now[inData] = this.test.menuBarInfo.icon.ac[inData]
             },
+            manInfoClick(){
+                this.$router.push("counterInfo")
+            },
+            switchBarClick(){
+                this.$router.push("changeCounter")
+            },
             testButtonClick() {
             },
             menu01Click() {
             },
             menu02Click() {
+                this.$router.push("Task")
             },
             menu03Click() {
                 this.$router.push("activeList")
             },
             menu04Click() {
+                this.$router.push("counterMaintain")
             },
             menu05Click() {
                 this.$router.push("ActTemplate")
             },
             menu06Click() {
+                this.$router.push("goodManage")
             },
             buttonMainMarketingClick() {
                 // this.$router.push("home")

ybf_wx/src/views/mainSale/me/task/index.vue

@@ -40,7 +40,8 @@
                             <div class="content-tasks">
                                 <div class="task-title">{{item.type}}：</div>
                                 <div v-if="item.type === '月销售'" class="task-money">¥{{item.content}}</div>
-                                <div v-if="item.type === '月拉新'" class="task-money">{{item.nowNum}}/{{item.taskNum}}</div>
+                                <div v-if="item.type === '月拉新'" class="task-money">{{item.nowNum}}/{{item.taskNum}}
+                                </div>
 
                             </div>
                         </div>
@@ -49,7 +50,6 @@
             </div>
 
 
-
         </div>
 
         <div class="my"></div>
@@ -65,8 +65,8 @@
                     icon: {
                         arrowRightDark: "/mainSale/icon-arrow-right-dark.png",
                     },
-                    style:{
-                      noBorderTop: "border-top: none;",
+                    style: {
+                        noBorderTop: "border-top: none;",
                     },
                 },
                 list: {
@@ -260,7 +260,7 @@
         object-fit: cover;
     }
 
-    .my-infos{
+    .my-infos {
         /*border: 1px solid red;*/
         width: 100%;
         height: auto;
@@ -272,7 +272,8 @@
 
         box-shadow: 0px 2px 4px 0px #DDDDDD;
     }
-    .my-info{
+
+    .my-info {
         border-top: 1px solid #EEEEEE;
         width: 100%;
         height: auto;
@@ -282,12 +283,15 @@
         justify-content: flex-start;
         align-items: center;
     }
-    .my-logo{
+
+    .my-logo {
         width: 80px;
         height: 80px;
         border-radius: 4px;
     }
-    .my-contents{
+
+    .my-contents {
+        border: 0px solid red;
         width: 100%;
         height: 80px;
         padding: 0px 12px;
@@ -297,7 +301,8 @@
         justify-content: center;
         align-items: flex-start;
     }
-    .content-title{
+
+    .content-title {
         width: auto;
         max-width: 100%;
         word-wrap: unset;
@@ -307,7 +312,8 @@
         color: #2D476A;
         padding-bottom: 16px;
     }
-    .content-tasks{
+
+    .content-tasks {
         width: 100%;
         height: auto;
         display: flex;
@@ -315,7 +321,8 @@
         justify-content: flex-start;
         align-items: center;
     }
-    .task-title{
+
+    .task-title {
         width: auto;
         font-size: 12px;
         font-weight: normal;
@@ -323,7 +330,8 @@
         color: #2D476A;
 
     }
-    .task-money{
+
+    .task-money {
         width: auto;
         font-size: 12px;
         font-weight: normal;
@@ -332,5 +340,4 @@
     }
 
 
-
 </style>