线上和直播，看课

.env.development

@@ -33,7 +33,7 @@ VUE_APP_HSY_SPACE = myhk-2114522511
 #直播解码路径
 LIVE_PATH = /live
 
-VUE_APP_LIVE_WS_URL = ws://127.0.0.1:7114/ws
+VUE_APP_LIVE_WS_URL = ws://ws.moonxiang.com/ws
 
 
 # 开发环境配置

.env.prod-bjczwh

@@ -30,6 +30,8 @@ VUE_APP_VIDEO_LINE_2 = https://czwhobs.ylrztop.com
 # 开发环境配置
 ENV = 'production'
 
+VUE_APP_LIVE_WS_URL = ws://ws.moonxiang.com/ws
+
 # FS管理系统/开发环境
 VUE_APP_BASE_API = '/prod-api'
 

src/api/course/courseWatchLog.js

@@ -4,8 +4,8 @@ import request from '@/utils/request'
 export function listCourseWatchLog(query) {
   return request({
     url: '/course/courseWatchLog/list',
-    method: 'POST',
-    data: query
+    method: 'get',
+    params: query
   })
 }
 

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -770,22 +770,28 @@
     >
       <span slot="footer" class="dialog-footer">
         <!-- 小程序Appid选择 -->
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
           <el-form-item label="小程序:" prop="miniAppId">
-        <el-select
-          v-model="ruleForm.miniAppId"
-          clearable
-          placeholder="请选择发货小程序"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in miniAppList"
-            :key="item.appId"
-            :label="item.appName"
-            :value="item.appId"
-          />
-        </el-select>
-      </el-form-item>
+            <el-select
+              v-model="ruleForm.miniAppId"
+              clearable
+              placeholder="请选择发货小程序"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in miniAppList"
+                :key="item.appId"
+                :label="item.appName"
+                :value="item.appId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发货类型:" prop="shipmentType">
+            <el-radio-group v-model="ruleForm.shipmentType">
+              <el-radio :label="1">线上发货</el-radio>
+              <el-radio :label="4">用户自提（默认）</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </el-form>
 
         <el-upload ref="upload" :action="uploadUrl" :auto-upload="false" :disabled="orderUpload.isUploading" :headers="orderUpload.headers"
@@ -1257,6 +1263,9 @@ export default {
         miniAppId: [
           { required: true, message: '发货小程序不能为空' }
         ],
+        shipmentType: [
+          { required: true, message: '发货类型不能为空' }
+        ],
       },
       upload: {
         // 是否显示弹出层（用户导入）
@@ -1288,6 +1297,7 @@ export default {
       miniAppList: [],
       ruleForm:{
         miniAppId: null,
+        shipmentType: 4, 
       },
       productQuery: {
         pageNum:1,
@@ -1302,7 +1312,9 @@ export default {
     uploadUrl() {
       return process.env.VUE_APP_BASE_API +
         '/store/store/storeOrder/importDeliveryNoteExpress?miniAppId=' +
-        this.ruleForm.miniAppId;
+        this.ruleForm.miniAppId +
+        '&shipmentType=' +
+        this.ruleForm.shipmentType;
     }
   },
   created() {
@@ -2450,6 +2462,7 @@ export default {
     //打开发货单
     openDeliveryNote() {
       this.deliveryNoteOpen = true
+      this.ruleForm.shipmentType = 4
       this.getAppList();
     },
     handleClose(done) {
@@ -2498,6 +2511,8 @@ export default {
     //取消重置
     cancelResetDeliveryNote(){
       this.deliveryNoteOpen = false;
+      this.ruleForm.miniAppId = null;
+      this.ruleForm.shipmentType = 4;
       this.resetForm('ruleForm')
     },
     getProduct(value){

src/views/hisStore/storeOrder/index.vue

@@ -848,22 +848,28 @@
     >
       <span slot="footer" class="dialog-footer">
         <!-- 小程序Appid选择 -->
-        <el-form ref="ruleForm" :model="ruleForm" :rules="rules" class="demo-ruleForm" label-width="100px">
+        <el-form ref="ruleForm" :model="ruleForm" :rules="rules" class="demo-ruleForm" label-width="120px">
           <el-form-item label="小程序:" prop="miniAppId">
-        <el-select
-          v-model="ruleForm.miniAppId"
-          clearable
-          placeholder="请选择发货小程序"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in miniAppList"
-            :key="item.appId"
-            :label="item.appName"
-            :value="item.appId"
-          />
-        </el-select>
-      </el-form-item>
+            <el-select
+              v-model="ruleForm.miniAppId"
+              clearable
+              placeholder="请选择发货小程序"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in miniAppList"
+                :key="item.appId"
+                :label="item.appName"
+                :value="item.appId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发货类型:" prop="shipmentType">
+            <el-radio-group v-model="ruleForm.shipmentType">
+              <el-radio :label="1">线上发货</el-radio>
+              <el-radio :label="4">用户自提（默认）</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </el-form>
 
         <el-upload ref="upload" :action="uploadUrl" :auto-upload="false" :disabled="orderUpload.isUploading"
@@ -1340,6 +1346,9 @@ export default {
         miniAppId: [
           { required: true, message: '发货小程序不能为空' }
         ],
+        shipmentType: [
+          { required: true, message: '发货类型不能为空' }
+        ],
       },
       upload: {
         // 是否显示弹出层（用户导入）
@@ -1370,7 +1379,8 @@ export default {
       deliveryNoteOpen: false,
       miniAppList: [],
       ruleForm: {
-        miniAppId: null
+        miniAppId: null,
+        shipmentType: 4 
       },
       productQuery: {
         pageNum:1,
@@ -1385,7 +1395,9 @@ export default {
     uploadUrl() {
       return process.env.VUE_APP_BASE_API +
         '/store/store/storeOrder/importDeliveryNoteExpress?miniAppId=' +
-        this.ruleForm.miniAppId;
+        this.ruleForm.miniAppId +
+        '&shipmentType=' +
+        this.ruleForm.shipmentType;
     }
   },
   created() {
@@ -2562,6 +2574,7 @@ export default {
     //打开发货单
     openDeliveryNote() {
       this.deliveryNoteOpen = true
+      this.ruleForm.shipmentType = 4
       this.getAppList()
     },
     handleClose(done) {
@@ -2612,6 +2625,8 @@ export default {
     //取消重置
     cancelResetDeliveryNote(){
       this.deliveryNoteOpen = false;
+      this.ruleForm.miniAppId = null;
+      this.ruleForm.shipmentType = 4;
       this.resetForm('ruleForm')
     },
     getProduct(value){