Merge remote-tracking branch 'origin/master'

src/views/course/coursePlaySourceConfig/index.vue

@@ -152,6 +152,11 @@
           <dict-tag  :options="typesOptions" :value="scope.row.type"/>
         </template>
       </el-table-column>
+      <el-table-column label="授权方式" align="center" prop="authType">
+        <template slot-scope="scope">
+          <dict-tag  :options="authTypeOptions" :value="scope.row.authType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="互医/商城小程序" align="center" prop="isMall" width="80px">
         <template slot-scope="scope">
           <el-tag prop="isMall" v-for="(item, index) in isMallOptions" v-if="scope.row.isMall==item.dictValue">{{item.dictLabel}}</el-tag>
@@ -309,6 +314,17 @@
         <el-form-item label="图标" prop="img">
           <image-upload v-model="form.img" :file-type='["png", "jpg", "jpeg"]' :limit="1"/>
         </el-form-item>
+        <el-form-item label="授权方式" prop="authType">
+          <el-select
+            v-model="form.authType"
+            placeholder="请选择授权方式">
+            <el-option
+              v-for="item in authTypeOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="类型" prop="type">
           <el-select
             v-model="form.type"
@@ -341,7 +357,7 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="showOpenPlatformWarning">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -437,6 +453,7 @@ export default {
     return {
       sysPayModes: [],
       bindCurrentRow: {},
+      authTypeOptions: [],
       bindForm:{
         bindTitle: '绑定支付配置',
         bindShow: false,
@@ -516,6 +533,7 @@ export default {
       title: null,
       open: false,
       form: {
+        authType:'1',
         setCompanyIdList: []
       },
       bindRules:{
@@ -561,6 +579,9 @@ export default {
     }
   },
   created() {
+    this.getDicts("play_config_auth_type").then(response => {
+      this.authTypeOptions = response.data;
+    });
     this.getDicts("sys_pay_mode").then(response => {
       this.sysPayModes = response.data;
     });
@@ -584,6 +605,25 @@ export default {
       this.companyOptions = [];
       this.open = false;
     },
+    showOpenPlatformWarning() {
+      if (this.form.authType=='1'){
+        this.$confirm('必须绑定开放平台，否则会导致看课冲突。是否继续？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          // 用户点击确定，执行原有提交逻辑
+          this.submitForm()
+        }).catch(() => {
+          // 用户点击取消，停留在当前弹窗，不执行任何操作
+          // 可以在这里添加一些提示信息
+          console.log('用户取消提交')
+        })
+      }else {
+        this.submitForm()
+      }
+
+    },
     // 协议配置处理
     handleAgreement(row) {
       // 获取当前行的协议相关信息
@@ -817,7 +857,8 @@ export default {
       get(id).then(response => {
         this.form = {
           ...response.data,
-          type: response.data.type.toString()
+          type: response.data.type.toString(),
+          authType: response.data.authType ? response.data.authType.toString() : '1'
         }
         if(!!this.form.setCompanyIds){
            this.$set(