Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_pc into dev

src/components/toolbar/index.vue

@@ -8,7 +8,14 @@
     </div>
 
     <div class="item">
-      <img src="@/assets/qr.png" class="img" alt="" />
+      <el-popover placement="left" width="180" trigger="hover">
+        <img
+          style="width: 150px; height: 150px"
+          src="@/assets/xcxqrcode.jpg"
+          alt=""
+        />
+        <img slot="reference" src="@/assets/qr.png" class="img" alt="" />
+      </el-popover>
       <div class="text">二维码</div>
     </div>
 

src/pages/bank-list/index.vue

@@ -310,6 +310,10 @@ export default {
     getEducationTypeList() {
       this.$request.educationTypeList().then((res) => {
         this.typeList = res.rows;
+        if (!this.params.educationTypeId) {
+          this.params.educationTypeId = res.rows[0].id;
+          this.getBusinessList();
+        }
       });
     },
   },

src/pages/course-list/index.vue

@@ -307,9 +307,11 @@ export default {
     getEducationTypeList() {
       this.$request.educationTypeList().then((res) => {
         this.typeList = res.rows;
-
         if (this.params.educationTypeId) {
           this.getBusinessList();
+        }else{
+          this.params.educationTypeId = res.rows[0].id
+          this.getBusinessList();
         }
       });
     },

src/pages/goods-detail/bank-detail.vue

@@ -28,7 +28,7 @@
                     {{ goodsDetail.goodsName }}
                   </div>
                   <div class="price" v-if="goodsDetail.standPrice">
-                    ${{ goodsDetail.standPrice | toFixed }}
+                    ￥{{ goodsDetail.standPrice | toFixed }}
                   </div>
                   <div class="btns">
                     <div class="buynow" @click="buyNow">立即购买</div>

src/pages/goods-detail/course-detail.vue

@@ -32,7 +32,7 @@
                     {{ goodsDetail.classHours }}学时
                   </div>
                   <div class="price">
-                    ${{ goodsDetail.standPrice | toFixed }}
+                    ￥{{ goodsDetail.standPrice | toFixed }}
                   </div>
                   <div class="btns">
                     <div class="buynow" @click="buyNow()">立即购买</div>

src/pages/home/index.vue

@@ -743,8 +743,8 @@ export default {
               goodsList2.push(item);
             }
           });
-          this.goodsList1 = goodsList1;
-          this.goodsList2 = goodsList2;
+          this.goodsList1 = goodsList1.sort((a, b) => a.sort - b.sort);
+          this.goodsList2 = goodsList2.sort((a, b) => a.sort - b.sort);
         });
     },
     goCourse(item) {

src/pages/payment/index.vue

@@ -79,7 +79,7 @@
         </p>
         <p v-else>二维码已过期，点击图片重新获取二维码</p>
         <p>过期后请刷新重新获取二维码</p>
-        <p>客服电话：020-12345678</p>
+        <p>客服电话：020-87085982</p>
       </div>
     </el-dialog>
 

src/pages/person-center/my-order/index.vue

@@ -76,7 +76,7 @@
               <div class="price-wrap">
                 <div class="btns">
                   <div class="price-text">应付金额</div>
-                  <div class="price-number">${{ item.payPrice }}</div>
+                  <div class="price-number">￥{{ item.payPrice }}</div>
                 </div>
               </div>
               <div