合并

src/common/constant.js

@@ -9,7 +9,11 @@
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket`  // 开发环境
 // export const BASE_URL = `https://www.zzfzyc.com/lymarket`  // 正式环境
+<<<<<<< HEAD
 // export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞
+=======
+// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
+>>>>>>> 订单售后v2
 export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
 

src/common/uploadImage.js

@@ -129,22 +129,4 @@ const uploadCDNImg = (file, secene, type) => {
     })
 }
 
-const taroChooseImg = () => {
-    Taro.chooseImage({
-        count: 1,
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success: (res) => {
-            console.log('res:', res)
-            Taro.chooseMessageFile({
-                count: 1,
-
-            })
-        },
-        fail: (err) => {
-            console.log('图片选择失败：', err)
-        }
-    })
-}
-
 export default uploadCDNImg