Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/work/commission.vue

@@ -453,7 +453,7 @@
     }
 
     .commission-table {
-      width: 35vw;
+      width: 39vw;
       height: 375px;
       margin: 0 auto;
       border-top: 1px solid #EAEBF0;

src/components/work/todayData.vue

@@ -513,19 +513,19 @@
                   <div class="Data_One">
                     <span class="label_Day">日</span>
                     <span class="label_Cule">
-                      {{ConsultObj.YestodayAgFollow}}%
+                      {{ConsultObj.YestodayAgFollow}}
                     </span>
                   </div>
                   <div class="Data_One">
                     <span class="label_Day">周</span>
                     <span class="label_Cule">
-                      {{ConsultObj.CurWeekAgFollow}}%
+                      {{ConsultObj.CurWeekAgFollow}}
                     </span>
                   </div>
                   <div class="Data_One">
                     <span class="label_Day">月</span>
                     <span class="label_Cule">
-                      {{ConsultObj.CurMonthAgFollow}}%
+                      {{ConsultObj.CurMonthAgFollow}}
                     </span>
                   </div>
                 </div>

src/pages/course/course.vue

@@ -228,6 +228,16 @@
                     <q-item-label>课程详情</q-item-label>
                   </q-item-section>
                 </q-item>
+                <!-- <q-item clickable v-close-popup @click="goMyroster(props.row,1)">
+                  <q-item-section>
+                    <q-item-label>学员名单</q-item-label>
+                  </q-item-section>
+                </q-item>
+                <q-item clickable v-close-popup @click="goMyroster(props.row,2)">
+                  <q-item-section>
+                    <q-item-label>学员订单</q-item-label>
+                  </q-item-section>
+                </q-item> -->
               </q-list>
             </q-btn-dropdown>
           </q-td>
@@ -298,7 +308,20 @@
             align: "left",
             field: (row) => row.CateName,
           },
-
+          // {
+          //   name: "SellPrice",
+          //   required: true,
+          //   label: "学员数量",
+          //   align: "left",
+          //   field: (row) => row.SellPrice.toFixed(2),
+          // },
+          // {
+          //   name: "SellPrice",
+          //   required: true,
+          //   label: "订单数量",
+          //   align: "left",
+          //   field: (row) => row.SellPrice.toFixed(2),
+          // },
           {
             name: "SellPrice",
             required: true,
@@ -661,6 +684,9 @@
           });
         });
       },
+      goMyroster(row,type){//type 1 是学员名单 2 学员订单
+
+      }
     },
   };
 

src/pages/test.vue

@@ -97,7 +97,7 @@
     },
     data() {
       return {
-        ActionStr: "/UserCenter/MarketStatic",
+        ActionStr: "/UserCenter/CreateMarketData",
         parameterList: [{
           Name: "",
           Value: ""
@@ -157,7 +157,7 @@
             data = JSON.parse(tempStr);
           }
           data = {
-
+ 
           };
           var tempMsg = {
             Msg: data