瀏覽代碼

修改默认连接

lex-xin 5 年之前
父節點
當前提交
bc6247e00d

+ 30 - 0
src/utils/validate.js

@@ -24,3 +24,33 @@ export function isvalidPhone(str) {
   const reg = /^1[3|4|5|7|8|9][0-9]\d{8}$/
   return reg.test(str)
 }
+
+// 学生地址
+export function vaildStudentUrl(url) {
+  let returnUrl = ''
+  if(/test/.test(url)) { // test环境
+    returnUrl = 'http://mstutest.dayaedu.com'
+  } else if(/dev/.test(url)) { // dev 环境
+    returnUrl = 'http://mstudev.dayaedu.com'
+  } else if(/online/.test(url)) { //线上
+    returnUrl = 'https://mstuonline.dayaedu.com'
+  } else { // 默认dev环境
+    returnUrl = 'http://mstudev.dayaedu.com'
+  }
+  return returnUrl
+}
+
+// 老师地址
+export function vaildTeacherUrl(url) {
+  let returnUrl = ''
+  if(/test/.test(url)) { // test环境
+    returnUrl = 'http://mteatest.dayaedu.com'
+  } else if(/dev/.test(url)) {// dev 环境
+    returnUrl = 'http://mteadev.dayaedu.com'
+  } else if(/online/.test(url)) {//线上
+    returnUrl = 'https://mteaonline.dayaedu.com'
+  } else { // 默认dev环境
+    returnUrl = 'http://mteadev.dayaedu.com'
+  }
+  return returnUrl
+}

+ 3 - 6
src/views/businessManager/shopManager/shopCategory.vue

@@ -99,8 +99,7 @@ export default {
       formLabelWidth: '120px',
       form: {
         name: null, // 作业模块名称
-        subjectIds: [],
-        organId: null
+        subjectIds: []
       },
       rules: {
         name: [{ required: true, message: '请输入类型名称', trigger: 'blur' }],
@@ -186,16 +185,14 @@ export default {
         this.form = {
           id: row.id,
           name: row.name,
-          subjectIds: row.subjectIds,
-          organId: null
+          subjectIds: row.subjectIds
         }
       }
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
         name: null, // 作业模块名称
-        subjectIds: [],
-        organId: null
+        subjectIds: []
       }
       this.$refs[formName].resetFields()
     },

+ 1 - 2
src/views/businessManager/shopManager/shopOperation.vue

@@ -94,7 +94,7 @@
 </template>
 <script>
 import { categoryListTree, goodsAdd, goodsUpdate, goodsSingleQuery } from '@/api/businessManager'
-import store from '@/store'
+// import store from '@/store'
 import { getToken } from '@/utils/auth'
 let validPrice = (rule, value, callback) => {
   if (!value) {
@@ -112,7 +112,6 @@ export default {
     return {
       categoryList: [],
       pageType: this.$route.query.type,
-      organId: null,
       headers: {
         Authorization: getToken()
       },

+ 16 - 2
src/views/contentManager/contentOperation.vue

@@ -36,6 +36,7 @@
             <i v-else
                class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
+          <p class="imageSize" v-if="imageSize">上传图片尺寸为:{{ imageSize }}</p>
         </el-form-item>
         <el-form-item label="内容"
                       prop="content">
@@ -70,6 +71,7 @@
 import { newsQueryId, newsAdd, newsUpdate } from '@/api/contentManager'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
+import { vaildStudentUrl } from '@/utils/validate'
 // import E from 'wangeditor'
 // require styles
 import 'quill/dist/quill.core.css'
@@ -157,7 +159,7 @@ export default {
         title: null,
         order: null,
         coverImage: null,
-        linkUrl: 'http://mstudev.dayaedu.com/#/specialdetail',
+        linkUrl: vaildStudentUrl() + '/#/specialdetail',
         type: this.$route.query.type,
         status: 1,
         content: null
@@ -168,13 +170,25 @@ export default {
         linkUrl: [{ required: true, message: '请输入连接地址', trigger: 'blur' }],
         coverImage: [{ required: true, message: '请选择封面图', trigger: 'blur' }],
         content: [{ required: true, message: '请编辑内容', trigger: 'blur' }]
-      }
+      },
+      imageSize: null
     }
   },
   mounted () {
     // console.log('this is current quill instance object', this.editor)
     this.getList()
     this.addQuillTitle()
+
+    // this.form.type
+    let tempTitle = {
+      1: "468px * 552px",
+      2: "456px * 288px",
+      3: "686px * 140px",
+      4: null
+    }
+    this.imageSize = tempTitle[this.form.type]
+
+
   },
   methods: {
     addQuillTitle () {

+ 5 - 4
src/views/teamBuild/signupList.vue

@@ -362,6 +362,7 @@
 import pagination from '@/components/Pagination/index'
 import { getintoClass, getStudentList, findSound, musicGroupOpenPay, openPayment, musicGroupFound, extensionPayment, resetPlanNum, cancelMusicGroup } from '@/api/buildTeam'
 import { resetStudentSubject, getStudentFeeDetail } from '@/api/studentManager'
+import { vaildStudentUrl, vaildTeacherUrl } from '@/utils/validate'
 import QRCode from 'qrcodejs2'
 export default {
   components: {
@@ -561,8 +562,8 @@ export default {
             colorLight: '#ffffff',
             correctLevel: QRCode.CorrectLevel.H
           })
-          this.qrcode.makeCode('http://mstudev.dayaedu.com/#/login?musicGroupId=' + id)
-          this.codeUrl = 'http://mstudev.dayaedu.com/#/login?musicGroupId=' + id
+          this.qrcode.makeCode(vaildStudentUrl() + '/#/login?musicGroupId=' + id)
+          this.codeUrl = vaildStudentUrl() + '/#/login?musicGroupId=' + id
         }, 500)
       }
     },
@@ -580,8 +581,8 @@ export default {
             colorLight: '#ffffff',
             correctLevel: QRCode.CorrectLevel.H
           })
-          this.qrcode2.makeCode('http://mteadev.dayaedu.com/#/order?musicGroupId=' + id + '&musicGroupName=' + teamName)
-          this.codeUrl2 = 'http://mteadev.dayaedu.com/#/order?musicGroupId=' + id + '&musicGroupName=' + teamName
+          this.qrcode2.makeCode(vaildTeacherUrl() + '/#/order?musicGroupId=' + id + '&musicGroupName=' + teamName)
+          this.codeUrl2 = vaildTeacherUrl() + '/#/order?musicGroupId=' + id + '&musicGroupName=' + teamName
         }, 500)
       }
     },