邮寄

src/components/dataReview/index.vue

@@ -357,7 +357,7 @@ export default {
                     `
           本产品（或服务）提供【${this.activeData.goodsName}】课程的在线学习功能，为使用这些功能，我们需要使用您设备上的摄像头，并收集以下个人信息：
          ${str}
-          学习详细记录。
+          ,学习详细记录。
           我们会将上述信息提供至广东省建设执业注册管理中心等第三方组织使用，用于继续教育备案等。如果您拒绝，将导致这些功能无法实现，但不影响您使用本产品（或服务）的其他业务功能。
         `,
                     "提示",

src/components/footer2/index.vue

@@ -29,15 +29,15 @@
       </div>
       <div class="rg">
         <div v-if="consultPc.h5Status == 1 && consultPc.h5Sync.includes(1)">
-          <p>扫码移动端</p>
+          <p>移动端</p>
           <img :src="$tools.splitImgHost(consultPc.h5Img)" alt="" />
         </div>
         <div v-if="consultPc.appletStatus == 1 && consultPc.appletSync.includes(1)">
-          <p>扫码小程序</p>
+          <p>小程序</p>
           <img :src="$tools.splitImgHost(consultPc.appletImg)" alt="" />
         </div>
         <div v-if="consultPc.accountsStatus == 1 && consultPc.accountsSync.includes(1)">
-          <p>关注公众号</p>
+          <p>公众号</p>
           <img :src="$tools.splitImgHost(consultPc.accountsImg)" alt="" />
         </div>
       </div>

src/components/header2/index.vue

@@ -132,7 +132,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(["header","nav", "userInfo", "msgCount"]),
+    ...mapGetters(["header", "nav", "userInfo", "msgCount"]),
 
     showNav: function() {
       return function(list) {
@@ -337,12 +337,12 @@ export default {
       }
     },
     go(path, query) {
-      if (path === this.$route.path) {
-        this.$router.push({
-          path: "refresh" //refresh路由地址和当前要刷新路由地址同级即可
-        });
-        return;
-      }
+      // if (path === this.$route.path) {
+      //   this.$router.push({
+      //     path: "refresh" //refresh路由地址和当前要刷新路由地址同级即可
+      //   });
+      //   return;
+      // }
       this.$router.push({
         path,
         query
@@ -506,7 +506,7 @@ export default {
 .el-select-dropdown__item:hover {
   color: #007aff;
 }
-.el-dropdown-menu__item:hover{
+.el-dropdown-menu__item:hover {
   color: #007aff !important;
 }
 </style>

src/components/toolbar/index.vue

@@ -13,7 +13,7 @@
             style="text-align: center;color: #222;margin-top: 6px;"
             class="text"
           >
-            扫码移动端
+            移动端
           </div>
         </div>
         <div v-if="consultPc.appletStatus == 1">
@@ -26,7 +26,7 @@
             style="text-align: center;color: #222;margin-top: 6px;"
             class="text"
           >
-            扫码小程序
+            小程序
           </div>
         </div>
         <div v-if="consultPc.accountsStatus == 1">
@@ -39,7 +39,7 @@
             style="text-align: center;color: #222;margin-top: 6px;"
             class="text"
           >
-            关注公众号
+            公众号
           </div>
         </div>
       </div>

src/pages/cart/index.vue

@@ -88,6 +88,10 @@
                           :key="item.gradeId"
                           :label="item.className"
                           :value="item.gradeId"
+                          :disabled="
+                            item.studentNum > 0 &&
+                              item.studentNum == item.studentUpper
+                          "
                         >
                         </el-option>
                       </el-select>
@@ -146,7 +150,9 @@
               width="120"
             >
               <template slot-scope="scope">
-                <a class="goods_price"> ￥{{ scope.row.standPrice | formatPrice }} </a>
+                <a class="goods_price">
+                  ￥{{ scope.row.standPrice | formatPrice }}
+                </a>
                 <div class="goods_price" v-if="scope.row.goodsStatus == 0">
                   该商品已下架
                 </div>
@@ -283,7 +289,20 @@ export default {
               };
 
               row.gradeList.push(item);
-            }
+            }else {
+                let isGradeFull = row.gradeList.every(
+                  item =>
+                    item.studentNum > 0 && item.studentNum == item.studentUpper
+                );
+                //所有班级都满了
+                if (isGradeFull) {
+                  let item = {
+                    className: "系统分班",
+                    gradeId: 0
+                  };
+                  row.gradeList.unshift(item);
+                }
+              }
           });
         }
       } else if (type == "apply") {

src/pages/login/index.vue

@@ -2,10 +2,10 @@
   <div class="reg">
     <header class="header">
       <div class="container">
-        <div @click="go('/')" class="hasLogo" v-if="header.companyLogo">
+        <div @click="go('/')" class="hasLogo" v-if="header.routinelogo">
           <img
             style="max-width: 300px; max-height: 61px"
-            :src="$tools.splitImgHost(header.companyLogo)"
+            :src="$tools.splitImgHost(header.routinelogo)"
             alt=""
           />
         </div>

src/pages/payment/index.vue

@@ -25,12 +25,44 @@
                 :key="goodsIndex"
               >
                 商品名称：{{ goodsItem.goodsName }}
-                <span>应付金额：{{ goodsItem.standPrice | formatPrice }}元</span>
+                <span
+                  >应付金额：{{ goodsItem.standPrice | formatPrice }}元</span
+                >
                 <Class-time-tip :gradeId="goodsItem.gradeId"></Class-time-tip>
               </div>
             </div>
           </div>
-
+          <div
+            class="payment-way"
+            v-if="checkGoodsList.some(i => i.mailSign == 1) && !orderSn"
+          >
+            <h4 style="margin: 14px 28px;">收件信息：</h4>
+            <el-form
+              :model="ruleForm"
+              :rules="rules"
+              ref="ruleForm"
+              label-width="100px"
+              class="demo-ruleForm"
+            >
+              <el-form-item label="收件人" prop="consignee">
+                <el-input
+                  style="width:300px"
+                  v-model="ruleForm.consignee"
+                ></el-input> </el-form-item
+              ><el-form-item label="手机号码" prop="consigneePhone">
+                <el-input
+                  style="width:300px"
+                  v-model="ruleForm.consigneePhone"
+                ></el-input> </el-form-item
+              ><el-form-item label="收件地址" prop="consigneeSite">
+                <el-input
+                  style="width:300px"
+                  type="textarea"
+                  :rows="3"
+                  v-model="ruleForm.consigneeSite"
+                ></el-input> </el-form-item
+            ></el-form>
+          </div>
           <div class="payment-way">
             <ul>
               <li :class="{ active: radio == 1 }">
@@ -105,7 +137,31 @@ export default {
     updateUserInfo
   },
   data() {
+    const validateTel = (rule, value, callback) => {
+      var reg = /^1[34578][0-9]{9}$/;
+      if (!reg.test(value)) {
+        return callback(new Error("请输入正确手机号码"));
+      } else {
+        callback();
+      }
+    };
     return {
+      ruleForm: {
+        consignee: "",
+        consigneePhone: "",
+        consigneeSite: ""
+      },
+      rules: {
+        consignee: [
+          { required: true, message: "请输入收件人", trigger: "blur" }
+        ],
+        consigneePhone: [
+          { required: true, validator: validateTel, trigger: "blur" }
+        ],
+        consigneeSite: [
+          { required: true, message: "请输入收件地址", trigger: "blur" }
+        ]
+      },
       lastTime: 60,
       radio: "1",
       qrCodeShow: false,
@@ -146,6 +202,13 @@ export default {
       } else if (checkGoodsList) {
         this.checkGoodsList = JSON.parse(checkGoodsList);
         this.caculate();
+        this.ruleForm.consignee = this.$store.state.userInfo.realname || "";
+        this.ruleForm.consigneePhone =
+          this.$store.state.userInfo.telphone || "";
+        this.ruleForm.consigneeSite = "";
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate();
+        });
       }
     }
   },
@@ -264,9 +327,21 @@ export default {
       } catch (_) {
         return;
       }
+      if (this.checkGoodsList.some(i => i.mailSign == 1) && !this.orderSn) {
+        var DontStatus = false;
+        this.$refs["ruleForm"].validate(valid => {
+          if (valid) {
+            DontStatus = false;
+          } else {
+            DontStatus = true;
+            console.log("error submit!!");
+            return false;
+          }
+        });
+        if (DontStatus) return;
+      }
       if (this.radio == 1) {
         //微信
-
         this.loading = this.$loading({
           lock: true,
           text: "支付中",
@@ -287,8 +362,16 @@ export default {
     },
 
     orderPlacePcOrder() {
+      let checkGoodsList = this.checkGoodsList.map(i => {
+        if (i.mailSign == 1) {
+          let ij = JSON.parse(JSON.stringify(i))
+          return {...this.ruleForm,...ij}
+        } else {
+          return i;
+        }
+      });
       this.$request
-        .orderPlacePcOrder({ goodsList: this.checkGoodsList })
+        .orderPlacePcOrder({ goodsList: checkGoodsList })
         .then(res => {
           this.loading.close();
           localStorage.removeItem("checkGoodsList");

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

@@ -78,7 +78,11 @@
       <el-table-column label="商品信息" width="240" header-align="center">
         <template slot-scope="scope">
           <p>
-            商品类型：{{
+            {{
+              $store.state.TENANT_NANE == "480813706424615769"
+                ? "课程类型"
+                : "商品类型"
+            }}：{{
               scope.row.goodsType == 1
                 ? "课程"
                 : scope.row.goodsType == 2
@@ -170,7 +174,8 @@
             @click="refundFunc(scope.row)"
             :disabled="
               !(
-                (scope.row.payStatus == 1 && scope.row.refundStatus != 0) &&
+                scope.row.payStatus == 1 &&
+                scope.row.refundStatus != 0 &&
                 scope.row.realPrice != 0
               )
             "
@@ -240,7 +245,10 @@ export default {
       formSet: [
         {
           prop: "goodsType",
-          placeholder: "商品类型",
+          placeholder:
+            this.$store.state.TENANT_NANE == "480813706424615769"
+              ? "课程类型"
+              : "商品类型",
           scope: "select",
           options: [
             {

src/pages/person-center/handle-order/invoice.vue

@@ -113,7 +113,7 @@
           </h2>
           <ul class="ul_">
             <li>
-              商品类型：<span>{{
+              {{$store.state.TENANT_NANE == '480813706424615769' ? '课程类型': "商品类型"}}：<span>{{
                 orderInfo.goodsType == 1
                   ? "课程"
                   : orderInfo.goodsType == 2

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

@@ -23,7 +23,13 @@
       <div>
         <el-steps :active="active" finish-status="success" simple>
           <el-step title="选择类别"></el-step>
-          <el-step title="商品匹配"></el-step>
+          <el-step
+            :title="
+              $store.state.TENANT_NANE == '480813706424615769'
+                ? '课程匹配'
+                : '商品匹配'
+            "
+          ></el-step>
           <el-step title="支付选择"></el-step>
           <el-step title="完成"></el-step>
         </el-steps>

src/pages/person-center/handle-order/order/step-0.vue

@@ -2,7 +2,7 @@
   <div id="edu_id">
     <el-select
       v-model="apiData.goodsType"
-      placeholder="商品类型"
+      :placeholder="$store.state.TENANT_NANE == '480813706424615769' ? '课程类型': '商品类型'"
       @change="changeType"
     >
       <el-option

src/pages/person-center/handle-order/order/step-1/goodsCheckBox.vue

@@ -118,7 +118,7 @@ export default {
         projectId: apiData.projectId,
         businessId: apiData.businessId,
         subjectId: "",
-        showStatus: 1,
+        showStatus: 0,
         goodsStatus: 1,
         withNotSpec:1
       };

src/pages/person-center/handle-order/order/step-2/index.vue

@@ -7,7 +7,11 @@
       </h2>
       <ul class="ul_">
         <li>
-          商品类型：<span>{{
+          {{
+            $store.state.TENANT_NANE == "480813706424615769"
+              ? "课程类型"
+              : "商品类型"
+          }}：<span>{{
             orderInfo.goodsType == 1
               ? "课程"
               : orderInfo.goodsType == 2
@@ -117,7 +121,7 @@
 import orderDetail from "../../orderDetail.vue";
 import publicTransfer from "./publicTransfer.vue";
 export default {
-  components: { publicTransfer,orderDetail },
+  components: { publicTransfer, orderDetail },
   data() {
     return {
       orderInfo: {},

src/pages/person-center/handle-order/orderDetail.vue

@@ -39,7 +39,7 @@
           <el-descriptions-item label="通过时间">
             {{ $tools.timestampToTime(orderInfo.payTime, false) }}
           </el-descriptions-item>
-          <el-descriptions-item label="商品类型">
+          <el-descriptions-item :label="$store.state.TENANT_NANE == '480813706424615769' ? '课程类型': '商品类型'">
             {{
               orderInfo.goodsType == 1
                 ? "课程"

src/pages/person-center/handle-order/refundFunc.vue

@@ -21,7 +21,7 @@
         </div>
       </div>
       <div class="top">
-        商品类型：<span>{{
+        {{$store.state.TENANT_NANE == '480813706424615769' ? '课程类型': '商品类型'}}：<span>{{
           orderInfo.goodsType == 1
             ? "课程"
             : orderInfo.goodsType == 2

src/pages/person-center/index.vue

@@ -29,15 +29,15 @@
             </div>
             <div class="img_x" v-if="consultPc.h5Status == 1 && consultPc.h5Sync.includes(2)">
               <img :src="$tools.splitImgHost(consultPc.h5Img)" alt="" />
-              <p>扫码移动端</p>
+              <p>移动端</p>
             </div>
             <div class="img_x" v-if="consultPc.appletStatus == 1 && consultPc.appletSync.includes(2)">
               <img :src="$tools.splitImgHost(consultPc.appletImg)" alt="" />
-              <p>扫码小程序</p>
+              <p>小程序</p>
             </div>
             <div class="img_x" v-if="consultPc.accountsStatus == 1 && consultPc.accountsSync.includes(2)">
               <img :src="$tools.splitImgHost(consultPc.accountsImg)" alt="" />
-              <p>扫码公众号</p>
+              <p>公众号</p>
             </div>
           </div>
         </div>

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

@@ -77,7 +77,10 @@
                   >
                     申请退款
                   </div>
-                  <div class="state" v-if="items.periodStatus > -3 && item.orderFrom != 11">
+                  <div
+                    class="state"
+                    v-if="items.periodStatus > -3 && item.orderFrom != 11"
+                  >
                     {{ periodStatusName(items.periodStatus) }}
                   </div>
                 </div>
@@ -181,6 +184,65 @@
         </div>
       </div>
     </div>
+    <el-dialog
+      :visible.sync="visible"
+      width="400px"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :lock-scroll="true"
+    >
+      <div slot="title" class="hearders">
+        <div class="leftTitle">确定申请退款吗？</div>
+        <div class="rightBoxs">
+          <img
+            src="@/assets/img/Close@2x.png"
+            alt=""
+            @click="visible = false"
+          />
+        </div>
+      </div>
+      <div>
+        <el-form
+          :model="ruleForm"
+          :rules="rules"
+          ref="ruleForm"
+          label-width="0px"
+          class="demo-ruleForm"
+        >
+          <el-form-item label="" prop="refundOptionsIndex">
+            <el-select
+              style="width:360px"
+              v-model="ruleForm.refundOptionsIndex"
+              placeholder="请选择退款原因"
+            >
+              <el-option
+                v-for="item in refundOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select> </el-form-item
+          ><el-form-item
+            label=""
+            prop="refundReason"
+            v-if="ruleForm.refundOptionsIndex == 5"
+            ><el-input
+              type="textarea"
+              :rows="3"
+              style="width:360px"
+              v-model="ruleForm.refundReason"
+              placeholder="请输入退款原因"
+            ></el-input></el-form-item
+        ></el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="submitRefund('ruleForm')"
+          >提交</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -190,6 +252,27 @@ export default {
   name: "MyOrder",
   data() {
     return {
+      refundOptions: [
+        { label: "已学过，重复报名", value: 1 },
+        { label: "报错专业/课程", value: 2 },
+        { label: "班级未开班", value: 3 },
+        { label: "培训/继教周期未到", value: 4 },
+        { label: "其他", value: 5 }
+      ],
+      activeItem:{},
+      ruleForm: {
+        refundOptionsIndex: "",
+        refundReason: ""
+      },
+      rules: {
+        refundOptionsIndex: [
+          { required: true, message: "选择退款原因", trigger: "change" }
+        ],
+        refundReason: [
+          { required: true, message: "输入退款原因", trigger: "blur" }
+        ]
+      },
+      visible: false,
       orderList: [],
       activeName: "1",
       formData: {
@@ -355,8 +438,54 @@ export default {
         }
       });
     },
-
+    submitRefund(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          this.showLoading();
+          this.$request
+            .refundSmallOrder({
+              orderSn: this.activeItem.orderSn,
+              goodsId: this.activeItem.goodsId,
+              orderGoodsId: this.activeItem.orderGoodsId,
+              applyReason:
+                this.ruleForm.refundOptionsIndex == 5
+                  ? this.ruleForm.refundReason
+                  : this.refundOptions[this.ruleForm.refundOptionsIndex - 1].label
+            })
+            .then(res => {
+              this.visible = false
+              this.hideLoading();
+              this.$message({
+                type: "success",
+                message: "申请退款成功"
+              });
+              this.getOrderNum();
+              this.getOrderList();
+            })
+            .catch(err => {
+              this.hideLoading();
+              this.$message({
+                type: "warning",
+                message: err.msg
+              });
+            });
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
     refund(orderSn, item) {
+      this.activeItem = item;
+      this.ruleForm = {
+        refundOptionsIndex: "",
+        refundReason: ""
+      };
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate();
+      });
+      return;
       this.$prompt("确定要退款吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -517,6 +646,49 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped lang="scss">
+/deep/ .el-dialog {
+  border-radius: 8px !important;
+  .el-dialog__header {
+    padding: 0;
+    .hearders {
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0px 18px 0px 20px;
+      border-bottom: 1px solid #e2e2e2;
+      .leftTitle {
+        font-size: 14px;
+        font-weight: bold;
+        color: #2f4378;
+      }
+      .rightBoxs {
+        display: flex;
+        align-items: center;
+        img {
+          width: 14px;
+          height: 14px;
+          margin-left: 13px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+  .el-dialog__footer {
+    padding: 0;
+    .dialog-footer {
+      padding: 0px 40px;
+      height: 70px;
+      border-top: 1px solid #e2e2e2;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+    }
+  }
+}
+/deep/.el-button {
+  border-radius: 8px;
+}
 .my-order {
   &__header {
     /deep/ .el-tabs__header {