zhouzhenyuan 10 months ago
parent af98d83b3c
commit d731f72890
  1. 11
      api/member/index.js
  2. 1
      pages.json
  3. 43
      pages/goods/detail.vue
  4. 7
      pages/member/index.vue
  5. 59
      pages/memberInfo/index.vue
  6. 68
      pages/news1/help.vue
  7. 16
      pages/user/index.vue
  8. BIN
      static/user/hygl.png
  9. BIN
      static/user/jq.png
  10. BIN
      static/user/sj.png

@ -5,7 +5,8 @@ const api = {
info: 'identity/userPriceList', info: 'identity/userPriceList',
submit: 'identity/submit', submit: 'identity/submit',
dealerPriceList: 'identity/dealerPriceList', dealerPriceList: 'identity/dealerPriceList',
userOpenCardLog:'identity/userOpenCardLog' userOpenCardLog: 'identity/userOpenCardLog',
dealerOpenCardLog: 'identity/dealerOpenCardLog'
} }
// 会员信息 // 会员信息
@ -21,7 +22,13 @@ export const submit = (param) => {
return request.post(api.submit, param) return request.post(api.submit, param)
} }
// // 会员开卡记录
export const userOpenCardLog = (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)
}

@ -881,7 +881,6 @@
"navigationBarTitleText": "商家入驻" "navigationBarTitleText": "商家入驻"
} }
} }
] ]
}, },
{ {

@ -4,7 +4,6 @@
<u-navbar title="" :border-bottom="false" title-color="#fff"></u-navbar> <u-navbar title="" :border-bottom="false" title-color="#fff"></u-navbar>
</view> </view>
<view class="head"> <view class="head">
<view class="search"> <view class="search">
<image src="/static/tabbar/home.png" mode="" class="icon" @click="goHome"></image> <image src="/static/tabbar/home.png" mode="" class="icon" @click="goHome"></image>
<view class="searInput" @click="goSearch"> <view class="searInput" @click="goSearch">
@ -68,8 +67,8 @@
{{goods.goods_name}} {{goods.goods_name}}
</view> </view>
<view class="goodsOpera"> <view class="goodsOpera">
<view class="goodsNum"> <view class="goodsNum" @click="copyNum(item.skuList[0].goods_sku_id)">
<text>100999080000</text> <text>{{item.skuList[0].goods_sku_id}}</text>
<image src="/static/detail/copy.png" mode=""></image> <image src="/static/detail/copy.png" mode=""></image>
</view> </view>
<view class="operaImg"> <view class="operaImg">
@ -134,15 +133,15 @@
</view> </view>
</view> </view>
<view class="goodsList"> <view class="goodsList">
<view class="goodsItem" v-for="(item,index) in 6" :key="index"> <view class="goodsItem" v-for="(item,index) in suggestGoodsList" :key="index">
<view class="img"> <view class="img">
<image src="/static/detail/tv.png" mode="" class="goodsImg"></image> <image :src="item.goods_image" mode="" class="goodsImg"></image>
</view> </view>
<view class="goodsName "> <view class="goodsName ">
夏普4T-M70H7DA 70 {{item.goods_name}}
</view> </view>
<view class="price"> <view class="price">
2220 {{item.goods_price_min}}
</view> </view>
</view> </view>
</view> </view>
@ -295,24 +294,38 @@
openDialog: false, openDialog: false,
goodsId: '', goodsId: '',
goods: {}, goods: {},
suggestGoodsList: []
} }
}, },
onLoad(options) { onLoad(options) {
this.isPre = options.isPre this.isPre = options.isPre
this.getGoodsDetail(options.goodsId) this.getGoodsDetail(options.goodsId)
}, },
onShow() {
this.getSuggestGoods()
},
methods: { methods: {
// //
getGoodsDetail(val) { getGoodsDetail() {
const that = this const that = this
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
GoodsApi.detail(val) GoodsApi.detail('10001')
.then(result => { .then(result => {
that.goods = result.data.detail that.goods = result.data.detail
}) })
.catch(reject) .catch(reject)
}) })
}, },
getSuggestGoods() {
//
const that = this
GoodsApi.recommended()
.then(result => {
console.log(result, '获取推荐商品列表')
that.suggestGoodsList = result.data.goodsList
})
.catch(reject)
},
goHome() { goHome() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/index' url: '/pages/index/index'
@ -610,6 +623,7 @@
color: #000000; color: #000000;
line-height: 33rpx; line-height: 33rpx;
margin: 28rpx 0 0 28rpx; margin: 28rpx 0 0 28rpx;
} }
.goodsOpera { .goodsOpera {
@ -786,7 +800,7 @@
.about { .about {
width: 720rpx; width: 720rpx;
height: 730rpx; // height: 730rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 6rpx 6rpx 6rpx 6rpx; border-radius: 6rpx 6rpx 6rpx 6rpx;
opacity: 1; opacity: 1;
@ -854,7 +868,14 @@
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
line-height: 33rpx; 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 { .price {

@ -103,7 +103,8 @@
<view class="limitPrice" v-if="index==0"> <view class="limitPrice" v-if="index==0">
限时活动价 限时活动价
</view> </view>
<view class="timeLong" :style="{'marginTop':isChose!=index?'62rpx':0}"> <!-- :style="{'marginTop':isChose!=index?'62rpx':0}" -->
<view class="timeLong" >
{{item.month}}个月 {{item.month}}个月
</view> </view>
<view class="firPrice"> <view class="firPrice">
@ -138,7 +139,7 @@
<view class="footer"> <view class="footer">
<view class="fLeft"> <view class="fLeft">
<view class="ys"> <view class="ys" v-if="choseItem.cheap_price!=0">
已省 <text>{{choseItem.cheap_price}}</text> 已省 <text>{{choseItem.cheap_price}}</text>
</view> </view>
<view class="yj"> <view class="yj">
@ -220,7 +221,7 @@
}, },
goBuyInfo() { goBuyInfo() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/memberInfo/index' url: '/pages/memberInfo/index?userInfo=' + JSON.stringify(this.userInfo)
}) })
}, },
chosePayType(item, index) { chosePayType(item, index) {

@ -9,14 +9,14 @@
<view class="meInfo"> <view class="meInfo">
<view class="info"> <view class="info">
<view class="name"> <view class="name">
Deioio {{userInfo.nick_name}}
</view> </view>
<view class="hy"> <view class="hy">
v月卡会员 {{userInfo.user_type_text}}
</view> </view>
</view> </view>
<view class="time"> <view class="time">
有效期至2024.01.21 有效期至{{userInfo.effective_time}}
</view> </view>
</view> </view>
</view> </view>
@ -24,43 +24,26 @@
<view class="mTitle"> <view class="mTitle">
月卡订单记录 月卡订单记录
</view> </view>
<view class="card"> <view class="card" v-for="(item,index) in list" :key="index">
<view class="tp"> <view class="tp">
<view class="info"> <view class="info">
生效中 <text v-if="item.is_valid">生效中</text>
<text v-if="!item.is_valid">已过期</text>
</view> </view>
</view> </view>
<view class="detail"> <view class="detail">
<view class="topLine"> <view class="topLine">
<view class="send"> <view class="send">
省钱月卡1个月 {{item.name}}
</view>
<view class="btn">
活动赠送
</view> </view>
</view> </view>
<view class="time"> <view class="time">
2023.12.22-2024.01.21 {{item.start_time}}-{{item.end_time}}
</view>
</view>
</view>
<view class="showInfo">
已展示近18个月省钱月卡订单
</view>
</view> </view>
<view class="footer">
<view class="fLeft">
<view class="ys">
已省 <text>3.2</text>
</view> </view>
<view class="yj">
原价 30
</view>
</view>
<view class="btn">
<text>36</text>开卡3个月
</view> </view>
</view> </view>
</view> </view>
</template> </template>
@ -70,6 +53,7 @@
export default { export default {
data() { data() {
return { return {
userInfo:{},
payTypeChose:true, payTypeChose:true,
isChose: 0, isChose: 0,
isVip: false, isVip: false,
@ -77,21 +61,37 @@
background: 'url(' + img + ') center top no-repeat', background: 'url(' + img + ') center top no-repeat',
backgroundSize: '100% auto', backgroundSize: '100% auto',
}, },
list:[],
} }
}, },
onLoad(options){ onLoad(options){
this.userInfo = JSON.parse(options.userInfo)
},
onShow(){
this.getListInfo() this.getListInfo()
}, },
methods:{ methods:{
getListInfo(){ getListInfo(){
const that = this const that = this
member.info() that.list = []
if(that.userInfo.user_type==30){
member.dealerOpenCardLog()
.then(res => { .then(res => {
if (res.status == 200) { if (res.status == 200) {
that.list = res.data
}
})
.finally(() => that.isLoading = false)
}else if(that.userInfo.user_type==20){
member.userOpenCardLog()
.then(res => {
if (res.status == 200) {
that.list = res.data
} }
}) })
.finally(() => that.isLoading = false) .finally(() => that.isLoading = false)
}
}, },
}, },
} }
@ -121,6 +121,7 @@
height: 114rpx; height: 114rpx;
margin-right: 30rpx; margin-right: 30rpx;
margin-top: 12rpx; margin-top: 12rpx;
border-radius: 50%;
} }
.meInfo { .meInfo {
@ -206,7 +207,7 @@
background: #FFF4F4; background: #FFF4F4;
border-radius: 8rpx 8rpx 8rpx 8rpx; border-radius: 8rpx 8rpx 8rpx 8rpx;
opacity: 1; opacity: 1;
margin: 26rpx 0 0 38rpx; margin: 26rpx 0 16rpx 38rpx;
display: flex; display: flex;
.tp { .tp {

@ -12,14 +12,22 @@
</view> </view>
</view> </view>
<view class="mainItem"> <view class="mainItem">
<view class="itemText" v-for="(p,i) in item.child" :key="i">{{p.title}}</view> <view class="itemText" v-for="(p,i) in item.child" :key="i" @click="openContent(p)">{{p.title}}
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="footer"> <view class="footer">
<view class="btn"> <view class="btn">
<image src="/static/news1/n7.png" mode="widthFix"></image> <button type="default" open-type="contact" class="infoBtn">
<text>在线客服9:00-22:00</text> <image src="/static/news1/n7.png" mode="widthFix"></image>在线客服9:00-22:00
</button>
</view>
</view>
<view class="dialog" v-if="dialog" @click="dialog=false">
<view class="content">
<rich-text :nodes="strings"></rich-text>
</view> </view>
</view> </view>
</view> </view>
@ -31,7 +39,8 @@
data() { data() {
return { return {
itemList: [], itemList: [],
strings: '',
dialog: false,
} }
}, },
onShow() { onShow() {
@ -49,6 +58,10 @@
}) })
.finally(() => that.isLoading = false) .finally(() => that.isLoading = false)
}, },
openContent(item) {
this.strings = item.content
this.dialog = true
},
} }
} }
</script> </script>
@ -135,21 +148,23 @@
height: 90upx; height: 90upx;
line-height: 90upx; line-height: 90upx;
padding: 0 10upx; padding: 0 10upx;
border-bottom: 1px solid #dfdbdb;
}
:first-child {
border-right: 1px solid #dfdbdb;
} }
:nth-child(2n) { :nth-child(2n) {
// border-bottom:1px solid #dfdbdb;
border-left: 1px solid #dfdbdb; border-left: 1px solid #dfdbdb;
// border-right:1px solid #dfdbdb;
} }
:last-child { :last-child {
border-top: 1px solid #dfdbdb; border-left: 1px solid #dfdbdb;
// border-left:1px solid #dfdbdb;
} }
:nth-child(3) { :nth-child(3) {
border-top: 1px solid #dfdbdb; border-right: 1px solid #dfdbdb;
} }
} }
} }
@ -186,7 +201,42 @@
margin-left: 100upx; 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;
}
}
</style> </style>

@ -84,7 +84,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="goodsManage" v-if="userInfo.user_type==40"> <view class="goodsManage" v-if="userInfo.user_type==40&&userInfo">
<view class="manageTitle"> <view class="manageTitle">
<text lines="1" class="text_5 titleLeft">商品管理</text> <text lines="1" class="text_5 titleLeft">商品管理</text>
<text lines="1" class="text_6 titleRight">查看全部</text> <text lines="1" class="text_6 titleRight">查看全部</text>
@ -385,26 +385,26 @@
</view> </view>
</view> </view>
<view class="serveIcon" @click="goPage('/pages/news1/huoyuan')"> <view class="serveIcon" @click="goPage('/pages/news1/huoyuan')">
<image src="/static/user/help.png" mode="" class="icons"></image> <image src="/static/user/retail.png" mode="" class="icons"></image>
<view class="serveInfo"> <view class="serveInfo">
我要找货 我要找货
</view> </view>
</view> </view>
<view class="serveIcon" v-if="userInfo.user_type!=10&&userInfo.user_type!=20"> <view class="serveIcon" v-if="userInfo.user_type!=10&&userInfo.user_type!=20&&userInfo.user_type!=30">
<image src="/static/user/help.png" mode="" class="icons"></image> <image src="/static/user/sj.png" mode="" class="icons"></image>
<view class="serveInfo"> <view class="serveInfo">
数据统计 数据统计
</view> </view>
</view> </view>
<view class="serveIcon" v-if="userInfo.user_type!=10&&userInfo.user_type!=20"> <view class="serveIcon" v-if="userInfo.user_type!=10&&userInfo.user_type!=20&&userInfo.user_type!=30">
<image src="/static/user/help.png" mode="" class="icons"></image> <image src="/static/user/hygl.png" mode="" class="icons"></image>
<view class="serveInfo"> <view class="serveInfo">
会员管理 会员管理
</view> </view>
</view> </view>
<view class="serveIcon" @click="goPage('/pages/news1/jinqun')" <view class="serveIcon" @click="goPage('/pages/news1/jinqun')"
v-if="userInfo.user_type!=10&&userInfo.user_type!=20"> v-if="userInfo.user_type!=10&&userInfo.user_type!=20&&userInfo.user_type!=30">
<image src="/static/user/help.png" mode="" class="icons"></image> <image src="/static/user/jq.png" mode="" class="icons"></image>
<view class="serveInfo"> <view class="serveInfo">
进群有礼 进群有礼
</view> </view>

Binary file not shown.

After

Width:  |  Height:  |  Size: 828 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 568 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Loading…
Cancel
Save