whyusb@gmail.com преди 4 години
родител
ревизия
014c5a394f
променени са 3 файла, в които са добавени 30 реда и са изтрити 25 реда
  1. 6 4
      src/config/index.config.js
  2. 1 0
      src/pages/index/setting/notice.vue
  3. 23 21
      src/pages/shop/shopdetail.vue

+ 6 - 4
src/config/index.config.js

@@ -2,11 +2,12 @@ const CONFIG = {
     //开发环境配置
     development: {
         assetsPath: '/static', // 静态资源路径
-        // baseUrl: 'http://tyou.xiudo.cn/merch',  // 后台接口请求地址
-        baseUrl: 'http://192.168.100.135:83/merch',  // 后台接口请求地址
+        baseUrl: 'http://tyou.xiudo.cn/merch',  // 后台接口请求地址
+        // baseUrl: 'http://192.168.100.135:83/merch',  // 后台接口请求地址
         hostUrl: 'http://localhost:8080',        // H5地址(前端运行地址)
         websocketUrl: '',        // websocket服务端地址
-        weixinAppId: '' // 微信公众号appid
+        weixinAppId: '', // 微信公众号appid
+        uploadUrl: 'http://tyou.xiudo.cn/merch/common/upload/oss'
     },
     //生产环境配置
     production: {
@@ -14,7 +15,8 @@ const CONFIG = {
         baseUrl: 'https://tyou.xiudo.cn/merch',  // 后台接口请求地址
         hostUrl: 'https://tyou.xiudo.cn',        // H5地址(前端运行地址)
         websocketUrl: '',        // websocket服务端地址
-        weixinAppId: '' // 微信公众号appid
+        weixinAppId: '', // 微信公众号appid
+        uploadUrl: 'https://you.xiudo.cn/merch/common/upload/oss'
     }
 
 };

+ 1 - 0
src/pages/index/setting/notice.vue

@@ -218,6 +218,7 @@ export default {
       .delete {
         background-color: #ff6a5e;
         color: #fff;
+        border:none;
       }
     }
   }

+ 23 - 21
src/pages/shop/shopdetail.vue

@@ -359,6 +359,9 @@ let _self;
 import Header from '../components/header.vue';
 import uniCalendar from '@/components/uni-calendar/uni-calendar.vue';
 import moment from '@/common/moment';
+import indexConfig from '@/config/index.config';
+console.log(indexConfig.uploadUrl)
+
 export default {
   components: {
     Header,
@@ -928,7 +931,7 @@ export default {
           // 成功则返回图片的本地文件路径列表 tempFilePaths
           _self.iconurl = res.tempFilePaths[0];
           myCloud.uploadFile({
-            url: 'http://tyou.xiudo.cn/merch/common/upload/oss',
+            url: indexConfig.uploadUrl,
             filePath: _self.iconurl, // 要上传的文件对象
             cloudPath: _self.iconurl, // 要上传的文件对象
             name: 'file',
@@ -962,29 +965,28 @@ export default {
         sourceType: ['album'], // camera 使用相机   album 从相册中选
         success: function (res) {
           // 成功则返回图片的本地文件路径列表 tempFilePaths
-          let img = [];
-          img.push(res.tempFilePaths);
           if (_self.pickList.length >= 6) {
             _self.$mHelper.toast('最多只可上传6张图片');
           } else {
-            _self.pickList = _self.pickList.concat(img);
-            // for (let i = 0; i < _self.pickList.length; i++) {
-            //   let element = _self.pickList[i];
-            //   myCloud.uploadFile({
-            //     url: 'http://192.168.100.135:83/merch/common/upload/oss',
-            //     filePath: element, // 要上传的文件对象
-            //     cloudPath: element,
-            //     name: 'file',
-            //     onUploadProgress: function (progressEvent) {
-            //       // 上传进度回调
-            //       let percentCompleted = Math.round(
-            //         (progressEvent.loaded * 100) / progressEvent.total
-            //       );
-            //     },
-            //     success: (res) => {
-            //     },
-            //   });
-            // }
+            _self.pickList = _self.pickList.concat(res.tempFilePaths).slice(0,6);
+            for (let i = 0; i < _self.pickList.length; i++) {
+              let element = _self.pickList[i];
+              myCloud.uploadFile({
+                url: indexConfig.uploadUrl,
+                filePath: element, // 要上传的文件对象
+                cloudPath: element,
+                name: 'file',
+                onUploadProgress: function (progressEvent) {
+                  // 上传进度回调
+                  let percentCompleted = Math.round(
+                    (progressEvent.loaded * 100) / progressEvent.total
+                  );
+                },
+                success: (res) => {
+                  console.log(res)
+                },
+              });
+            }
           }
         },
       });