Merge branch 'five-second-add' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into six

src/utils/request.js

@@ -15,7 +15,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 /**
  * @remard 测试地址
  */
-export const baseURL = 'http://192.168.1.24:5030/'
+export const baseURL = 'http://192.168.1.222:5030/'
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

src/views/Marketing/goods/commodityManageMent/add/index.vue

@@ -251,6 +251,17 @@
                 @change="changeDataTime(listData.timeArrays)"
               >
               </el-date-picker>
+              <el-tooltip class="item" effect="dark" placement="right">
+                <div slot="content">
+                  商品学习有效期：商品可以进行售卖的有效时间范围<br />
+                  1.非时间范围，不可以上架进行售卖；<br />
+                  2.到了结束日期，不需要人为操作，系统自动下架商品
+                </div>
+                <i
+                  style="margin-left: 10px; font-size: 20px; color: #e6a23c"
+                  class="el-icon-warning"
+                ></i>
+              </el-tooltip>
             </el-form-item>
           </el-form>
         </el-col>
@@ -523,7 +534,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item
-          class="positions"
+            class="positions"
             label="学习服务期"
             style="margin-top: 12px"
             :prop="
@@ -827,7 +838,7 @@
         </div>
       </div>
       每天最多学习<el-input
-        style="width: 60px;margin:0px 10px;"
+        style="width: 60px; margin: 0px 10px"
         size="mini"
         v-model="everyDaystyleNum"
       />节视频
@@ -3557,7 +3568,7 @@ export default {
   justify-content: center;
   align-items: center;
 }
-/deep/ .positions > .el-form-item__content > .el-form-item__error{
-  left:341px;
+/deep/ .positions > .el-form-item__content > .el-form-item__error {
+  left: 341px;
 }
 </style>

src/views/Marketing/goods/commodityManageMent/edit/index.vue

@@ -254,6 +254,17 @@
                 @change="changeDataTime(listData.timeArrays)"
               >
               </el-date-picker>
+              <el-tooltip class="item" effect="dark" placement="right">
+                <div slot="content">
+                  商品学习有效期：商品可以进行售卖的有效时间范围<br />
+                  1.非时间范围，不可以上架进行售卖；<br />
+                  2.到了结束日期，不需要人为操作，系统自动下架商品
+                </div>
+                <i
+                  style="margin-left: 10px; font-size: 20px; color: #e6a23c"
+                  class="el-icon-warning"
+                ></i>
+              </el-tooltip>
             </el-form-item>
           </el-form>
         </el-col>
@@ -530,7 +541,7 @@
           </el-form-item>
 
           <el-form-item
-          class="positions"
+            class="positions"
             label="学习服务期"
             style="margin-top: 12px"
             :prop="
@@ -839,7 +850,7 @@
         </div>
       </div>
       每天最多学习<el-input
-        style="width: 60px;margin:10px;"
+        style="width: 60px; margin: 10px"
         size="mini"
         v-model="everyDaystyleNum"
       />节视频
@@ -3778,7 +3789,7 @@ export default {
     margin: 5px 0px;
   }
 }
-/deep/ .positions > .el-form-item__content > .el-form-item__error{
-  left:341px;
+/deep/ .positions > .el-form-item__content > .el-form-item__error {
+  left: 341px;
 }
 </style>

src/views/Marketing/order/offlineOrder/batchRecord/secondStep/setGoodsList.vue

@@ -3,7 +3,7 @@
     <el-dialog
       @closed="loadingClose"
       :visible.sync="dialogCG"
-      width="660px"
+      width="760px"
       :show-close="false"
       :close-on-click-modal="false"
       class="dialogNew"
@@ -42,7 +42,8 @@
               </ul>
             </ul>
           </el-col>
-          <el-col :span="18">
+
+          <el-col :span="18" v-if="active">
             <div>
               <el-input
                 :size="size"
@@ -73,7 +74,7 @@
             </div>
             <ul
               style="
-                max-height: 240px;
+                max-height: 462px;
                 overflow: auto;
                 background: #eee;
                 margin-top: 10px;
@@ -94,6 +95,11 @@
               </li>
             </ul>
           </el-col>
+          <el-col :span="18" v-else>
+            <div style="margin-top: 14px; text-align: center">
+              请选择左侧商品类型
+            </div>
+          </el-col>
         </el-row>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -207,6 +213,8 @@ export default {
     activeLi(subjectId, type) {
       if (this.active == `${subjectId}-${type}`) return;
       this.active = `${subjectId}-${type}`;
+      this.goodsName = "";
+      this.goodsPrice = "";
       this.searchData();
     },
     searchData() {

src/views/Marketing/order/orderList/details/goodsManage.vue

@@ -115,6 +115,56 @@
                   end-placeholder="结束日期"
                 >
                 </el-date-picker>
+                <div v-else-if="item.scope === 'studentTime'">
+                  <el-select
+                    disabled
+                    style="width: 150px"
+                    v-model="goodsData.serviceTimeType"
+                    placeholder="请选择学习服务器类型"
+                  >
+                    <el-option
+                      v-for="(item, index) in styleType"
+                      :key="index"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                  <span
+                    v-if="
+                      goodsData.serviceTimeType === 1 ||
+                      goodsData.serviceTimeType === 2 ||
+                      goodsData.serviceTimeType === 3
+                    "
+                    ><span style="margin: 0px 6px">购买那刻开始计算</span
+                    ><el-input
+                      disabled
+                      style="width: 60px"
+                      v-model="goodsData.serviceTimeNum"
+                    ></el-input
+                    ><span style="margin-left: 6px">{{
+                      goodsData.serviceTimeType === 1
+                        ? "年"
+                        : goodsData.serviceTimeType === 2
+                        ? "月"
+                        : goodsData.serviceTimeType === 3
+                        ? "天"
+                        : ""
+                    }}</span></span
+                  >
+
+                  <el-date-picker
+                    disabled
+                    v-if="goodsData.serviceTimeType === 4"
+                    v-model="goodsData.studyTimeArrays"
+                    type="datetimerange"
+                    value-format="timestamp"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </div>
                 <el-input
                   disabled
                   v-else-if="item.scope === 'yecj'"
@@ -179,11 +229,12 @@
           </el-col>
         </el-row>
         <div class="fgx"></div>
-        <el-form-item label="订单商品状态" prop="status" v-if="ISADMIN">
-          <el-radio-group v-model="listData.status">
-            <el-radio :label="0">关闭</el-radio>
-            <el-radio :label="1">正常</el-radio>
-            <el-radio :label="-1">有退款</el-radio>
+        <el-form-item label="订单状态" prop="orderGoodsStatus" v-if="ISADMIN">
+          <el-radio-group v-model="listData.orderGoodsStatus" disabled>
+            <el-radio :label="-1">关闭</el-radio>
+            <el-radio :label="0">待支付</el-radio>
+            <el-radio :label="1">已支付</el-radio>
+            <el-radio :label="2">已退款</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="订单备注" prop="remark">
@@ -207,7 +258,25 @@ import { mapGetters } from "vuex";
 export default {
   data() {
     return {
-      ISADMIN: false,
+      styleType: [
+        {
+          label: "按年限",
+          value: 1,
+        },
+        {
+          label: "按月限",
+          value: 2,
+        },
+        {
+          label: "按天限",
+          value: 3,
+        },
+        {
+          label: "按具体时间区间",
+          value: 4,
+        },
+      ],
+      ISADMIN: true,
       tableSet: [
         {
           label: "费用类型",
@@ -219,7 +288,9 @@ export default {
         },
       ],
       goodsData: {}, //商品信息---部分
-      listData: {},
+      listData: {
+        serviceTimeType: "",
+      },
       options: [],
       optionsType: [
         {
@@ -322,7 +393,7 @@ export default {
         {
           label: "学习服务期",
           prop: "studentTime",
-          scope: "startEndTime",
+          scope: "studentTime",
         },
       ],
       lists2: [
@@ -399,10 +470,12 @@ export default {
           this.$methodsTools.time10to13(res.data.validityStartTime, 2),
           this.$methodsTools.time10to13(res.data.validityEndTime, 2),
         ];
-        res.data.studentTime = [
-          this.$methodsTools.time10to13(res.data.validityStartTime, 2),
-          this.$methodsTools.time10to13(res.data.validityEndTime, 2),
-        ];
+        if (res.data.serviceTimeType === 4) {
+          res.data.studyTimeArrays = [
+            this.$methodsTools.time10to13(res.data.serviceStartTime, 2),
+            this.$methodsTools.time10to13(res.data.serviceEndTime, 2),
+          ];
+        }
         res.data.standPriceJson = JSON.parse(res.data.standPriceJson);
         this.goodsData = res.data;
       });
@@ -415,13 +488,13 @@ export default {
           this.listData = res.data;
           this.$refs["listData"].resetFields();
         });
-      this.$api.obtainOrder(this.$route.query.orderId).then((res) => {
-        if (res.data.createSysUserId === this.$store.state.user.userId) {
-          this.ISADMIN = true;
-        } else {
-          this.ISADMIN = false;
-        }
-      });
+      // this.$api.obtainOrder(this.$route.query.orderId).then((res) => {
+      //   if (res.data.createSysUserId === this.$store.state.user.userId) {
+      //     this.ISADMIN = true;
+      //   } else {
+      //     this.ISADMIN = false;
+      //   }
+      // });
     },
   },
 };

src/views/Marketing/order/orderList/details/index.vue

@@ -10,6 +10,9 @@
       <el-tab-pane label="收费信息" name="chargeInfo"
         ><cost-price-manages
       /></el-tab-pane>
+      <el-tab-pane label="退款信息" name="refundOrder"
+        ><refund-order
+      /></el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -18,9 +21,15 @@
 import goodsManage from "./goodsManage.vue";
 import studentManageOrder from "./studentManageOrder.vue";
 import costPriceManages from "./costPriceManages.vue";
+import refundOrder from "./refundOrder.vue";
 export default {
-  name:"OrderDetail",
-  components: { goodsManage, studentManageOrder, costPriceManages },
+  name: "OrderDetail",
+  components: {
+    goodsManage,
+    studentManageOrder,
+    costPriceManages,
+    refundOrder,
+  },
   data() {
     return {
       activeName: "commodInfo",

src/views/Marketing/order/orderList/details/refundOrder.vue

@@ -0,0 +1,52 @@
+<template>
+  <div id="refundOrder">
+    <el-row :gutter="20" style="background-color: #eee">
+      <el-form>
+        <el-col :span="8">
+          <el-form-item label="付款方式">
+            <el-input disabled value="微信"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="付款凭证">
+            <el-input disabled v-model="listInfos.wxpayRefundId"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="付款时间">
+            <el-input
+              disabled
+              :value="$methodsTools.onlyForma(listInfos.refundTime)"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      listInfos: {},
+    };
+  },
+  mounted() {
+    this.$api
+      .inquireorderrefundlist({
+        orderGoodsId: this.$route.query.orderGoodsId,
+        userId: this.$route.query.userId,
+      })
+      .then((res) => {
+        if (res.rows.length) {
+          this.listInfos = res.rows[0];
+        }
+      });
+  },
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+</style>

src/views/Marketing/order/orderList/index.vue

@@ -138,12 +138,12 @@ export default {
           ],
         },
         {
-          prop: "orderSn",
-          placeholder: "请输入订单编号",
+          prop: "searchKey",
+          placeholder: "订单编码/商品名称/学员姓名/身份证",
         },
       ],
       formData: {
-        orderFroms:"2,3,4",
+        orderFroms: "2,3,4",
         goodsType: "",
         pageSize: 10,
         pageNum: 1,
@@ -222,7 +222,7 @@ export default {
         },
         {
           label: "支付状态",
-          prop: "payStatus",
+          prop: "goodsPayStatus",
           hidden: true,
           scope: "isOptions",
           options: [
@@ -238,6 +238,34 @@ export default {
               label: "完全收费",
               value: 3,
             },
+            {
+              label: "免费",
+              value: 4,
+            },
+          ],
+        },
+        {
+          label: "订单状态",
+          prop: "orderGoodsStatus",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "关闭",
+              value: -1,
+            },
+            {
+              label: "待支付",
+              value: 0,
+            },
+            {
+              label: "已支付",
+              value: 1,
+            },
+            {
+              label: "已退款",
+              value: 2,
+            },
           ],
         },
         {
@@ -282,19 +310,27 @@ export default {
           ],
         },
         {
-          label: "订单状态",
-          prop: "status",
+          label: "发票状态",
+          prop: "invoiceStatus",
           hidden: true,
           scope: "isOptions",
           options: [
             {
-              label: "无效",
-              value: 0,
+              label: "无",
+              value: null,
             },
             {
-              label: "有效",
+              label: "未开票",
               value: 1,
             },
+            {
+              label: "已开票",
+              value: 2,
+            },
+            {
+              label: "已退票",
+              value: -1,
+            },
           ],
         },
         {
@@ -369,7 +405,7 @@ export default {
       }
       if (int === 2) {
         this.formData = {
-          orderFroms:"2,3,4",
+          orderFroms: "2,3,4",
           goodsType: "",
           pageSize: 10,
           pageNum: 1,
@@ -440,6 +476,7 @@ export default {
             goodsId: v.goodsId,
             orderSn: v.orderSn,
             userId: v.userId,
+            orderGoodsId: v.orderGoodsId,
           },
         });
       };

src/views/education/classManageMent/classList/addClass/index.vue

@@ -27,7 +27,7 @@
           </el-form-item>
           <el-form-item label="学员上限" prop="studentUpper">
             <el-input-number
-              :max="300"
+              :max="1000000"
               :controls="false"
               v-model="listData.studentUpper"
               placeholder="请填写学员上限"

src/views/education/classManageMent/classList/manageClass/baseInfo.vue

@@ -47,7 +47,7 @@
             <el-form-item label="学员上限" prop="studentUpper">
               <el-input-number
                 :min="minNums"
-                :max="300"
+                :max="1000000"
                 :controls="false"
                 v-model="listData.studentUpper"
                 placeholder="请填写学员上限"