diff --git a/mini-app/src/apis/mailApis.js b/mini-app/src/apis/mailApis.js
new file mode 100644
index 000000000..e4140f3f6
--- /dev/null
+++ b/mini-app/src/apis/mailApis.js
@@ -0,0 +1,18 @@
+
+import request from '../js/request'
+import { baseUrl, formHeader, jsonHeader } from './xiao4rApis'
+import { MINI_DEPTID } from '../config'
+
+/**
+ * 商城相关接口
+ */
+class MallApis {
+ getGoodsList(data) {
+ return request.get({
+ url: baseUrl + 'goods/goods_main/list',
+ data: data
+ })
+ }
+}
+
+export default new MallApis()
diff --git a/mini-app/src/apis/userApis.js b/mini-app/src/apis/userApis.js
index f14e11d0b..42a3157a4 100644
--- a/mini-app/src/apis/userApis.js
+++ b/mini-app/src/apis/userApis.js
@@ -15,7 +15,7 @@ class UserApis {
registrationByMini(data) {
data.deptId = MINI_DEPTID
return request.post({
- url: baseUrl + 'mini/user/registrationByMini',
+ url: baseUrl + 'winery/mini/user/registrationByMini',
data: data
})
}
@@ -28,14 +28,14 @@ class UserApis {
loginByMini(data) {
data.deptId = MINI_DEPTID
return request.post({
- url: baseUrl + 'mini/user/loginByMini',
+ url: baseUrl + 'winery/mini/user/loginByMini',
data: data
})
}
getSession(code) {
return request.get({
- url: baseUrl + 'mini/user/getSession',
+ url: baseUrl + 'winery/mini/user/getSession',
header: formHeader,
data: {
'code': code,
@@ -47,7 +47,7 @@ class UserApis {
sendMobile(data) {
data.deptId = MINI_DEPTID
return request.post({
- url: baseUrl + 'mini/user/sendMobile',
+ url: baseUrl + 'winery/mini/user/sendMobile',
header: jsonHeader,
data: data
})
@@ -55,7 +55,7 @@ class UserApis {
getAuthTest(data) {
return request.get({
- url: baseUrl + 'mini/user/test',
+ url: baseUrl + 'winery/mini/user/test',
header: formHeader,
data: data
})
diff --git a/mini-app/src/apis/xiao4rApis.js b/mini-app/src/apis/xiao4rApis.js
index 8ab359fc6..26c67e60f 100644
--- a/mini-app/src/apis/xiao4rApis.js
+++ b/mini-app/src/apis/xiao4rApis.js
@@ -1,7 +1,7 @@
import request from '../js/request'
-export const baseUrl = 'http://127.0.0.1:18989/winery/'
+export const baseUrl = 'http://127.0.0.1:18989/'
// export const baseUrl = 'http://36.1.50.18:18989/winery/'
// export const baseUrl = 'http://62.234.123.172:18989/api/'
// export const baseUrl = 'https://www.xiao4r.com/wine/winery/'
@@ -20,7 +20,7 @@ export const formHeader = {
class Xiao4rApis {
postForm(data) {
return request.post({
- url: baseUrl + 'mini/postForm',
+ url: baseUrl + 'winery/mini/postForm',
header: jsonHeader,
data: data
})
@@ -28,7 +28,7 @@ class Xiao4rApis {
getForm(data) {
return request.get({
- url: baseUrl + 'mini/getForm',
+ url: baseUrl + 'winery/mini/getForm',
header: formHeader,
data: data
})
diff --git a/mini-app/src/components/mall/tab/mall-shopping.wpy b/mini-app/src/components/mall/tab/mall-shopping.wpy
index a6d70acb8..c241a7156 100644
--- a/mini-app/src/components/mall/tab/mall-shopping.wpy
+++ b/mini-app/src/components/mall/tab/mall-shopping.wpy
@@ -19,30 +19,33 @@
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{'已优惠¥xx元'}}
+
-
+
+
+ {{parseImage(item.goodsFaceImg)}}
+
-
@@ -51,14 +54,16 @@ import wepy from '@wepy/core'
import store from '@/store'
import { mapActions, mapState } from '@wepy/x'
import appManager from '../../../appManager'
+import mailApis from '../../../apis/mailApis'
+import defaultMix from '../../../mixins/defaultMix'
wepy.component({
store,
hooks: {},
-
+ // mixins: [ defaultMix ],
data: {
active: 0,
- list: [1, 2, 3, 4],
+ records: [],
currentFilter: '全部',
filterButtons: ['全部']
@@ -82,18 +87,26 @@ wepy.component({
onFilterBtn(item) {
console.log(item)
this.currentFilter = item
+ },
+ parseImage(imageKey) {
+ return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey
}
},
ready() {
- let i = 0
- while (true) {
- this.filterButtons.push('按钮按钮' + i)
- i++
- if (i > 8) {
- break
- }
- }
+ // let i = 0
+ // while (true) {
+ // this.filterButtons.push('按钮按钮' + i)
+ // i++
+ // if (i > 8) {
+ // break
+ // }
+ // }
+
+ mailApis.getGoodsList({}).then(r => {
+
+ this.records = r.rows
+ })
}
})
diff --git a/mini-app/src/mixins/defaultMix.js b/mini-app/src/mixins/defaultMix.js
index 8a0573851..aed34bb06 100644
--- a/mini-app/src/mixins/defaultMix.js
+++ b/mini-app/src/mixins/defaultMix.js
@@ -11,6 +11,9 @@ export default {
},
navBack() {
wx.navigateBack()
+ },
+ parseImage(imageKey) {
+ return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey
}
},
created () {
diff --git a/mini-app/src/pages/mall/index.wpy b/mini-app/src/pages/mall/index.wpy
index d6e055836..9fd2907ed 100644
--- a/mini-app/src/pages/mall/index.wpy
+++ b/mini-app/src/pages/mall/index.wpy
@@ -89,8 +89,8 @@ module.exports.getTime = getTime;
自定义
-
-
+
+
diff --git a/mini-app/src/store/constant/imageDefine.js b/mini-app/src/store/constant/imageDefine.js
index 092c6451e..b1408b59b 100644
--- a/mini-app/src/store/constant/imageDefine.js
+++ b/mini-app/src/store/constant/imageDefine.js
@@ -1,7 +1,8 @@
export const imgbaseUrl = 'https://www.xiao4r.com/xiao4rstatic/img/'
+export const sysImgBaseUrl = 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/'
export const imageDefine = {
-
+ SYS_IMG_BASE_URL: sysImgBaseUrl,
TAP_BAR_ICON1_ON: imgbaseUrl + 'doctor.png',
TAP_BAR_ICON2_ON: imgbaseUrl + 'doctor.png',
TAP_BAR_ICON3_ON: imgbaseUrl + 'doctor.png',