Signed-off-by: Changpeng Duan <838560574@qq.com>

pc/README.md

@@ -164,8 +164,10 @@ order
    
    .课程管理通用设置问题 √
    .
-
-   
+    
+    ClassDetailOne 没有返回 WxOrder 状态
+    User/ShopManagerListQuery phone，shopId参数输入后，返回值没有经过筛选
+    
    
    99.添加课程表/课程表模板的单条时，选择课程后预填入课时上限。√
    100.添加单条时，默认值问题√

pc/src/views/AdminManage.vue

@@ -7,11 +7,11 @@
                     <el-row :gutter="20">
                         <el-col :span="4">
                             <em>用户名:</em>
-                            <el-input v-model="panel.userCode" placeholder="请输入用户名"></el-input>
+                            <el-input v-model="panel.name" placeholder="请输入用户名"></el-input>
                         </el-col>
                         <el-col :span="4">
                             <em>手机号:</em>
-                            <el-input v-model="panel.tel" placeholder="请输入手机号"></el-input>
+                            <el-input v-model="panel.phone" placeholder="请输入手机号"></el-input>
                         </el-col>
                         <el-col :span="4">
                             <em>店面:</em>
@@ -186,8 +186,9 @@
                 // panel 配置项目
                 panel: {
                     userCode: '',
-                    tel: '',
-                    shopId: 0,
+                    name: '',
+                    phone: '',
+                    shopId: '',
                     options: [],
                     draw: 1,
                     start: 0,
@@ -392,7 +393,7 @@
                         that.panel.options = turnShopResToOption(json.Rs);
                         that.shops = turnShopResToOption(json.Rs);
                         that.form.shopId = json.Rs[0].ShopID;
-                        that.panel.options.unshift({value: 0, label: "全部"});
+                        that.panel.options.unshift({value: '', label: "全部"});
                     } else {
                         that.$message.error(json.Memo);
                     }
@@ -519,7 +520,7 @@
                     return false
                 }
                 let row = that.multipleSelection[0];
-                this.form.shopidshopid = row.ShopId;
+                this.form.shopid = row.ShopId;
                 this.form.userId = row.Id;
                 this.form.name = row.Name;
                 this.form.userCode = row.Usercode;
@@ -541,15 +542,12 @@
             // 页面数据查询
             getTableQuery() {
                 let that = this;
-                // this.getGetChildRegionSelect(0, 1);
                 that.loading = true;
-                // 查询检测设备。上级区域id，区域id必传。regionid传0，查询supregionid对应所有子区域的检测设备。 如果supregionid，regionid都传0，默认查询企业ID下所有检测设备
                 let param = {
                     token: localStorage.token,
-                    supregionid: 0,//
-                    regionid: this.panel.regionid,//
-                    comid: 1,//
-                    tagname: that.panel.tagname,//标签名
+                    shopId: this.panel.shopId,
+                    name: this.panel.name,
+                    phone: this.panel.phone,
                     start: 1,//
                     tableMax: 9999,//
                 };

pc/src/views/EditLessonManage.vue

@@ -161,8 +161,6 @@
             </div>
         </div>
         <br>
-
-
         <el-dialog title="增删课程会员" :visible.sync="dialogVisible">
             <div class="dialogTitle">
                 <span>基础功能</span>
@@ -326,6 +324,8 @@
                     if (json.Code == 0) {
                         row.OrderToplimit = json.Rs.TopLimit;
                         row.ConsumeHour = json.Rs.ConsumeHour;
+                        row.WxOrder = json.Rs.WxOrder;
+                        row.WxVisible = json.Rs.WxVisible;
                     } else {
                         that.$message.error(json.Memo);
                     }
@@ -398,7 +398,7 @@
                         thisRow.WeekDay = parseInt(i + 1);
                         thisRow.BeginStr = getHoursAndMin(thisRow.timeLong[0]);
                         thisRow.EndStr = getHoursAndMin(thisRow.timeLong[1]);
-                        thisRow.StdId = thisRow.StdId ? thisRow.StdId:0;
+                        thisRow.StdId = thisRow.StdId ? thisRow.StdId : 0;
                         this.$delete(thisRow, 'Base');
                         this.$delete(thisRow, 'SpdId');
                         // this.$delete(thisRow, 'timeLong');
@@ -657,6 +657,7 @@
         position: relative;
         float: right;
         bottom: 60px;
+        z-index: 222;
     }
 
     .table {

pc/src/views/EditLessonTable.vue

@@ -273,7 +273,6 @@
                     if (json.Code == 0) {
                         row.TopLimit = json.Rs.TopLimit;
                         row.ConsumeHour = json.Rs.ConsumeHour;
-                        console.log(row);
                     } else {
                         that.$message.error(json.Memo);
                     }

pc/src/views/Login.vue

@@ -20,7 +20,7 @@
                             <el-form-item label="">
                                 <el-input v-model="form.valid" placeholder="验证码"
                                           @keyup.enter.native="onSubmit"></el-input>
-                                <img id="validImg" :src="valImgSrc" alt="" width="100px" height="30px"
+                                <img id="validImg" :src="valImgSrc" alt="" width="100px" height="42px"
                                      title="看不清？刷一下试试！" @click="getGenVerifyPic">
                             </el-form-item>
                             <br>
@@ -81,7 +81,7 @@
                 let param = {
                     token: localStorage.token,
                     width: 100,
-                    height: 30,
+                    height: 42,
                     noiseCount: 10,
                     length: 4,
                     source: 123456789,
@@ -261,7 +261,7 @@
     #validImg {
         position: relative;
         float: right;
-        bottom: 45px;
+        bottom: 52px;
     }
 
     /deep/ .el-form {

pc/src/views/Main.vue

@@ -72,6 +72,9 @@
                             <el-button type="primary" plain @click="checkClassOverPrepare(c)">下课</el-button>
                         </div>
                     </li>
+                    <span class="tips" v-if="PreFinishList == 0">
+                        暂无下课课程
+                    </span>
                 </ul>
             </div>
 
@@ -95,6 +98,10 @@
                             <s class="red" v-if="c.WxOrder == 0">不可预约</s>
                         </em>
                     </el-card>
+                    <span class="tips" v-if="classList == 0">
+                        暂无预约课程，请先添加
+                        <router-link to="/lessonManage">课程表</router-link>
+                    </span>
                 </div>
             </div>
         </div>
@@ -127,6 +134,10 @@
                             <span>剩余课时：<em :class="[{'red':as.RemainHour == 0}]">{{as.RemainHour}}课时</em></span>
                         </div>
                     </li>
+                    <span class="tips" v-if="PreFinishList == 0">
+                        暂无预约，可进入
+                        <router-link to="/appoint">预约管理</router-link>
+                    </span>
                 </ul>
             </div>
         </div>
@@ -847,4 +858,7 @@
     .asContent .yellow {
         color: #FFDD00;
     }
+    /deep/ a {
+        color: #03B1FF;
+    }
 </style>

pc/src/views/appoint.vue

@@ -57,7 +57,9 @@
                                 <template slot-scope="scope">
                                     <el-progress
                                             :percentage="parseFloat((scope.row.OrderCount/scope.row.OrderToplimit * 100).toFixed(2))"
-                                            :format="format"></el-progress>
+                                            :format="format"
+                                            status="default"
+                                    ></el-progress>
                                 </template>
                             </el-table-column>
                             <el-table-column
@@ -417,7 +419,8 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            appoint.wxVisible = 0;
+                            // 状态返回
+                            appoint.WxOrder = e == 0 ? 1 : 0;
                             that.$message.error(json.Memo);
                         }
                     })
@@ -429,7 +432,7 @@
                     });
                 });
             },
-            panelSelect(){
+            panelSelect() {
                 let that = this;
                 let param = {
                     token: localStorage.token,
@@ -439,7 +442,7 @@
                     let json = res;
                     if (json.Code == 0) {
                         that.panel.classOptions = turnClassResToOption(json.Rs);
-                        that.panel.classOptions.unshift({value:'0',label:'全部'})
+                        that.panel.classOptions.unshift({value: '0', label: '全部'})
                     } else {
                         that.$message.error(json.Memo);
                     }
@@ -548,7 +551,7 @@
                 }).then(() => {
                     let param = {
                         token: localStorage.token,
-                        orderId : row.OrderId,
+                        orderId: row.OrderId,
                     };
                     let postdata = qs.stringify(param);
                     OrderCancelByManager(postdata).then(res => {
@@ -1476,6 +1479,7 @@
     .pull-right {
         float: right;
     }
+
     .lessons {
         padding: 1px 7px;
         border-radius: 250px;