theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

Browse Source
This commit is contained in:
luyuan 2020-08-11 16:03:48 +08:00
commit 693048f1ab
Signed by: theluyuan
GPG Key ID: A7972FD973317FF3
22 changed files with 287 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/api/shop.js
View File

@ -202,9 +202,10 @@ export default {
return vm.$u.post('Spike/recommendedSpike'); return vm.$u.post('Spike/recommendedSpike');
}, },
// 秒杀详情 // 秒杀详情
getSpikeInfo({ groupbuy_id }) { getSpikeInfo({ groupbuy_id, goods_id }) {
return vm.$u.post('Spike/spikeInfo', { return vm.$u.post('Spike/spikeInfo', {
groupbuy_id: groupbuy_id groupbuy_id: groupbuy_id,
goods_id: goods_id,
}); });
}, },
// 秒杀列表 // 秒杀列表
@ -221,8 +222,11 @@ export default {
}); });
}, },
// 拼团商品详情 // 拼团商品详情
getPinTuanDetails({ pintuan_id }) { getPinTuanDetails({ pintuan_id, goods_id }) {
return vm.$u.post('Specialci/pintuanInfo', { pintuan_id: pintuan_id }); return vm.$u.post('Specialci/pintuanInfo', {
pintuan_id: pintuan_id,
goods_id: goods_id,
});
}, },
// 推荐拼团 // 推荐拼团
getPinTuanPush() { getPinTuanPush() {

2
common/http.interceptor.js
View File

@ -46,7 +46,7 @@ const install = (Vue, vm) => {
} else if(res.data.errCode == 401) { } else if(res.data.errCode == 401) {
// 假设201为token失效，这里跳转登录 // 假设201为token失效，这里跳转登录
// vm.$u.toast('您还没有登录哦，请先去登录！'); // vm.$u.toast('您还没有登录哦，请先去登录！');
if (res.data.action != "memberinfo") { if (res.data.data.action != "memberinfo") {
uni.showModal({ uni.showModal({
title: "温馨提示", title: "温馨提示",
content: "您还未登录，请立即登录", content: "您还未登录，请立即登录",

2
components/index/video-item/index.vue
View File

@ -241,7 +241,7 @@ export default {
// console.log(res) // console.log(res)
if(res.errCode == 0) { if(res.errCode == 0) {
this.$u.toast(res.message); this.$u.toast(res.message);
this.$emit("getArticlelist"); this.$emit("updateList");
} }
}) })
}, },

2
components/remaining/remaining.vue
View File

@ -205,7 +205,7 @@
z-index: 1000; z-index: 1000;
position: absolute; position: absolute;
bottom: 100rpx; bottom: 100rpx;
right: 30%; right: 230rpx;
width: 300rpx; width: 300rpx;
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;

7
pageA/register/register.vue
View File

@ -152,16 +152,9 @@
// type: 'success', // type: 'success',
// url: '/pageA/topick/topick' // url: '/pageA/topick/topick'
// }) // })
} else if(res.errCode == 2){
this.$refs.uToast.show({
title: res.message,
type: 'primary',
url: '/pageA/login/login'
})
} else { } else {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
type: 'primary'
}) })
} }
}) })

2
pageB/components/sdetails/guige.vue
View File

@ -57,7 +57,7 @@ export default {
props:['item','title'], props:['item','title'],
watch:{ watch:{
select(){ select(){
console.log(this.select) // console.log(this.select)
this.$emit("sel", this.select); this.$emit("sel", this.select);
} }
} }

9
pageB/coupon/details.vue
View File

@ -56,17 +56,8 @@ export default {
}, },
onLoad(option) { onLoad(option) {
this.price = option.price; this.price = option.price;
// this.isNewmembervoucher();
}, },
methods: { methods: {
// 是否显示新人优惠券
isNewmembervoucher() {
this.$u.api.isNewmembervoucher().then(res => {
if(res.errCode == 0) {
this.price = res.data.price;
}
})
},
exchangeCoupon() { exchangeCoupon() {
this.$u.api.getCoupon({ id: 1 }).then(res => { this.$u.api.getCoupon({ id: 1 }).then(res => {
this.$u.toast(res.message); this.$u.toast(res.message);

85
pageB/coupon/index.vue Normal file
View File

@ -0,0 +1,85 @@
<template>
<u-popup v-model="showCoupon" mode="center" class="u-coupon-popup">
<view class="coupon">
<view class="price">{{ newMemberCoupon.price }}</view>
<image src="/static/image/common/30.png" class="coupon-image" @click="viewCoupon"></image>
<image src="/static/image/common/24.png" class="close-image" @click="showCoupon=false"></image>
</view>
</u-popup>
</template>
<script>
export default {
data() {
return {
showCoupon: true,
newMemberCoupon: {},
}
},
watch: {
showCoupon(value) {
if(!value) {
uni.navigateBack();
}
}
},
onShow() {
this.isNewmembervoucher();
},
methods: {
viewCoupon() {
this.$u.route('/pageB/coupon/details', {
price: this.newMemberCoupon.price
});
},
// 是否显示新人优惠券
isNewmembervoucher() {
this.$u.api.isNewmembervoucher().then(res => {
if(res.errCode == 0) {
this.newMemberCoupon = res.data;
} else {
this.showCoupon = false;
}
})
},
}
}
</script>
<style scoped lang="scss">
.u-coupon-popup {
/deep/ .u-mode-center-box {
background-color: transparent;
}
.coupon {
width: 750rpx;
height: 583rpx;
position: relative;
.price {
z-index: 3;
color: #EBB36E;
position: absolute;
font-size: 98rpx;
font-weight: bold;
top: 200rpx;
left: 50%;
transform: translate(-68%, 0);
}
.coupon-image {
width: 568rpx;
height: 583rpx;
position: absolute;
top: 0;
left: 50%;
transform: translate(-60%, 0);
}
.close-image {
position: absolute;
top: 0;
right: 155rpx;
width: 60rpx;
height: 60rpx;
}
}
}
</style>

12
pageB/photo/index.vue
View File

@ -27,7 +27,7 @@
<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" height="700rpx"> <u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" height="700rpx">
<view class="top"> <view class="top">
<text>评论</text> <text>评论</text>
<u-icon name="arrow-down" color="#333" size="28" @click="is_comment=false"></u-icon> <u-icon name="close" color="#333" size="28" @click="is_comment=false"></u-icon>
</view> </view>
<scroll-view class="scroll-box" scroll-y="true" lower-threshold="50" @scrolltolower="scrollBottom"> <scroll-view class="scroll-box" scroll-y="true" lower-threshold="50" @scrolltolower="scrollBottom">
<block v-for="(item,index) in commentList" :key="index"> <block v-for="(item,index) in commentList" :key="index">
@ -66,7 +66,7 @@
<!-- 评论box --> <!-- 评论box -->
<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx"> <u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
<view class="edit-box"> <view class="edit-box">
<input type="text" :focus="is_focus" :placeholder="edit_text_other" @focus="focus" v-model="send_value"> <input type="text" focus :placeholder="edit_text_other" @focus="focus" v-model="send_value">
<text @click="sendComment">发送</text> <text @click="sendComment">发送</text>
</view> </view>
</u-popup> </u-popup>
@ -180,13 +180,15 @@
z-index: 1000; z-index: 1000;
position: fixed; position: fixed;
top: 0; top: 0;
display: flex;
align-items: center;
justify-content: space-between;
width: 100%; width: 100%;
height: 88rpx; height: 88rpx;
padding: 0 20rpx; padding: 0 20rpx;
line-height: 88rpx; line-height: 88rpx;
background-color: #ECECEC; background-color: #ECECEC;
& > text { & > text {
margin-right: 280rpx;
color: #333; color: #333;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
@ -514,6 +516,10 @@ export default {
}, },
// 发布评论 // 发布评论
sendComment() { sendComment() {
if (this.send_value.length == 0) {
this.$u.toast("内容不能为空！");
return;
}
this.$u.post("article/articleAddComment",{ this.$u.post("article/articleAddComment",{
article_id: this.article_id, article_id: this.article_id,
content: this.send_value, content: this.send_value,

76
pageB/sdetails/index.vue
View File

@ -127,13 +127,15 @@
<image class="image" :src="goodsInfo.goods_image"></image> <image class="image" :src="goodsInfo.goods_image"></image>
<view class="info"> <view class="info">
<text class="u-line-2">{{goodsInfo.goods_name}}</text> <text class="u-line-2">{{goodsInfo.goods_name}}</text>
<text>￥{{goodsInfo.goods_price}}</text> <text v-if="type == 1">￥{{ goodsInfo.goods_price }}</text>
<text v-else-if="type == 2">￥{{ goodsInfo.pintuan_price }}</text>
<text v-else-if="type == 3">￥{{ groupbuyInfo.groupbuy_price }}</text>
</view> </view>
</view> </view>
<guige @sel="self" ref="guige" v-for="(item,index) in goodsInfo.spec_value" :key="index" :title="goodsInfo.spec_name[index]" :item="item"></guige> <guige @sel="self" ref="guige" v-for="(item,index) in goodsInfo.spec_value" :key="index" :title="goodsInfo.spec_name[index]" :item="item"></guige>
<view class="num"> <view class="num">
<text>购买数量</text> <text>购买数量</text>
<u-number-box v-model="goodsNumber"></u-number-box> <u-number-box v-model="goodsNumber" :min="1"></u-number-box>
</view> </view>
<view style="height:100rpx"></view> <view style="height:100rpx"></view>
</view> </view>
@ -194,7 +196,7 @@ export default {
goodsInfo: {}, // 商品信息 goodsInfo: {}, // 商品信息
storeInfo: {}, // 店铺信息 storeInfo: {}, // 店铺信息
glist: [], // 规格列表 glist: [], // 规格列表
id: 0, // 商品id/秒杀id/拼团 id id: 0, // 商品id
type: '', // 商品类型 商品详情 1普通 2拼团 3秒杀 4优惠券 type: '', // 商品类型 商品详情 1普通 2拼团 3秒杀 4优惠券
groupUser: [], // 拼团用户 groupUser: [], // 拼团用户
user_suc: [], // 拼团成功用户 user_suc: [], // 拼团成功用户
@ -213,7 +215,9 @@ export default {
sel: "", // 拼接的规格 sel: "", // 拼接的规格
quanxuan: false, // 规格是否选择 quanxuan: false, // 规格是否选择
debounce: true, // 防止多次提交订单 debounce: true, // 防止多次提交订单
storeid:0 // 店铺id storeid:0, // 店铺 id
pintuan_id: '', // 拼团 id
groupbuy_id: '', // 秒杀 id
} }
}, },
components: { components: {
@ -273,7 +277,7 @@ export default {
this.time = time; this.time = time;
this.date = date this.date = date
} }
console.log(123) // console.log(123)
this.$u.api.getAtwillUserInfo({ this.$u.api.getAtwillUserInfo({
id:this.storeid id:this.storeid
}).then((res)=>{ }).then((res)=>{
@ -347,13 +351,28 @@ export default {
this.showSpec = true; this.showSpec = true;
return false; return false;
} }
// 如果没有规格设规格已全选
if(this.goodsInfo.spec_value == null) {
this.quanxuan = true;
}
if(!this.quanxuan) {
this.$refs.uToast.show({
title: '请选择规格'
})
return false;
}
this.$u.api.addCart({ this.$u.api.addCart({
goods_id: this.id, goods_id: this.id,
quantity: this.goodsNumber, quantity: this.goodsNumber,
}).then(res => { }).then(res => {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
type: res.errCode == 0 ? 'success' : 'warning', duration: 1000,
callback: () => {
if(res.errCode == 0) {
this.showSpec = false;
}
}
}) })
}) })
}, },
@ -366,10 +385,10 @@ export default {
this.ordinaryDetails(id); this.ordinaryDetails(id);
break; break;
case 2: case 2:
this.pinTuanDetails(id); this.pinTuanDetails();
break; break;
case 3: case 3:
this.spikeGoodsDetails(id); this.spikeGoodsDetails();
break; break;
default: default:
break; break;
@ -377,38 +396,40 @@ export default {
}, },
// 普通商品详情 // 普通商品详情
ordinaryDetails(id) { ordinaryDetails(id) {
this.$u.api.getGoodsDetails({ id: id }).then((res)=>{ this.$u.api.getGoodsDetails({ id: id }).then(res => {
// console.log(res)
if (res.errCode == 0) { if (res.errCode == 0) {
this.evaluate = res.data.goods_evaluate_info; this.evaluate = res.data.goods_evaluate_info;
this.goodsInfo = res.data.goods; this.goodsInfo = res.data.goods;
this.storeInfo = res.data.store; this.storeInfo = res.data.store;
this.setSwiperList(res.data.goods_image); this.setSwiperList(res.data.goods_image);
this.glist = res.data.spec_list; this.glist = res.data.spec_list;
this.storeid = res.data.store.store_id this.storeid = res.data.store.store_id;
// console.log(this.goodsInfo.mobile_body);
this.type = res.data.view_type; this.type = res.data.view_type;
this.setTitle(); this.setTitle();
if(this.type == 1) { if(this.type == 1) {
this.id = res.data.goods.goods_id; this.id = res.data.goods.goods_id;
} else if(this.type == 2) { } else if(this.type == 2) {
this.id = res.data.goods.pintuan_id; this.id = res.data.goods.goods_id;
this.getGoodsDetails(this.id); this.pintuan_id = res.data.goods.pintuan_id;
this.getGoodsDetails();
} else if(this.type == 3) { } else if(this.type == 3) {
this.id = res.data.groupbuy_id; this.id = res.data.goods.goods_id;
this.getGoodsDetails(this.id); this.groupbuy_id = res.data.groupbuy_id;
this.getGoodsDetails();
} }
} }
}) })
}, },
// 拼团详情 // 拼团详情
pinTuanDetails(id) { pinTuanDetails() {
this.$u.api.getPinTuanDetails({ this.$u.api.getPinTuanDetails({
pintuan_id: id pintuan_id: this.pintuan_id,
goods_id: this.id,
}).then(res => { }).then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {
this.evaluate = res.data.data.goods_evaluate_info; this.evaluate = res.data.data.goods_evaluate_info;
this.goodsInfo = res.data.data.goods; this.goodsInfo = res.data.data.goods;
this.pintuan_id = res.data.data.pintuan_id;
this.setSwiperList(res.data.data.goods_image); this.setSwiperList(res.data.data.goods_image);
this.glist = res.data.data.spec_list; this.glist = res.data.data.spec_list;
this.user_suc = res.data.data.user_suc; this.user_suc = res.data.data.user_suc;
@ -418,13 +439,14 @@ export default {
}) })
}, },
// 秒杀详情 // 秒杀详情
spikeGoodsDetails(id) { spikeGoodsDetails() {
this.$u.api.getSpikeInfo({ this.$u.api.getSpikeInfo({
groupbuy_id: id groupbuy_id: this.groupbuy_id,
goods_id: this.id,
}).then(res => { }).then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {
// this.id = res.data.groupbuy_id;
this.groupbuyInfo = res.data.groupbuyInfo; this.groupbuyInfo = res.data.groupbuyInfo;
this.groupbuy_id = res.data.groupbuyInfo.groupbuy_id;
this.evaluate = res.data.goodsInfo.goods_evaluate_info; this.evaluate = res.data.goodsInfo.goods_evaluate_info;
this.goodsInfo = res.data.goodsInfo.goods; this.goodsInfo = res.data.goodsInfo.goods;
this.setSwiperList(res.data.goodsInfo.goods_image); this.setSwiperList(res.data.goodsInfo.goods_image);
@ -480,28 +502,29 @@ export default {
} }
if(this.type == 2) { if(this.type == 2) {
if(type == 'involvement') { if(type == 'involvement') {
// const userId = uni.getStorageSync('user_info').member.member_id;
this.$store.commit('setGroupHeadId', this.involvemenGroupInfo[0].user_id); this.$store.commit('setGroupHeadId', this.involvemenGroupInfo[0].user_id);
// console.log(this.$store.state.pintuangroup_headid);
Object.assign(params, { Object.assign(params, {
pintuan_id: this.id, pintuan_id: this.pintuan_id,
pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id, pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id,
}) })
} else { } else {
Object.assign(params, { Object.assign(params, {
pintuan_id: this.id, pintuan_id: this.pintuan_id,
}) })
} }
} }
this.$u.api.settlementOrder(params).then(res => { this.$u.api.settlementOrder(params).then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {
// console.log('type' + this.type);
this.$store.commit('setOrderType', this.type); this.$store.commit('setOrderType', this.type);
this.$store.commit('updateOrderInfo', res.data) this.$store.commit('updateOrderInfo', res.data)
this.$u.route({ this.$u.route({
url: '/pageC/cart/ConfirmOrder' url: '/pageC/cart/ConfirmOrder'
}) })
} else { } else {
this.$u.toast(res.message);
this.debounce = true; this.debounce = true;
this.$u.toast(res.message);
} }
}) })
}, },
@ -537,8 +560,9 @@ export default {
// console.log(id) // console.log(id)
// 选择完规格后设商品type = 1 // 选择完规格后设商品type = 1
// this.type = 1; // this.type = 1;
this.getGoodsDetails(this.glist[id]) // 改变 goods_id
this.id = this.glist[id]; this.id = this.glist[id];
this.getGoodsDetails();
}, },
// 设置页面标题 // 设置页面标题
setTitle() { setTitle() {

18
pageB/search/index.vue
View File

@ -18,11 +18,13 @@ export default {
searchwordlist: [], searchwordlist: [],
} }
}, },
// type: 2 商品 1: 其他 // type: 1 商品 2: 其他
onLoad(option) { onLoad(option) {
this.type = option.type; this.type = option.type;
this.getWordList();
this.curent = option.curent || 0 this.curent = option.curent || 0
this.getWordList();
if(option.type == 1) this.setNavSearchInput('搜索您需要的商品');
else if(option.type == 2) this.setNavSearchInput('请输入搜索内容');
}, },
// 点击搜索按钮 // 点击搜索按钮
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
@ -37,6 +39,18 @@ export default {
this.search(this.keyword); this.search(this.keyword);
}, },
methods:{ methods:{
setNavSearchInput(placeholder) {
// #ifdef APP-PLUS
// 修改 placeholder
webview.setStyle({
'titleNView': {
"searchInput": { //修改当前窗口search样式
"placeholder": placeholder,
}
}
})
// #endif
},
getWordList() { getWordList() {
this.$u.api.searchwordlist({type:this.type}).then(res => { this.$u.api.searchwordlist({type:this.type}).then(res => {
console.log(res) console.log(res)

40
pageB/video/video.nvue
View File

@ -8,7 +8,7 @@
</cover-image> </cover-image>
<!-- 用户操作 --> <!-- 用户操作 -->
<userinfo class="user-info" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo> <userinfo class="user-info" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
<cover-view class="info-box"> <cover-view class="info-box" @click="stopClick">>
<view class="video-info-box"> <view class="video-info-box">
<image class="image-play" src="../../static/videoIcon.png" mode=""></image> <image class="image-play" src="../../static/videoIcon.png" mode=""></image>
<text class="video-slip">视频</text> <text class="video-slip">视频</text>
@ -68,6 +68,7 @@
<script> <script>
import userinfo from "../components/userinfo/index" // 点赞组件 import userinfo from "../components/userinfo/index" // 点赞组件
const temp_url = "https://dmmall.sdbairui.com/api/";
export default { export default {
components: { components: {
userinfo userinfo
@ -101,7 +102,7 @@
// 获取信息 // 获取信息
getVideoInfo(article_id) { getVideoInfo(article_id) {
uni.request({ uni.request({
url: "https://dmmall.sdbairui.com/api/article/articleInfo", url: temp_url + "article/articleInfo",
method: "POST", method: "POST",
data: { data: {
article_id: article_id article_id: article_id
@ -130,7 +131,7 @@
// 获取评论 // 获取评论
getComment() { getComment() {
uni.request({ uni.request({
url: "https://dmmall.sdbairui.com/api/article/articleCommentList", url: temp_url + "article/articleCommentList",
method: "POST", method: "POST",
data: { data: {
article_id: this.article_id, article_id: this.article_id,
@ -144,6 +145,35 @@
} }
}) })
}, },
// 发布评论
sendComment() {
if (this.send_value.length == 0) {
this.$u.toast("内容不能为空！");
return;
}
uni.request({
url: temp_url + "article/articleAddComment",
method: "POST",
data: {
article_id: this.article_id,
content: this.send_value,
pid: this.pid,
reply_id: this.reply_id,
},
success: (res) => {
if (res.data.errCode == 0) {
this.send_value = "";
this.comment_num = res.data.num;
console.log(res.data);
} else {
uni.showToast({
title: res.data.message,
icon: "none"
})
}
}
})
},
// 获取手机信息 // 获取手机信息
getInfo() { getInfo() {
uni.getSystemInfo({ uni.getSystemInfo({
@ -201,6 +231,10 @@
this.loadinging = false; this.loadinging = false;
}, 2000) }, 2000)
}, },
// stop
stopClick(event) {
event.stopPropagation();
},
goBack() { goBack() {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1

4
pageC/cart/ConfirmOrder.vue
View File

@ -148,7 +148,7 @@ export default {
onLoad(option) { onLoad(option) {
this.orderType = this.$store.state.orderType; this.orderType = this.$store.state.orderType;
this.orderInfo = this.$store.state.orderInfo; this.orderInfo = this.$store.state.orderInfo;
// console.log(this.orderType); // console.log('orderType' + this.orderType);
// console.log(this.orderInfo); // console.log(this.orderInfo);
this.getGoodsClass(); this.getGoodsClass();
this.setTotalPrice(); this.setTotalPrice();
@ -204,6 +204,8 @@ export default {
this.withImmediate(); this.withImmediate();
} else if(this.orderType == 1) { } else if(this.orderType == 1) {
this.sendOrder(0); this.sendOrder(0);
} else if(this.orderType == 3) {
this.sendOrder(0);
} else { } else {
this.sendOrder(1); this.sendOrder(1);
} }

2
pageC/merchant/goods.vue
View File

@ -109,7 +109,7 @@ export default {
}) })
}, },
switchCurrent(current) { switchCurrent(current) {
if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc; if(current == 3 && this.current == 3) this.priceOrderAsc = !this.priceOrderAsc;
this.current = current; this.current = current;
}, },
setViewHeight() { setViewHeight() {

2
pageE/mine/EditUserInfo.vue
View File

@ -98,7 +98,7 @@ export default {
}, },
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if( e.index == 0 ) uni.navigateBack(); if( e.index == 0 ) uni.navigateBack();
if( e.index == 1 ) this.customers(); // if( e.index == 1 ) this.customers();
}, },
methods: { methods: {
customers(){ customers(){

2
pageE/mine/Integral.vue
View File

@ -46,7 +46,7 @@ export default {
this.$u.api.getMemberPointsStat().then((res)=>{ this.$u.api.getMemberPointsStat().then((res)=>{
if (res.errCode == 0) { if (res.errCode == 0) {
this.memberInfo = res.data; this.memberInfo = res.data;
this.nodes = common.unescapeHTML(this.memberInfo.points_rule); this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
} }
}) })
}, },

9
pageE/mine/MineConcerns.vue
View File

@ -3,8 +3,8 @@
<view class="concerns-container"> <view class="concerns-container">
<view v-for="(info, index) in list" :key="index"> <view v-for="(info, index) in list" :key="index">
<view class="daren-item"> <view class="daren-item">
<image class="head" :src="info.friend_tomavatar"></image> <image class="head" :src="info.friend_tomavatar" @click="viewDetails(info.friend_tomid)"></image>
<text class="name">{{ info.friend_tomname || '' }}</text> <text class="name" @click="viewDetails(info.friend_tomid)">{{ info.friend_tomname || '' }}</text>
<view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view> <view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
</view> </view>
</view> </view>
@ -37,6 +37,11 @@ export default {
} }
}) })
}, },
viewDetails(id) {
this.$u.route('pageB/details/index', {
id: id
});
},
changeType(id) { changeType(id) {
console.log(id); console.log(id);
this.$u.api.attentionMember({ this.$u.api.attentionMember({

2
pageE/order/Logistics.vue
View File

@ -43,12 +43,12 @@ export default {
methods: { methods: {
getOrderLogistics(id) { getOrderLogistics(id) {
this.$u.api.orderLogistics({ id: id }).then(res => { this.$u.api.orderLogistics({ id: id }).then(res => {
this.$u.toast(res.message);
if(res.errCode == 0) { if(res.errCode == 0) {
this.expressInfo = res.data.express_info; this.expressInfo = res.data.express_info;
this.list = res.data.express_list; this.list = res.data.express_list;
} else { } else {
this.list = []; this.list = [];
this.$u.toast(res.message);
} }
}) })
} }

36
pages.json
View File

@ -178,7 +178,7 @@
"searchInput": { "searchInput": {
"align": "left", "align": "left",
"borderRadius": "15px", "borderRadius": "15px",
"placeholder": "搜索您需要的商品", "placeholder": "请输入搜索内容",
"backgroundColor": "rgb(236,236,236)", "backgroundColor": "rgb(236,236,236)",
"placeholderColor": "#999999", "placeholderColor": "#999999",
"disabled": false, "disabled": false,
@ -198,7 +198,7 @@
"searchInput": { "searchInput": {
"align": "left", "align": "left",
"borderRadius": "15px", "borderRadius": "15px",
"placeholder": "搜索您需要的商品", "placeholder": "请输入搜索内容",
"backgroundColor": "rgb(236,236,236)", "backgroundColor": "rgb(236,236,236)",
"placeholderColor": "#999999", "placeholderColor": "#999999",
"disabled": false, "disabled": false,
@ -238,6 +238,18 @@
} }
} }
}, },
{
"path": "coupon/index",
"style": {
"navigationStyle": "custom",
"app-plus": {
"animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
"background": "transparent", // 背景透明
"backgroundColor": "rgba(0,0,0,0)", // 背景透明
"popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
}
}
},
{ {
"path": "coupon/details", "path": "coupon/details",
"style": { "style": {
@ -881,14 +893,14 @@
"text":"取消", "text":"取消",
"float":"left", "float":"left",
"fontSize":"14" "fontSize":"14"
},
{
"type":"none",
"text":"\ue62d",
"float":"right",
"fontSrc": "/static/fonts/customer.ttf",
"fontSize":"20"
} }
// {
// "type":"none",
// "text":"\ue62d",
// "float":"right",
// "fontSrc": "/static/fonts/customer.ttf",
// "fontSize":"20"
// }
] ]
} }
} }
@ -1029,6 +1041,12 @@
} }
], ],
"pages": [ "pages": [
// {
// "path" : "pageA/start/start",
// "style": {
// "navigationStyle": "custom"
// }
// },
{ {
"path": "pageA/welcome/welcome", "path": "pageA/welcome/welcome",
"style": { "style": {

75
pages/index/index.vue
View File

@ -27,11 +27,11 @@
<view class="list"> <view class="list">
<view> <view>
<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item" <videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
@getArticlelist="getArticlelist"></videoItem> @updateList="updateList"></videoItem>
</view> </view>
<view style="margin-left:20rpx"> <view style="margin-left:20rpx">
<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item" <videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
@getArticlelist="getArticlelist"></videoItem> @updateList="updateList"></videoItem>
</view> </view>
</view> </view>
<u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" /> <u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
@ -87,13 +87,6 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<u-popup v-model="showCoupon" mode="center" class="u-coupon-popup">
<view class="coupon">
<view class="price">{{ newMemberCoupon.price }}</view>
<image src="/static/image/common/30.png" class="coupon-image" @click="viewCoupon"></image>
<image src="/static/image/common/24.png" class="close-image" @click="showCoupon=false"></image>
</view>
</u-popup>
</view> </view>
</template> </template>
@ -103,6 +96,9 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100vh; height: 100vh;
/* #ifdef APP-PLUS */
padding-bottom: 100rpx;
/* #endif */
overflow: hidden; overflow: hidden;
.top { .top {
@ -208,41 +204,6 @@
margin: 200rpx auto 0; margin: 200rpx auto 0;
text-align: center; text-align: center;
} }
.u-coupon-popup {
/deep/ .u-mode-center-box {
background-color: transparent;
}
.coupon {
width: 750rpx;
height: 583rpx;
position: relative;
.price {
z-index: 3;
color: #EBB36E;
position: absolute;
font-size: 108rpx;
font-weight: bold;
top: 200rpx;
left: 50%;
transform: translate(-68%, 0);
}
.coupon-image {
width: 568rpx;
height: 583rpx;
position: absolute;
top: 0;
left: 50%;
transform: translate(-60%, 0);
}
.close-image {
position: absolute;
top: 0;
right: 155rpx;
width: 60rpx;
height: 60rpx;
}
}
}
</style> </style>
@ -284,8 +245,6 @@
loading: '努力加载中', loading: '努力加载中',
nomore: '实在没有了' nomore: '实在没有了'
}, },
showCoupon: false,
newMemberCoupon: {},
} }
}, },
components: { components: {
@ -304,16 +263,16 @@
if(this.$store.state.hasLogin){ if(this.$store.state.hasLogin){
this.isNewmembervoucher(); this.isNewmembervoucher();
const user = uni.getStorageSync('user_info'); const user = uni.getStorageSync('user_info');
console.log(user) // console.log(user)
this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar) this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
this.imService.connectIM() this.imService.connectIM()
let that = this let that = this
setTimeout(function(){ setTimeout(function(){
that.imService.disconnect() that.imService.disconnect()
console.log("guanbi") // console.log("guanbi")
},1000) },1000)
setTimeout(function(){ setTimeout(function(){
console.log("lianjie") // console.log("lianjie")
that.imService.connectIM() that.imService.connectIM()
},2000) },2000)
} }
@ -340,7 +299,7 @@
}, },
// 关注 // 关注
changeType(member_id) { changeType(member_id) {
console.log(member_id); // console.log(member_id);
// this.$emit("pChangeType"); // this.$emit("pChangeType");
this.$u.api.attentionMember({ this.$u.api.attentionMember({
member_id: member_id member_id: member_id
@ -410,6 +369,12 @@
} }
}) })
}, },
// 屏蔽更新列表
updateList() {
console.log(111);
this.page = 0;
this.getArticlelist();
},
// 发现下拉加载 // 发现下拉加载
swiperBottom(e) { swiperBottom(e) {
this.getArticlelist(); this.getArticlelist();
@ -504,18 +469,10 @@
isNewmembervoucher() { isNewmembervoucher() {
this.$u.api.isNewmembervoucher().then(res => { this.$u.api.isNewmembervoucher().then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {
this.newMemberCoupon = res.data; this.$u.route('/pageB/coupon/index');
this.showCoupon = true;
} else {
this.showCoupon = false;
} }
}) })
}, },
viewCoupon() {
this.$u.route('/pageB/coupon/details', {
price: this.newMemberCoupon.price
});
}
}, },
} }
</script> </script>

36
pages/mine/index.vue
View File

@ -46,7 +46,7 @@
<view class="title"> <view class="title">
<view class="title-text">我的订单</view> <view class="title-text">我的订单</view>
<view class="more" @click="toOtherPage('/order/Index')"> <view class="more" @click="toOtherPage('/order/Index')">
<view class="title-text">查看全部订单</view> <view class="title-text-more">查看全部订单</view>
<image src="/static/image/mine/21.png"></image> <image src="/static/image/mine/21.png"></image>
</view> </view>
</view> </view>
@ -71,14 +71,14 @@
<image src="/static/image/mine/37.png"></image> <image src="/static/image/mine/37.png"></image>
<view>拼团中</view> <view>拼团中</view>
</view> </view>
<view @click="toOtherPage('/order/Index?current=6')">
<image src="/static/image/mine/9.png"></image>
<view>售后</view>
</view>
<view @click="toOtherPage('/order/Index?current=7')"> <view @click="toOtherPage('/order/Index?current=7')">
<image src="/static/image/mine/3.png"></image> <image src="/static/image/mine/3.png"></image>
<view>待评价</view> <view>待评价</view>
</view> </view>
<view @click="toOtherPage('/order/Index?current=6')">
<image src="/static/image/mine/9.png"></image>
<view>售后</view>
</view>
</view> </view>
</view> </view>
<view class="tool"> <view class="tool">
@ -110,7 +110,7 @@
<view>收货地址</view> <view>收货地址</view>
</view> </view>
<view @click="toOtherPage('/more/AfterSalesHelp')"> <view @click="toOtherPage('/more/AfterSalesHelp')">
<image src="/static/image/mine/9.png"></image> <image src="/static/image/mine/38.png"></image>
<view>售后政策</view> <view>售后政策</view>
</view> </view>
<view @click="toOtherPage('/more/MineHelp')"> <view @click="toOtherPage('/more/MineHelp')">
@ -250,8 +250,9 @@ export default {
> view { > view {
margin-right: 80rpx; margin-right: 80rpx;
text-align: center; text-align: center;
font-size: 24rpx; font-size: 26rpx;
color:rgba(51,51,51,1); font-weight: 500;
color: #333;
> view:first-child { > view:first-child {
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
@ -275,7 +276,7 @@ export default {
.title { .title {
height: 76rpx; height: 76rpx;
font-size: 28rpx; font-size: 28rpx;
color: rgba(51,51,51,1); color: #666;
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
@ -290,6 +291,10 @@ export default {
transform: translate(-50%,0); transform: translate(-50%,0);
} }
} }
.title-text-more {
font-size: 24rpx;
color: #999;
}
.content { .content {
padding: $content-padding-top 0 $content-padding-bottom; padding: $content-padding-top 0 $content-padding-bottom;
display: flex; display: flex;
@ -329,6 +334,7 @@ export default {
} }
} }
.content { .content {
align-items: center;
justify-content: space-between; justify-content: space-between;
> view { > view {
display: flex; display: flex;
@ -337,22 +343,22 @@ export default {
justify-content: space-between; justify-content: space-between;
} }
> view:nth-child(1){ > view:nth-child(1){
@include image-size($image-width: 33rpx, $image-height: 36rpx); @include image-size($image-width: 36rpx, $image-height: 34rpx);
} }
> view:nth-child(2){ > view:nth-child(2){
@include image-size($image-width: 38rpx, $image-height: 32rpx); @include image-size($image-width: 38rpx, $image-height: 36rpx);
} }
> view:nth-child(3){ > view:nth-child(3){
@include image-size($image-width: 41rpx, $image-height: 33rpx); @include image-size($image-width: 40rpx, $image-height: 36rpx);
} }
> view:nth-child(4){ > view:nth-child(4){
@include image-size($image-width: 40rpx, $image-height: 35rpx); @include image-size($image-width: 38rpx, $image-height: 38rpx);
} }
> view:nth-child(5){ > view:nth-child(5){
@include image-size($image-width: 37rpx, $image-height: 37rpx); @include image-size($image-width: 36rpx, $image-height: 40rpx);
} }
> view:nth-child(6){ > view:nth-child(6){
@include image-size($image-width: 33rpx, $image-height: 35rpx); @include image-size($image-width: 36rpx, $image-height: 40rpx);
} }
} }
} }

BIN
static/image/mine/38.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.8 KiB