Merge branch 'master-php' of e.coding.net:g-cphe0354/duanju/video_admin into master-php

src/config/index.js

@@ -6,9 +6,8 @@ export const productUrl='dj-admin';
 
 //  const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试
 // const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上
-// const baseUrl = "http://192.168.1.31:8080/admin/" // php
-const baseUrl = "https://playlet.test.sxczgkj.com/admin/" // php
-
+// const baseUrl = "http://192.168.1.31:8080/admin/" // php本地
+const baseUrl = "https://playlet.test.sxczgkj.com/admin/" // php测试服
 
 export default{
     baseUrl

src/views/materials/materialsList.vue

@@ -493,7 +493,7 @@
 						'createTime': this.info.stockDate,
 						'sort': this.sort,
 						'helpWordTitle': this.helpWordTitle,
-						
+
 					})
 				}).then(({
 					data

src/views/mission/mission.vue

@@ -1787,7 +1787,7 @@ export default {
           courseType: this.courseType,
           isRecommend: this.isRecommend,
           status: this.statusType,
-          remark: this.remark,
+        //   remark: this.remark,
           bannerId: this.fenleiId2,
           isPrice: this.isPrice,
           isOver: this.isOver,

src/views/user/userDetail.vue

@@ -1871,7 +1871,7 @@ export default {
       this.tableDataLoading = true;
       let userId = this.$route.query.userId;
       this.$http({
-        url: this.$http.adornUrl("admin/sdkInfo/getSdkList"),
+        url: this.$http.adornUrl("sdkInfo/getSdkList"),
         method: "get",
         params: this.$http.adornParams({
           page: this.page,