diff --git a/api/member/index.js b/api/member/index.js
index 71be294..8ebf8b2 100644
--- a/api/member/index.js
+++ b/api/member/index.js
@@ -2,26 +2,33 @@ import request from '@/utils/request'
// api地址
const api = {
- info: 'identity/userPriceList',
- submit:'identity/submit',
- dealerPriceList:'identity/dealerPriceList',
- userOpenCardLog:'identity/userOpenCardLog'
+ info: 'identity/userPriceList',
+ submit: 'identity/submit',
+ dealerPriceList: 'identity/dealerPriceList',
+ userOpenCardLog: 'identity/userOpenCardLog',
+ dealerOpenCardLog: 'identity/dealerOpenCardLog'
}
// 会员信息
export const info = (param) => {
- return request.post(api.info, param)
+ return request.post(api.info, param)
}
// 分销会员信息
export const dealerPriceList = (param) => {
- return request.post(api.dealerPriceList, param)
+ return request.post(api.dealerPriceList, param)
}
// 会员信息
export const submit = (param) => {
- return request.post(api.submit, param)
+ return request.post(api.submit, param)
}
-//
+// 会员开卡记录
export const userOpenCardLog = (param) => {
- return request.post(api.userOpenCardLog, param)
+ return request.post(api.userOpenCardLog, param)
+}
+
+
+// 分销开卡记录
+export const dealerOpenCardLog = (param) => {
+ return request.post(api.dealerOpenCardLog, param)
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 75d5809..82da8fb 100644
--- a/pages.json
+++ b/pages.json
@@ -881,7 +881,6 @@
"navigationBarTitleText": "商家入驻"
}
}
-
]
},
{
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 7bacac3..ac7dbd0 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -4,7 +4,6 @@
-
@@ -68,8 +67,8 @@
{{goods.goods_name}}
-
- 100999080000
+
+ {{item.skuList[0].goods_sku_id}}
@@ -134,15 +133,15 @@
-
+
-
+
-
- 夏普4T-M70H7DA 70
+
+ {{item.goods_name}}
- ￥2220
+ ￥{{item.goods_price_min}}
@@ -294,25 +293,39 @@
setPrice: false,
openDialog: false,
goodsId: '',
- goods:{},
+ goods: {},
+ suggestGoodsList: []
}
},
onLoad(options) {
this.isPre = options.isPre
this.getGoodsDetail(options.goodsId)
},
+ onShow() {
+ this.getSuggestGoods()
+ },
methods: {
// 获取商品信息
- getGoodsDetail(val) {
+ getGoodsDetail() {
const that = this
return new Promise((resolve, reject) => {
- GoodsApi.detail(val)
+ GoodsApi.detail('10001')
.then(result => {
that.goods = result.data.detail
})
.catch(reject)
})
},
+ getSuggestGoods() {
+ // 获取推荐商品列表
+ const that = this
+ GoodsApi.recommended()
+ .then(result => {
+ console.log(result, '获取推荐商品列表')
+ that.suggestGoodsList = result.data.goodsList
+ })
+ .catch(reject)
+ },
goHome() {
uni.navigateTo({
url: '/pages/index/index'
@@ -610,6 +623,7 @@
color: #000000;
line-height: 33rpx;
margin: 28rpx 0 0 28rpx;
+
}
.goodsOpera {
@@ -786,7 +800,7 @@
.about {
width: 720rpx;
- height: 730rpx;
+ // height: 730rpx;
background: #FFFFFF;
border-radius: 6rpx 6rpx 6rpx 6rpx;
opacity: 1;
@@ -854,7 +868,14 @@
font-weight: 400;
color: #000000;
line-height: 33rpx;
-
+ display: -webkit-box;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: normal !important;
+ word-wrap: break-word;
+ -webkit-box-orient: vertical;
+ -webkit-box-align: start;
+ -webkit-box-pack: center;
}
.price {
diff --git a/pages/member/index.vue b/pages/member/index.vue
index a4f5986..c454778 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -103,7 +103,8 @@
限时活动价
-
+
+
{{item.month}}个月
@@ -138,7 +139,7 @@
- {{p.title}}
+ {{p.title}}
+
+
+
+
@@ -31,7 +39,8 @@
data() {
return {
itemList: [],
-
+ strings: '',
+ dialog: false,
}
},
onShow() {
@@ -49,6 +58,10 @@
})
.finally(() => that.isLoading = false)
},
+ openContent(item) {
+ this.strings = item.content
+ this.dialog = true
+ },
}
}
@@ -135,21 +148,23 @@
height: 90upx;
line-height: 90upx;
padding: 0 10upx;
+ border-bottom: 1px solid #dfdbdb;
+ }
+
+ :first-child {
+ border-right: 1px solid #dfdbdb;
}
:nth-child(2n) {
- // border-bottom:1px solid #dfdbdb;
border-left: 1px solid #dfdbdb;
- // border-right:1px solid #dfdbdb;
}
:last-child {
- border-top: 1px solid #dfdbdb;
- // border-left:1px solid #dfdbdb;
+ border-left: 1px solid #dfdbdb;
}
:nth-child(3) {
- border-top: 1px solid #dfdbdb;
+ border-right: 1px solid #dfdbdb;
}
}
}
@@ -186,7 +201,42 @@
margin-left: 100upx;
}
+ .infoBtn{
+ image {
+ width: 54upx;
+ height: auto;
+ }
+ text-align: center;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 100%;
+ height: 100%;
+ background: #FE6048;
+ border-radius: 28px 28px 28px 28px;
+ color: #FFFFFF;
+ }
}
}
}
+
+ .dialog {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: rgba(0, 0, 0, 0.8);
+ color: #fff;
+
+ .content {
+ height: 60%;
+ width: 80%;
+ overflow: auto;
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index f8ed790..d6b651b 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -84,7 +84,7 @@
-
+
商品管理
查看全部
@@ -385,26 +385,26 @@
-
+
我要找货
-
-
+
+
数据统计
-
-
+
+
会员管理
-
+ v-if="userInfo.user_type!=10&&userInfo.user_type!=20&&userInfo.user_type!=30">
+
进群有礼
diff --git a/static/user/hygl.png b/static/user/hygl.png
new file mode 100644
index 0000000..c5d0b38
Binary files /dev/null and b/static/user/hygl.png differ
diff --git a/static/user/jq.png b/static/user/jq.png
new file mode 100644
index 0000000..1be5676
Binary files /dev/null and b/static/user/jq.png differ
diff --git a/static/user/sj.png b/static/user/sj.png
new file mode 100644
index 0000000..3dc2c8e
Binary files /dev/null and b/static/user/sj.png differ