Merge branch '03/03Lebao' into dev

src/views/reaplceMusicPlayer/index.vue

@@ -353,7 +353,7 @@ export default {
             vaildTeachingUrl() +
             `/#/questionStatistics?o=${row.organId}&c=${row.cooperationOrganId}&id=${row.id}`;
         } else if(name == '缴费链接') {
-          str = vaildStudentUrl() + `/#/questionGoodsSale?` + encodeURIComponent(encode(`id=${row.id}`));
+          str = vaildStudentUrl() + `/#/questionGoodsSale?` + encodeURIComponent(encode(`rid=${row.id}`));
         }
         // vaildTeachingUrl
         // this.qrcode.makeCode(

src/views/reaplceMusicPlayer/modals/addUrl.vue

@@ -45,7 +45,7 @@
         label="选择问卷"
       >
         <el-select
-          v-model.trim="form.showQuestion"
+          v-model.trim="form.topicId"
           filterable
           clearable
         >
@@ -84,7 +84,7 @@ export default {
       form: {
         organId: "",
         school: "",
-        showQuestion: 1,
+        topicId: null,
       },
       cooperationList: [],
       topicList: []
@@ -112,7 +112,7 @@ export default {
       this.$refs.form.validate( async(res) => {
         if (res) {
           try{
-          const res = await addReplacement({cooperationOrganId:this.form.school,organId:this.form.organId, showQuestion: this.form.showQuestion})
+          const res = await addReplacement({cooperationOrganId:this.form.school,organId:this.form.organId, topicId: this.form.topicId})
           this.$message.success('生成链接成功')
            this.$emit('getList')
           this.$emit('close')

src/views/setQuestions/index.vue

@@ -5,7 +5,7 @@
     </h2>
     <div class="m-core">
         <el-button type="primary" @click="onQuestionOperation('create')"
-           v-permission="'organization/add'"
+           v-if="$helpers.permission('/operateManager/questionOperation/create')"
            class='newBand'>添加问卷</el-button>
         <save-form :inline="true"
                @submit="search"
@@ -23,7 +23,7 @@
         <el-form-item prop="status">
           <el-select v-model="searchForm.status"
                      filterable
-                     placeholder="请选择收费类型"
+                     placeholder="请选择问卷状态"
                      clearable>
             <el-option label="启用" :value="1"></el-option>
             <el-option label="停用" :value="0"></el-option>
@@ -65,11 +65,13 @@
                            label="操作">
             <template slot-scope="scope">
               <el-button @click="onQuestionOperation('look', scope.row)"
+                         v-if="$helpers.permission('/operateManager/questionOperation/detail')"
                          type="text">详情</el-button>
               <el-button @click="onOperation(scope.row)"
+                         v-if="$helpers.permission(scope.row.status ? 'questionnaireTopic/updateStatus/stop' : 'questionnaireTopic/updateStatus/start')"
                          type="text">{{ scope.row.status ? '停用' : '启用' }}</el-button>
               <el-button @click="onQuestionOperation('update', scope.row)"
-                         v-permission="'organization/update'"
+                         v-if="$helpers.permission('/operateManager/questionOperation/update')"
                          type="text">修改</el-button>
             </template>
           </el-table-column>

vue.config.js

@@ -18,9 +18,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://192.168.3.139:8000' // 箭河
-let target = 'http://192.168.3.148:8000' //邹璇
+// let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'http://dev.dayaedu.com' // 开发环境
 // let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
@@ -66,7 +66,7 @@ module.exports = {
       // let target = 'http://dev.dayaedu.com'
       // 'http://dev.dayaedu.com'
       '/api-auth': {
-        target: 'http://192.168.3.148:8000',
+        target: target,
         // target : target,
         changeOrigin: true,
         pathRewrite: {