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

Compare commits

base: theluyuan:master
Branches Tags
theluyuan:master theluyuan:qxf theluyuan:zhy theluyuan:xbx theluyuan:gyh theluyuan:xbx-new theluyuan:zmr theluyuan:cmx theluyuan:lxb
..
compare: theluyuan:cmx
Branches Tags
theluyuan:master theluyuan:qxf theluyuan:zhy theluyuan:xbx theluyuan:gyh theluyuan:xbx-new theluyuan:zmr theluyuan:cmx theluyuan:lxb

2 Commits
master ... cmx

Author SHA1 Message Date
cmxdd
5e0162e3ea Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into cmx 2020-08-11 14:20:12 +08:00
cmxdd
282502a8d6 优惠券弹窗不关闭 2020-08-11 10:45:10 +08:00
174 changed files with 3146 additions and 6885 deletions
Expand all files Collapse all files

69
App.vue
View File

@@ -4,16 +4,10 @@
globalData: {
im: {}
},
computed: {
...mapState(["hasLogin"])
},
computed: {
...mapState(["hasLogin"])
},
onLaunch() {
// 禁止旋转
// #ifdef APP-PLUS
plus.screen.lockOrientation('portrait-primary');
// #endif
getApp().globalData.im = this.imService
// 缓存token
uni.getStorage({
@@ -22,54 +16,23 @@
this.loginIn(res.data);
}
})
// 刷新token
if (this.hasLogin) {
// 刷新token
if (this.hasLogin) {
this.refreshToken_function();
}
// #ifdef APP-PLUS
//app关闭默认的启动 方法关闭启动图。但是这个时间不能太晚，6s 超时后依旧会主动关闭。
setTimeout(()=>{
plus.navigator.closeSplashscreen();
},3000)
// #endif
},
onShow(){
// this.getVersion();
// console.log(this.$u.os())
let device_type = this.$u.os()
console.log({appversion:this.$app_version,device_type})
this.$u.api.recordAppOpenTimes({appversion:this.$app_version,device_type}).then((res)=>{
console.log(JSON.stringify(res))
});
},
onLoad() {
},
onHide(){
}
},
methods: {
...mapMutations(['loginIn']),
// 刷新token
refreshToken_function(){
this.$u.api.refreshToken({}).then((res) => {
// console.log(res);
if (res.errCode == 0) {
let token = res.data.token;
uni.setStorageSync('token', token);//存储toke值
}
})
},
getVersion() {
this.$u.post("Specialci/checkVersion",{ app_version: this.$app_version }).then(res => {
// console.log(res);
if(res.data.app_version != this.$app_version) {
this.$u.route('/pageE/setting/updateVersion', {
status: res.data.is_focus_upgrade
});
}
})
},
// 刷新token
refreshToken_function(){
this.$u.api.refreshToken({}).then((res) => {
// console.log(res);
if (res.errCode == 0) {
let token = res.data.token;
uni.setStorageSync('token', token);//存储toke值
}
})
},
}
}
</script>

8
README.md
View File

@@ -49,12 +49,4 @@ unescapeHTML(temp){}
* @return { object } promise 对象 resolve 返回文件服务器地址 reject 返回错误信息
*/
uploadFile({ url, name, filePath }) {}
/**
* 广告位跳转
* @param { String } type 跳转类型 1 商品 2 店铺 3 领取优惠券
* @param { String | Number } id 跳转id 商品id/商家id...
* @return { undefined } undefined
*/
jumpPage({ type, id }) ()
```

76
common/api/shop.js
View File

@@ -1,6 +1,6 @@
export default {
init(vm){
return {
return {
// 获取首页轮播
getIndexSwiper() {
return vm.$u.post('adv/indexadv');
@@ -54,10 +54,6 @@ export default {
getRecommendList(){
return vm.$u.post('MemberExpert/recommendList');
},
// 获取所有达人
getAllRecommendList({ page }) {
return vm.$u.post('MemberExpert/getRecommendList', { page });
},
// 达人（搜索）列表
getExpertList({ page, store_id, live_status, like_nickname }){
return vm.$u.post('MemberExpert/expertList', {
@@ -86,12 +82,11 @@ export default {
return vm.$u.post('Goods/getGoodsClassRecommend');
},
// goodsListByClassId
goodsListByClassId({ gc_id, page, order, keyword }) {
goodsListByClassId({ gc_id, page, order }) {
return vm.$u.post('goods/goodsListByClassId', {
gc_id: gc_id,
page: page,
order: order,
keyword:keyword
});
},
// 商品推荐
@@ -139,9 +134,15 @@ export default {
});
},
// 订单步骤2：发起订单，返回订单信息
sendOrder({ ifcart, cart_id, address_id, buy_city_id, pintuan_id, pintuangroup_id, voucher_id, member_deliver_type, invoice_id, pay_message }) {
sendOrder({ ifcart, cart_id, address_id, buy_city_id, pintuan_id, pintuangroup_id, voucher_id }) {
return vm.$u.post('buy/buy_step2', {
ifcart, cart_id, address_id, buy_city_id, pintuan_id, pintuangroup_id, voucher_id, member_deliver_type, invoice_id, pay_message
ifcart: ifcart,
cart_id: cart_id,
address_id: address_id,
buy_city_id: buy_city_id,
pintuan_id: pintuan_id,
pintuangroup_id: pintuangroup_id,
voucher_id: voucher_id, // 优惠券信息
});
},
// 订单步骤3：发起支付（第三方统一下单）
@@ -191,9 +192,9 @@ export default {
});
},
// 商品搜索
ShopSearch({keyword, page = 1, order = 'goods_salenum',sid=''}){
ShopSearch({keyword,page = 1,order = 'goods_salenum'}){
return vm.$u.post('ShopSearch/search',{
keyword,page,order,store_id:sid
keyword,page,order
})
},
// 秒杀推荐
@@ -201,10 +202,9 @@ export default {
return vm.$u.post('Spike/recommendedSpike');
},
// 秒杀详情
getSpikeInfo({ groupbuy_id, goods_id }) {
getSpikeInfo({ groupbuy_id }) {
return vm.$u.post('Spike/spikeInfo', {
groupbuy_id: groupbuy_id,
goods_id: goods_id,
groupbuy_id: groupbuy_id
});
},
// 秒杀列表
@@ -221,23 +221,13 @@ export default {
});
},
// 拼团商品详情
getPinTuanDetails({ pintuan_id, goods_id }) {
return vm.$u.post('Specialci/pintuanInfo', {
pintuan_id: pintuan_id,
goods_id: goods_id,
});
getPinTuanDetails({ pintuan_id }) {
return vm.$u.post('Specialci/pintuanInfo', { pintuan_id: pintuan_id });
},
// 推荐拼团
getPinTuanPush() {
return vm.$u.post('Specialci/pintuanPush');
},
// 拼团验证
pintuanVerify({ pintuan_id, pintuangroup_headid }) {
return vm.$u.post('Specialci/pintuanVerify', {
pintuan_id: pintuan_id,
pintuangroup_headid: pintuangroup_headid,
});
},
// 开团/参团
withImmediate({ pintuan_id, pintuangroup_headid, pintuangroup_id}) {
return vm.$u.post('Specialci/withImmediate', {
@@ -266,18 +256,17 @@ export default {
});
},
// 我的优惠券(已有的)
getMemberCouponList({ store_id, gc_id, type, status, page }) {
getMemberCouponList({ store_id, gc_id, type, status }) {
return vm.$u.post('Coupon/getMemberCouponList', {
store_id: store_id,
gc_id: gc_id,
type: type,
status: status,
page: page,
});
},
// 获取直播列表
tabLiveList({page}){
return vm.$u.post('Specialci/tabLiveList',{page})
tabLiveList(){
return vm.$u.post('Specialci/tabLiveList')
},
// 商城-活动广告
getStoreActivity() {
@@ -355,32 +344,7 @@ export default {
isNewmembervoucher() {
return vm.$u.post('Coupon/isNewmembervoucher')
},
//待发货退款
addrefundall({order_id,reason_info}) {
return vm.$u.post('order/add_refund_all',{order_id,reason_info})
},
//提示文字
tips(){
return vm.$u.post('Shop/tips')
},
//内容
tipsinfo({document_code}){
return vm.$u.post('Shop/tipInfo',{document_code})
},
advClick({ adv_id }) {
return vm.$u.post('adv/advClick',{ adv_id })
},
//统计登录
recordAppOpenTimes({appversion,device_type}){
// appversion=1.0.0&device_type=android/ios
return vm.$u.post("Member/recordAppOpenTimes",{appversion,device_type})
},
//统计直播间浏览次数
// https://mall.dmygkeji.com/api/Live/countLiveBrowse?live_id=1
countLiveBrowse({live_id}){
return vm.$u.post("Live/countLiveBrowse",{live_id})
}
}
}
}
}

112
common/api/user.js
View File

@@ -154,11 +154,10 @@ export default {
});
},
// 美甲-提交订单
addManicure({ name, phone, time }) {
addManicure({ name, time }) {
return vm.$u.post('MemberManicure/addManicure', {
name: name,
phone: phone,
// time: time
time: time
});
},
// 会员服务-积分数
@@ -218,12 +217,6 @@ export default {
page: page,
});
},
// 删除浏览记录
delMemberBrowse({ goods_id }) {
return vm.$u.post('Member/delMemberBrowse', {
goods_id: goods_id,
});
},
// 意见反馈列表
getFeedbackList({ page }) {
return vm.$u.post('Member/feedbackList', {
@@ -243,17 +236,13 @@ export default {
if(type > 0) Object.assign(params, {type: type});
return vm.$u.post('Order/orderList', params);
},
// 各种订单数量
getOrderNumber() {
return vm.$u.post('order/orderNumber');
},
// 售后列表
// getAfterSaleList({ page }) {
// return vm.$u.post('order/afterSaleList', { page: page });
// },
// 试穿列表
goodsTryOrderList({ page }) {
return vm.$u.post('order/goodsTryOrderList', { page });
goodsTryOrderList() {
return vm.$u.post('order/goodsTryOrderList');
},
// 试穿订单确认完成
goodsTryConfirm({ id }) {
@@ -315,8 +304,8 @@ export default {
return vm.$u.post('Message/informationList', { });
},
// 关注列表
snsfriendList({page}) {
return vm.$u.post('message/snsfriendList', {page});
snsfriendList({ }) {
return vm.$u.post('message/snsfriendList', { });
},
// 关注达人
attentionMember({ member_id }) {
@@ -358,12 +347,6 @@ export default {
code: code,
});
},
// 获取可送洗商品
getSendOrderList({ page }) {
return vm.$u.post('member/getSendOrderList', {
page: page,
});
},
// 送洗列表-平台订单 实体店订单
sendLaundryOrderList({ type, page }) {
return vm.$u.post('member/sendLaundryOrderList', {
@@ -376,9 +359,10 @@ export default {
return vm.$u.post('member/getClothesTypeList');
},
// 送洗评价
sendOrderComment({ id, comment, comment_img }) {
sendOrderComment({ id, comment }) {
return vm.$u.post('member/sendOrderComment', {
id, comment, comment_img
id: id,
comment: comment,
});
},
// 送洗确认完成
@@ -424,81 +408,9 @@ export default {
return vm.$u.post('article/articleCollectList');
},
// 关注用户列表
attentionMemberList({ page = 1,role } = {}) {
return vm.$u.post('member/attentionMemberList', { page, role });
attentionMemberList() {
return vm.$u.post('member/attentionMemberList');
},
// 可用优惠券商品
couponGoodsList({ voucher_id, page, order }) {
return vm.$u.post('Coupon/couponGoodsList', {
page: page,
vouchertemplate_id: voucher_id,
order: order,
});
},
//取消红点
dynamicRead({id}) {
return vm.$u.post('message/dynamicRead', {
friend_tomid:id
});
},
//店铺取关
attentionMemberRemove({id}) {
return vm.$u.post('Member/attentionMemberRemove', {
friend_tomid:id
});
},
// 设置里的帮助
getSettingHelpList() {
return vm.$u.post('document/help');
},
//获取默认头像
getDefaultAvatar(){
return vm.$u.post("member/getDefaultAvatar")
},
// 第三方账号绑定【微信|QQ】
bindingThird({ openid, type }) {
return vm.$u.post("auth/memberBindThird", {
third_openid: openid,
third_type: type,
})
},
// 解绑
unbindingThird({ type }) {
return vm.$u.post("auth/memberUnbindThird", {
third_type: type,
})
},
getIndustryList() {
return vm.$u.post("Expertapply/industryList")
},
getHobbyList() {
return vm.$u.post("Expertapply/hobbyList")
},
// 达人申请
applyExpert({ name, mobile, idcard, address, industry, hobby }) {
return vm.$u.post("Expertapply/expertApply", {
name, mobile, idcard, address, industry, hobby
})
},
getInvoiceList() {
return vm.$u.post("Invoice/invoiceList")
},
getInvoiceInfo({ invoice_id }) {
return vm.$u.post("Invoice/invoiceInfo", { invoice_id })
},
invoiceAdd({ invoice_type, invoice_title, invoice_code, invoice_goto_addr, invoice_rec_mobphone, invoice_reg_bname, invoice_reg_baccount }) {
return vm.$u.post("Invoice/invoiceAdd", {
invoice_type, invoice_title, invoice_code, invoice_goto_addr, invoice_rec_mobphone, invoice_reg_bname, invoice_reg_baccount
})
},
invoiceEdit({ invoice_id, invoice_title, invoice_code, invoice_goto_addr, invoice_rec_mobphone, invoice_reg_bname, invoice_reg_baccount, invoice_type }) {
return vm.$u.post("Invoice/invoiceEdit", {
invoice_id, invoice_title, invoice_code, invoice_goto_addr, invoice_rec_mobphone, invoice_reg_bname, invoice_reg_baccount, invoice_type
})
},
invoiceDel({ invoice_id }) {
return vm.$u.post("Invoice/invoiceDel", { invoice_id })
},
}
}
}
}

46
common/http.interceptor.js
View File

@@ -2,7 +2,7 @@ var md5 = require("../static/js/md5.min.js")
const install = (Vue, vm) => {
// 此为自定义配置参数，具体参数见上方说明
Vue.prototype.$u.http.setConfig({
baseUrl: 'https://mall.dmygkeji.com/api',
baseUrl: 'https://dmmall.sdbairui.com/api',
loadingText: '努力加载中~',
loadingTime: 800,
originalData: true
@@ -47,34 +47,24 @@ const install = (Vue, vm) => {
// 假设201为token失效，这里跳转登录
// vm.$u.toast('您还没有登录哦，请先去登录！');
if (res.data.data.action != "memberinfo") {
uni.showToast({
title: "您还没有登录，请先去登录哦！",
icon: "none"
uni.showModal({
title: "温馨提示",
content: "您还未登录，请立即登录",
cancelText: "以后再说",
confirmText: "立即登录",
confirmColor: "#FF780F",
success(res) {
// console.log(res);
if (res.confirm) {
setTimeout(() => {
// 此为uView的方法，详见路由相关文档
vm.$u.route('/pageA/login/login')
}, 500)
}
if (res.cancel) {
}
}
})
setTimeout(() => {
// 此为uView的方法，详见路由相关文档
uni.navigateTo({
url: "/pageA/login/login",
})
}, 1000)
// uni.showModal({
// title: "温馨提示",
// content: "您还未登录，请立即登录",
// cancelText: "以后再说",
// confirmText: "立即登录",
// confirmColor: "#FF780F",
// success(res) {
// // console.log(res);
// if (res.confirm) {
// setTimeout(() => {
// // 此为uView的方法，详见路由相关文档
// vm.$u.route('/pageA/login/login')
// }, 500)
// }
// if (res.cancel) {
// }
// }
// })
}
return false;
} else if (res.errCode == 1) {

26
common/store/index.js
View File

@@ -18,13 +18,7 @@ const store = new Vuex.Store({
loadmore: {}, // 下拉加载返回的数据
hasLogin: false, // 登录状态
token: "", // 储存token
showLoginModel: false, // 登录框
question: {}, // 帮助与反馈
showCoupons: true, // 是否显示新人领取优惠券
invoiceInfo: { // 是否选择发票
invoice_type: '',
invoice_id: 0,
}
showLoginModel: false, // 登录框
},
getters: {
getOrderAddress(state) {
@@ -35,15 +29,8 @@ const store = new Vuex.Store({
},
getGoodsInfo(state) {
return state.goodsDetails.goods;
},
hasInvoice(state) {
const type = state.invoiceInfo.invoice_type;
return type ? type : 0;
},
getInvoiceId(state) {
return state.invoiceInfo.invoice_id || 0;
}
},
},
mutations: {
// 登录
loginIn(state, token) {
@@ -88,15 +75,6 @@ const store = new Vuex.Store({
},
setLoadMore(state, info) {
state.loadmore = info;
},
setQuestion(state, question) {
state.question = question;
},
updateShowCoupons(state, status) {
state.showCoupons = status;
},
setInvoiceInfo(state, invoice = {}) {
state.invoiceInfo = invoice;
}
}
})

13
components/comment/index.vue
View File

@@ -2,14 +2,14 @@
<view class="comment-item">
<view class="user">
<u-avatar :src="content.member_avatar" class="avatar" size="60"></u-avatar>
<text class="name">{{ content.member_nickname }}</text>
<text class="name">{{ content.geval_frommembername }}</text>
<u-rate v-if="reply" :disabled='true' :count="count" v-model="rate" size="23" active-color="#FF780F" inactive-color="#F0EDF1" gutter="10"></u-rate>
</view>
<view class="content">
<view class="text">{{ content.geval_content }}</view>
</view>
<view class="image-container">
<image :src="src" v-for="(src, index) in content.geval_image" :key="index" @click="previewImage(content.geval_image, index)" mode="aspectFit"></image>
<image :src="src" v-for="(src, index) in content.geval_image" :key="index"></image>
</view>
<view class="reply" v-if="reply && content.geval_explain">
<view class="title">掌柜回复：</view>
@@ -39,15 +39,6 @@ export default {
},
created() {
if(this.content.hasOwnProperty('scores_two')) this.rate = this.content.scores_two;
},
methods: {
previewImage(urls, index) {
// console.log(urls);
uni.previewImage({
urls: urls,
current: urls[index]
});
},
}
};
</script>

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

@@ -1,12 +1,9 @@
<template>
<view class="video-item" v-if="item" @click="toDetailsPage(item.article_id,item.video_path)">
<image class="head" :src="item.article_pic" v-if="item.type == 1"></image>
<view class="header_fist" v-else>
<view class="backes">
<u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon>
<text>视频</text>
</view>
<image class="head" :src="item.article_pic" mode="aspectFill"></image>
<image class="head" :src="item.article_pic" v-if="item.type == 1" ></image>
<view class="header_fist" v-else>
<view class="backes"></view>
<image class="head" :src="item.article_pic" ></image>
</view>
<view class="title" v-if="">{{ item.article_title }}</view>
<view class="jianjie">{{ item.article_content }}</view>
@@ -15,7 +12,7 @@
<image :src="item.member_avatar"></image>
<text>{{ item.member_nickname }}</text>
</view>
<image class="img-imp" src="/static/image/common/4.png" @click.stop="showAction"></image>
<image src="/static/image/common/4.png" @click.stop="showAction"></image>
<view class="action" v-if="show == item.article_id">
<view class="bubble">
<view @click.stop="articleLike">
@@ -54,14 +51,14 @@
.title{
margin:0 auto;
margin-top: 4rpx;
font-size: 23rpx;
font-size: 28rpx;
color: #333;
font-weight: 500;
line-height: 36rpx;
line-height: 40rpx;
width: 300rpx;
overflow:hidden;
text-overflow:ellipsis;
display:-webkit-box;
display:-webkit-box;
-webkit-box-orient:vertical;
-webkit-line-clamp:2;
}
@@ -69,7 +66,7 @@
margin:0 auto;
margin-top: 10rpx;
font-size: 22rpx;
color: #656565;
color: #666;
line-height: 30rpx;
width: 300rpx;
margin-left: 18rpx;
@@ -103,9 +100,8 @@
}
}
>image{
width: 35rpx;
width: 37rpx;
height: 8rpx;
padding: 20rpx;
}
.action {
z-index: 19;
@@ -176,22 +172,11 @@
.header_fist{
position: relative;
.backes{
z-index: 99;
position: absolute;
display: flex;
align-items: center;
justify-content: space-around;
top: 10rpx;
left: 10rpx;
width: 80rpx;
height: 30rpx;
padding: 0 10rpx;
border-radius: 30rpx;
background-color: rgba(0,0,0,0.5);
& > text {
color: #fff;
font-size: 18rpx;
}
top: 0;
width: 100%;
height: 100%;
color: #fff;
}
}
@@ -257,9 +242,7 @@ export default {
if(res.errCode == 0) {
this.$u.toast(res.message);
this.$emit("updateList");
} else {
this.$u.toast(res.message);
}
}
})
},
toDetailsPage(id,type) {

28
components/index/zhibo-item/index.vue
View File

@@ -3,12 +3,12 @@
<image class="head" :src="image"></image>
<view class="user">
<view class="name">
<image :src="item.member_avatar"></image>
<image></image>
<text class="u-line-1" style="width:130rpx">{{name}}</text>
</view>
<view class="pingbi" @click.stop="articleAddShield">
<image src="/static/image/common/7.png"></image>
<text>屏蔽用户</text>
<view class="pingbi">
<image></image>
<text>1屏蔽用户</text>
</view>
</view>
</view>
@@ -73,9 +73,6 @@ export default {
},
methods:{
zhibo(){
this.$u.api.countLiveBrowse({live_id:this.zid}).then((res)=>{
console.log(JSON.stringify(res),77)
})
this.$u.route({
url:"/pages/zhibo/index",
params:{
@@ -84,21 +81,8 @@ export default {
rid:this.rid
}
})
},
articleAddShield() {
console.log(this.item)
this.$u.api.articleAddShield({
member_id: this.item.user_id,
}).then(res => {
// console.log(res)
if(res.errCode == 0) {
this.$u.toast(res.message);
this.$emit("updateList");
}
})
},
}
},
props:['name','image','url','zid','rid','item']
props:['name','image','url','zid','rid']
}
</script>

47
components/informations/notice/notice.vue
View File

@@ -1,12 +1,10 @@
<template>
<view class="notice" :style="{height : height + 'px'}">
<view class="notice">
<view v-for="(item,index) in notice" :key="index" @click="gotoInfo(index)">
<view class="time_notice">{{ item.addtime }}</view>
<view class="notice_view">
<image :src="item.picture" mode="aspectFill" ></image>
<view class="text_view">
<view class="u-line-2">{{ item.content }}</view>
</view>
<view class="text_view u-line-2">{{ item.content }}</view>
<view class="notice_list">
<text>查看详情</text>
<u-icon name="arrow-right" color="#666"></u-icon>
@@ -30,17 +28,20 @@
border-radius: 20rpx 20rpx 0px 0px;
}
.text_view{
width: 690rpx;
height: 120rpx;
padding: 26rpx;
color: #333;
font-size: 26rpx;
line-height: 38rpx;
font-size:26rpx;
font-weight:400;
color:rgba(51,51,51,1);
margin: 28rpx 0 30rpx 0;
width: 643rpx;
margin: 0 auto;
text-align: left;
line-height: 40rpx;
}
.notice_view > view:nth-child(3){
height: 80rpx;
line-height: 80rpx;
height: 84rpx;
line-height: 84rpx;
border-top: 1px #F5F5F5 solid;
margin-top: 30rpx;
}
}
.time_notice{
@@ -51,11 +52,22 @@
padding: 26rpx 0 39rpx 0;
}
.notice_list{
display: flex;
align-items: center;
justify-content: space-between;
text-align: left;
display: inline-block;
width: 100%;
position: relative;
padding: 0 25rpx;
margin: 0 auto;
display: block;
}
.notice_list > view{
text-align: right;
position: absolute;
right: 25rpx;
top: 0;
bottom: 0;
margin: auto;
}
</style>
@@ -65,8 +77,7 @@
props: ['list'],
data() {
return {
notice : [],
height : ''
notice : []
};
},
watch: {
@@ -75,8 +86,6 @@
this.notice = newVal;
}
},
onLoad() {
},
methods: {
gotoInfo(index) {
console.log(index);

2
components/logininput/logininput.vue
View File

@@ -17,7 +17,7 @@
<text>我已详细阅读并同意</text>
<text class="pact_text">《用户协议》</text>
<text class="pact_text">《隐私协议》</text>
<!-- <text class="pact_text">《使用协议》</text> -->
<text class="pact_text">《使用协议》</text>
<u-checkbox-group @change="checkboxGroupChange" size="27">
<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
shape="circle" size="14" active-color="#19BE6B"></u-checkbox>

3
components/mine/address-active/index.vue
View File

@@ -80,6 +80,7 @@ export default {
//　判断是不是编辑页面 调用接口
confirmBtn() {
if(!this.debounce) return;
this.debounce = false;
this.info ? this.editAddress() : this.addAddress();
},
// chooseArea() {
@@ -118,7 +119,6 @@ export default {
},
addAddress() {
if(!this.validateValue()) return false;
this.debounce = false;
this.$u.api.addressAdd({
area_id: this.area_id,
city_id: this.city_id,
@@ -144,7 +144,6 @@ export default {
},
editAddress() {
if(!this.validateValue()) return false;
this.debounce = false;
this.$u.api.addressEdit({
address_id: this.info.address_id,
area_id: this.area_id,

12
components/mine/collection-item/index.vue
View File

@@ -46,7 +46,6 @@ export default {
},
methods: {
viewGoodsDetails(item) {
if(this.closeAction()) return false;
const list = this.list.filter(item => {
return item.show;
})
@@ -58,17 +57,6 @@ export default {
}
})
},
closeAction() {
let status = false;
this.list.map((val, idx) => {
if(val.show) {
status = true;
this.$set(this.list[idx], 'show', false);
};
})
this.$forceUpdate();
return status;
},
getGoodsFavoritesList() {
this.$u.api.getFavoritesList().then(res => {
if(res.errCode == 0) {

14
components/mine/comment/index.vue
View File

@@ -6,8 +6,8 @@
</view>
<view class="user-comment">
<view class="text u-line-2">{{ info.comment }}</view>
<view class="image" v-if="info.comment_img">
<image :src="info.comment_img" mode="aspectFit" @click="previewImage(info.comment_img)"></image>
<view class="image">
<image v-for="(src, index) in info.images" :key="index" :src="src" mode="aspectFit"></image>
</view>
</view>
</view>
@@ -19,14 +19,6 @@ export default {
},
props: {
info: Object,
},
methods: {
previewImage(urls) {
const imagesUrl = [urls];
uni.previewImage({
urls: imagesUrl,
});
},
}
};
</script>
@@ -55,12 +47,12 @@ export default {
font-size: 26rpx;
color: rgba(51,51,51,1);
line-height: 40rpx;
margin-bottom: 19rpx;
}
.image {
display: flex;
flex-wrap: wrap;
> image {
margin-top: 20rpx;
width: 210rpx;
height: 210rpx;
border-radius: 10rpx;

4
components/mine/coupon/index.vue
View File

@@ -2,8 +2,8 @@
<view class="c-coupon">
<view class="coupon-usable">
<view class="info-type" :style="{ backgroundImage: 'url(' + '/static/image/mine/30.png' + ')', backgroundSize:'contain', backgroundRepeat: 'no-repeat' }">
<div class="wrap_left_top" v-if="couponInfo.type == 1">{{ couponInfo.vouchertemplate_id == 1 ? '新人专享' : '平台优惠券' }}</div>
<div class="wrap_left_top" v-else-if="couponInfo.type == 2">店铺优惠券</div>
<div class="wrap_left_top"></div>
{{ couponInfo.type == 2 ? '店铺优惠券' : '平台优惠券' }}
</view>
<view class="coupon-info">
<view class="info-usable">

18
components/mine/coupon/mine.vue
View File

@@ -1,9 +1,9 @@
<template>
<view class="c-coupon" v-if="goodsClass.length" @click="use">
<view :class="couponInfo.voucher_state != 1 ? 'coupon-unable' : 'coupon-usable'" :style="{'width': type ? '650rpx' : '' }">
<view class="c-coupon" v-if="goodsClass.length">
<view :class="couponInfo.voucher_state != 1 ? 'coupon-unable' : 'coupon-usable'">
<view class="info-type" :style="{ backgroundImage: 'url(' + (couponInfo.voucher_state == 1 ? '/static/image/mine/30.png' : '/static/image/mine/31.png') + ')', backgroundSize:'contain', backgroundRepeat: 'no-repeat' }">
<div class="wrap_left_top" v-if="couponInfo.type == 1">{{ couponInfo.vouchertemplate_id == 1 ? '新人专享' : '平台优惠券' }}</div>
<div class="wrap_left_top" v-else-if="couponInfo.type == 2">店铺优惠券</div>
<div class="wrap_left_top"></div>
{{ couponInfo.type == 2 ? '店铺优惠券' : '平台优惠券' }}
</view>
<view class="coupon-info">
<view class="info-usable">
@@ -14,13 +14,12 @@
<view class="info-integral">兑换积分：{{ couponInfo.voucher_points }}积分</view>
<view class="info-date">有效期{{ couponInfo.voucher_startdate }}-{{ couponInfo.voucher_enddate }}</view>
</view>
<view class="coupon-btn" :style="{'right': type ? '110rpx' : '' }">
<text v-if="couponInfo.voucher_state == 1">立即使用</text>
<view class="coupon-btn">
<text v-if="couponInfo.voucher_state == 1" @click="use">立即使用</text>
<image v-if="couponInfo.voucher_state == 2" src="/static/image/mine/28.png"></image>
<image v-if="couponInfo.voucher_state == 3" src="/static/image/mine/29.png"></image>
</view>
</view>
<image v-if="type" style="width:35rpx;height:35rpx;margin-left:14rpx;" :src="'/static/image/mine/' + (sel ? '41.png' : '42.png') "></image>
</view>
</template>
<script>
@@ -38,8 +37,6 @@ export default {
status: Number,
couponInfo: Object,
goodsClass: Array,
type:Boolean,
sel:Boolean
},
created() {
// console.log(this.goodsClass);
@@ -56,7 +53,6 @@ export default {
},
methods: {
use() {
if(this.couponInfo.voucher_state != 1) return;
this.$emit('use', this.couponInfo);
},
},
@@ -67,8 +63,6 @@ export default {
position: relative;
z-index: 9;
margin-bottom: 30rpx;
display: flex;
align-items: center;
@mixin coupon-image($url) {
width: 690rpx;
height: 194rpx;

134
components/mine/order-item/index.vue
View File

@@ -8,12 +8,14 @@
<view class="order-status">{{ state }}</view>
</view>
<view class="goods-info">
<view class="goods-item" @click="toOtherPage('Details')" v-for="(goods,index) in order.extend_order_goods" :key="index">
<view class="goods-item" @click="toOtherPage('Details')" v-for="goods in order.extend_order_goods" :key="goods.goods_id">
<image :src="goods.goods_image"></image>
<view class="goods-text">
<view class="goods-name u-line-2">{{ goods.goods_name }}</view>
<view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">{{ goods.goods_spec | concatSpec }}</view>
<!-- <view class="goods-time u-line-1" v-if="order.view_type == 1">结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}</view> -->
<view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">
<text v-for="(spec, index) in goods.goods_spec" :key="index">{{ spec + ';' }}</text>
</view>
<view class="goods-time u-line-1" v-if="order.view_type == 1">结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}</view>
<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}</view>
<view class="goods-date" v-if="order.order_state == 20 || order.order_state == 40">
<image src="@/pageE/static/mine/26.png"></image>
@@ -22,20 +24,14 @@
</view>
</view>
</view>
<view class="order-btn" v-if="[1, 2, 3, 4, 8, 11].indexOf(order.view_type) >= 0">
<!-- || order.view_type == 2 -->
<view class="order-btn" v-if="[1, 2, 3, 4, 8, 9].indexOf(order.view_type) >= 0">
<view class="cancel" v-if="(order.view_type == 3 || order.view_type == 2) && order.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
<view class="cancel" v-if="order.view_type == 3 && order.shipping_code && (order.store_deliver_type ? order.store_deliver_type != 3 : order.member_deliver_type != 3)" @click="toOtherPage('Logistics')">查看物流</view>
<view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
<view class="cancel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view>
<!-- <view class="cancel" v-if="order.view_type == 9" @click="cancelOrder">取消订单</view> -->
<view class="phone" v-if="order.view_type == 3 && order.takeawayer_phone" @click="makePhone(order.takeawayer_phone)">
<u-icon name="phone-fill" color="#FF780F" size="28"></u-icon>
<text>联系骑手</text>
</view>
<!-- || order.view_type == 9 -->
<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount,order.order_id)">立即支付</view>
<view class="cancel" v-if="order.view_type == 9" @click="cancelOrder">取消订单</view>
<view class="payment" v-if="order.view_type == 1 || order.view_type == 9" @click="payNow(order.pay_sn, order.order_amount,order.order_id)">立即支付</view>
<view class="service" v-if="order.view_type == 8">联系官方客服</view>
<view class="submit" v-if="order.view_type == 8">提交官方审核</view>
</view>
@@ -46,27 +42,49 @@ import common from '@/static/js/common.js';
export default {
data() {
return {
state: '',
}
},
props: {
order: Object
},
mounted() {
// this.viewState();
},
filters: {
concatSpec(value) {
let spec = '';
for (const key in value) {
if (value.hasOwnProperty(key)) {
const element = value[key];
spec = spec + element + ';'
}
}
return spec;
}
this.viewState();
},
methods: {
viewState() {
let state;
switch (this.order.view_type) {
case 1:
state = '待支付';
break;
case 2:
state = '待发货';
break;
case 3:
state = '待收货';
break;
case 4:
state = '待评价';
break;
case 5:
state = '交易成功';
break;
case 6:
state = '待退款';
break;
case 7:
state = '已退款';
break;
case 9:
state = '拼团中';
break;
default:
break;
}
// console.log(state);
this.state = state;
},
cancelOrder() {
this.$u.api.cancelOrder({
order_id: this.order.order_id,
@@ -90,7 +108,6 @@ export default {
toOtherPage(url) {
this.$u.route('/pageE/order/' + url, {
oid: this.order.order_id,
type:this.order.view_type
});
},
payNow(pay_sn, order_amount, id) {
@@ -100,57 +117,7 @@ export default {
order_id: id
});
},
makePhone(phone) {
uni.makePhoneCall({
phoneNumber: phone
});
}
},
computed:{
state() {
let state;
// console.log(this.order.view_type);
switch (this.order.view_type) {
case 1:
state = '待支付';
break;
case 2:
state = '待发货';
break;
case 3:
state = '待收货';
break;
case 4:
state = '待评价';
break;
case 5:
state = '交易成功';
break;
case 6:
state = '待退款';
break;
case 7:
state = '商家已退款';
break;
case 9:
state = '拼团中';
break;
case 10:
state = '已取消';
break;
case 11:
state = '商家已拒绝';
break;
case 12:
state = '平台已退款';
break;
default:
break;
}
// console.log(state);
return state;
},
}
};
</script>
<style lang="scss" scoped>
@@ -205,7 +172,7 @@ export default {
line-height: 38rpx;
}
.goods-sku {
align-self: baseline;
display: inline-block;
max-width: 230rpx;
background: rgba(236,236,236,1);
border-radius: 6rpx;
@@ -239,7 +206,7 @@ export default {
display: flex;
justify-content: flex-end;
@mixin btn-class($width, $color) {
// width: $width;
width: $width;
height: 60rpx;
border: 2rpx solid $color;
color: $color;
@@ -262,15 +229,6 @@ export default {
.submit {
@include btn-class($width: 216rpx, $color: rgba(255,119,15,1));
}
.phone {
@include btn-class($width: 206rpx, $color: rgba(255,119,15,1));
display: flex;
align-items: center;
justify-content: center;
.u-icon {
margin-right: 10rpx;
}
}
}
}
</style>

18
components/mine/order-item/try.vue
View File

@@ -12,7 +12,9 @@
<image :src="order.goods_image"></image>
<view class="goods-text">
<view class="goods-name u-line-2">{{ order.goods_name }}</view>
<view class="goods-sku u-line-1" v-if="order.goods_spec">{{ order.goods_spec | concatSpec }}</view>
<!-- <view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">
<text v-for="(spec, index) in goods.goods_spec" :key="index">{{ spec + ';' }}</text>
</view> -->
<!-- <view class="goods-time u-line-1" v-if="order.order_state == 10 || order.order_state == 10">结束时间：{{ order.add_time * 1000 | date('yyyy-mm-dd hh:MM') }}</view> -->
</view>
</view>
@@ -36,18 +38,7 @@ export default {
created() {
this.viewState();
},
filters: {
concatSpec(value) {
let spec = '';
for (const key in value) {
if (value.hasOwnProperty(key)) {
const element = value[key];
spec = spec + element + ';'
}
}
return spec;
}
},
filters: {},
methods: {
// "goods_try_order_status": 0, 试穿订单状态 0:待处理订单 20:同意 40:拒绝此订单 50:完成
viewState() {
@@ -140,7 +131,6 @@ export default {
line-height: 38rpx;
}
.goods-sku {
align-self: baseline;
max-width: 230rpx;
background: rgba(236,236,236,1);
border-radius: 6rpx;

709
components/remaining/remaining.vue
View File

@@ -1,382 +1,327 @@
<template>
<view>
<!-- <image v-if="type" class="welcome_images" src="../../static/pageA/welcome_img.jpg" mode="aspectFill"></image> -->
<view v-if="type" id="video_mp4">
<view class="page-body">
<view class="page-section">
<video id="myVideo" enable-progress-gesture="false" :src=" 'https://' + vide0_url" autoplay controls="false" @error="videoErrorCallback" @timeupdate="timeupdate"
enable-danmu danmu-btn></video>
</view>
</view>
</view>
<view v-if="type" class="welcome_jumpes" @click="leap_over">跳过{{remaining}}</view>
<view v-if="banner" class="welcome_jumpes" @click="leap_overto">跳过</view>
<!-- 轮播图 -->
<view class="uni-padding-wrap" v-if="banner" >
<view>
<view class="uni-padding-wrap">
<view class="page-section swiper">
<view class="page-section-spacing">
<swiper class="swiper" :indicator-dots="true" :style="{height:heightOut+'px'}" :autoplay="false" :interval="3000" :duration="300" @animationfinish="tiaoguos" @change="qiehuan">
<swiper-item v-for="(item,index) in list" :key="index">
<view class="swiper-item uni-bg-red">
<image :src=" 'https://' + item.launch_path"></image>
</view>
<view class="btn-init" v-if="parseInt(index) == list.length - 1" @click="goNext">立即体验</view>
</swiper-item>
</swiper>
</view>
</view>
</view>
</view>
</view>
<!-- 用户协议弹窗 -->
<view class="welcome_backes" v-if="protocol">
<view class="content">
<!-- <view class="title">{{ agreement.document_title }}</view> -->
<view class="title">用户协议</view>
<!-- <text class="protocol_content"></text> -->
<scroll-view scroll-y class="scroll">
<rich-text class="protocol_content" :nodes="agreement.document_content"></rich-text>
</scroll-view>
<view class="agree-btn">
<view class="refuse" @click="refuseAgreement">不同意并退出</view>
<view class="to_agree" @click="to_agree">同意</view>
</view>
</view>
</view>
</view>
</template>
<script>
import common from '@/static/js/common.js'
export default {
data() {
return {
remaining: 7,
type: false,
banner: true,
protocol: false,
heightOut: '',
imgurl: [],
vide0_url: '',
agreement: { // 用户协议内容
document_title: "",
document_content: ""
},
heightesStyle : {
height : ''
},
title: 'video',
src: '',
inputValue: '',
controls: false,
list: [],
background: ['color1', 'color2', 'color3'],
indicatorDots: true,
interval: 2000,
duration: 500,
swiper_index: "",
tiaoguo:false,
weizhi:0,
};
},
onReady: function(res) {
this.videoContext = uni.createVideoContext('myVideo');
},
methods: {
tiaoguos(a){
console.log(a.detail)
if(this.weizhi == a.detail.current && a.detail.current == this.list.length -1){
this.leap_overto()
}
this.weizhi = a.detail.current
},
qiehuan(a){
console.log(a)
this.tiaoguo = a.detail.current
},
apiwelcome() {
this.$u.api.documentInfo({
document_code: 'agreement'
}).then((res) => {
if (res.errCode == 0) {
let agreement = res.data;
// console.log(agreement.document_content)
agreement.document_content = common.unescapeHTML(agreement.document_content);
// console.log(agreement);
this.agreement = agreement;
}
})
// 启动页
this.$u.api.pageList({}).then((res) => {
console.log('协议', res)
let data_image = res.data.welcome_page
let vide0_url = res.data.start_page[0].launch_path
this.list = data_image;
this.vide0_url = vide0_url;
})
},
// 3秒倒计时
remaining_time() {
// this.timer = setInterval(() => {
// this.remaining--;
// if (this.remaining <= 0) {
// clearInterval(this.timer);
// console.log("完了")
// // this.type = !this.type;
// // this.banner = !this.banner;
// }
// }, 1000);
},
leap_over() {
// this.type = !this.type
this.banner = !this.banner;
clearInterval(this.timer)
// 获取屏幕高度
this.getSystemInfo()
},
leap_overto() {
this.protocol = true;
this.banner = false;
},
getSystemInfo() {
let that = this;
// 获取屏幕高度
uni.getSystemInfo({
success: function(res) {
that.heightOut = res.windowHeight;
console.log(that.heightOut)
}
});
},
// 立即体验
goNext() {
this.protocol = true;
this.banner = false;
},
// 我同意
to_agree() {
uni.setStorage({
key: 'launchFlag',
data: true,
success: function() {
console.log('点击存储launchFlag');
}
});
uni.navigateTo({
url: '/pageA/login/login'
});
},
// 拒绝协议
refuseAgreement() {
//退出app
// #ifdef APP-PLUS
if (plus.os.name.toLowerCase() === 'android') {
plus.runtime.quit();
} else{
const threadClass = plus.ios.importClass("NSThread");
const mainThread = plus.ios.invoke(threadClass, "mainThread");
plus.ios.invoke(mainThread, "exit");
// ios11
plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
}
// #endif
},
// 视频引入
bindInputBlur: function(e) {
this.inputValue = e.target.value;
console.log(e.target.value);
},
bindButtonTap: function() {
var that = this
uni.chooseVideo({
sourceType: ['album', 'camera'],
maxDuration: 60,
camera: ['front', 'back'],
success: function(res) {
this.src = res.tempFilePath
}
})
},
bindSendDanmu: function() {
this.videoContext.sendDanmu({
text: this.inputValue,
color: this.getRandomColor()
})
},
videoErrorCallback: function(e) {
console.log('视频错误信息:',e);
},
timeupdate(e) {
console.log(e);
},
getRandomColor: function() {
const rgb = []
for (let i = 0; i < 3; ++i) {
let color = Math.floor(Math.random() * 256).toString(16)
color = color.length == 1 ? '0' + color : color
rgb.push(color)
}
return '#' + rgb.join('')
}
},
mounted() {
// 3秒倒计时调用
this.remaining_time();
this.apiwelcome();
}
}
</script>
<style lang="scss" scoped>
.uni-padding-wrap{
// height: 400rpx;
}
.btn-init {
z-index: 1000;
position: absolute;
bottom: 100rpx;
right: 230rpx;
width: 300rpx;
height: 80rpx;
line-height: 80rpx;
text-align: center;
color: #fff;
border-radius: 40rpx;
background-color: #007AFF;
}
.welcome_jumpes {
z-index: 100;
position: absolute;
top: 80rpx;
right: 60rpx;
width: 100rpx;
height: 40rpx;
border-radius: 20rpx;
font-size: 22rpx;
text-align: center;
line-height: 40rpx;
color: #fff;
background-color: rgba(0,0,0,0.5);
}
#myVideo {
width: 100%;
}
uni-video {
width: 100%;
height: 100%;
}
.uni-video-container {
background-color: none !important;
}
.welcome_images {
width: 100%;
height: 100vh;
position: fixed;
}
uni-swiper,
uni-view,
uni-image {
width: 100%;
// position: fixed;
height: 100vh;
}
uni-image {
width: 100%;
}
// 轮播图分页器颜色
uni-swiper .uni-swiper-dot-active {
background-color: #fff !important;
}
.welcome_backes {
width: 100%;
position: fixed;
height: 100%;
background: #999999;
.content {
width: 558rpx;
height: 730rpx;
background: rgba(255, 255, 255, 1);
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
margin: auto;
.title {
width: 558rpx;
text-align: center;
height: 29rpx;
font-size: 30rpx;
font-weight: bold;
color: rgba(51, 51, 51, 1);
line-height: 29rpx;
margin: 30rpx 0 24rpx 0;
}
.scroll {
height: 560rpx;
.protocol_content {
display: block;
width: 494rpx;
height: 528rpx;
margin: 10rpx auto 30rpx;
font-size: 24rpx;
font-weight: 400;
text-align: left;
line-height: 36rpx;
text-align: justify;
letter-spacing: 1rpx;
text-indent: 2rem;
color: rgba(51, 51, 51, 1);
}
}
.agree-btn {
border-top: #D8D8D8 solid 1rpx;
// padding-top: 27rpx;
display: flex;
height: 80rpx;
> view {
height: inherit;
flex: 1;
font-size: 30rpx;
font-weight: bold;
text-align: center;
line-height: 80rpx;
}
.refuse {
color: #999;
position: relative;
&:after {
content: "";
height: 80rpx;
width: 1rpx;
background-color: #D8D8D8;
position: absolute;
right: 0;
top: 0;
}
}
.to_agree {
color: rgba(255, 121, 16, 1);
}
}
}
}
</style>
<template>
<view>
<!-- <image v-if="type" class="welcome_images" src="../../static/pageA/welcome_img.jpg" mode="aspectFill"></image> -->
<view v-if="type" id="video_mp4">
<view class="page-body">
<view class="page-section">
<video id="myVideo" enable-progress-gesture="false" :src=" 'https://' + vide0_url" autoplay controls="false" @error="videoErrorCallback" @timeupdate="timeupdate"
enable-danmu danmu-btn></video>
</view>
</view>
</view>
<view v-if="type" class="welcome_jumpes" @click="leap_over">跳过{{remaining}}</view>
<view v-if="banner" class="welcome_jumpes" @click="leap_overto">跳过</view>
<!-- 轮播图 -->
<view class="uni-padding-wrap" v-if="banner" >
<view>
<view class="uni-padding-wrap">
<view class="page-section swiper">
<view class="page-section-spacing">
<swiper class="swiper" :indicator-dots="true" :style="{height:heightOut+'px'}" :autoplay="false" :interval="3000" :duration="1000" @animationfinish="">
<swiper-item v-for="(item,index) in list" :key="index">
<view class="swiper-item uni-bg-red">
<image :src=" 'https://' + item.launch_path"></image>
</view>
<view class="btn-init" v-if="parseInt(index) == 2" @click="goNext">立即体验</view>
</swiper-item>
</swiper>
</view>
</view>
</view>
</view>
</view>
<!-- 用户协议弹窗 -->
<view class="welcome_backes" v-if="protocol">
<view class="content">
<view class="title">{{ agreement.document_title }}</view>
<!-- <text class="protocol_content"></text> -->
<scroll-view scroll-y class="scroll">
<rich-text class="protocol_content" :nodes="agreement.document_content"></rich-text>
</scroll-view>
<view class="to_agree" @click="to_agree">我同意</view>
</view>
</view>
</view>
</template>
<script>
import common from '@/static/js/common.js'
export default {
data() {
return {
remaining: 7,
type: true,
banner: false,
protocol: false,
heightOut: '',
imgurl: [],
vide0_url: '',
agreement: { // 用户协议内容
document_title: "",
document_content: ""
},
heightesStyle : {
height : ''
},
title: 'video',
src: '',
inputValue: '',
controls: false,
list: [],
background: ['color1', 'color2', 'color3'],
indicatorDots: true,
interval: 2000,
duration: 500,
swiper_index: "",
};
},
onReady: function(res) {
this.videoContext = uni.createVideoContext('myVideo');
},
methods: {
apiwelcome() {
this.$u.api.documentInfo({
document_code: 'agreement'
}).then((res) => {
if (res.errCode == 0) {
let agreement = res.data;
// console.log(agreement.document_content)
agreement.document_content = common.unescapeHTML(agreement.document_content);
// console.log(agreement);
this.agreement = agreement;
}
})
// 启动页
this.$u.api.pageList({}).then((res) => {
console.log('协议', res)
let data_image = res.data.welcome_page
let vide0_url = res.data.start_page[0].launch_path
this.list = data_image;
this.vide0_url = vide0_url;
})
},
// 3秒倒计时
remaining_time() {
this.timer = setInterval(() => {
this.remaining--;
if (this.remaining <= 0) {
clearInterval(this.timer);
console.log("完了")
this.type = !this.type;
this.banner = !this.banner;
}
}, 1000);
},
leap_over() {
this.type = !this.type
this.banner = !this.banner;
clearInterval(this.timer)
// 获取屏幕高度
this.getSystemInfo()
},
leap_overto() {
this.protocol = true;
this.banner = false;
},
getSystemInfo() {
let that = this;
// 获取屏幕高度
uni.getSystemInfo({
success: function(res) {
that.heightOut = res.windowHeight;
console.log(that.heightOut)
}
});
},
// 立即体验
goNext() {
this.protocol = true;
this.banner = false;
},
// 我同意
to_agree() {
uni.setStorage({
key: 'launchFlag',
data: true,
success: function() {
console.log('点击存储launchFlag');
}
});
uni.navigateTo({
url: '/pageA/login/login'
});
},
// 视频引入
bindInputBlur: function(e) {
this.inputValue = e.target.value;
console.log(e.target.value);
},
bindButtonTap: function() {
var that = this
uni.chooseVideo({
sourceType: ['album', 'camera'],
maxDuration: 60,
camera: ['front', 'back'],
success: function(res) {
this.src = res.tempFilePath
}
})
},
bindSendDanmu: function() {
this.videoContext.sendDanmu({
text: this.inputValue,
color: this.getRandomColor()
})
},
videoErrorCallback: function(e) {
console.log('视频错误信息:',e);
},
timeupdate(e) {
console.log(e);
},
getRandomColor: function() {
const rgb = []
for (let i = 0; i < 3; ++i) {
let color = Math.floor(Math.random() * 256).toString(16)
color = color.length == 1 ? '0' + color : color
rgb.push(color)
}
return '#' + rgb.join('')
}
},
mounted() {
// 3秒倒计时调用
this.remaining_time();
this.apiwelcome();
}
}
</script>
<style lang="scss" scoped>
.uni-padding-wrap{
// height: 400rpx;
}
.btn-init {
z-index: 1000;
position: absolute;
bottom: 100rpx;
right: 230rpx;
width: 300rpx;
height: 80rpx;
line-height: 80rpx;
text-align: center;
color: #fff;
border-radius: 40rpx;
background-color: #007AFF;
}
.welcome_jumpes {
z-index: 100;
position: absolute;
top: 80rpx;
right: 60rpx;
width: 100rpx;
height: 40rpx;
border-radius: 20rpx;
font-size: 22rpx;
text-align: center;
line-height: 40rpx;
color: #fff;
background-color: rgba(0,0,0,0.5);
}
#myVideo {
width: 100%;
}
uni-video {
width: 100%;
height: 100%;
}
.uni-video-container {
background-color: none !important;
}
.welcome_images {
width: 100%;
height: 100vh;
position: fixed;
}
uni-swiper,
uni-view,
uni-image {
width: 100%;
// position: fixed;
height: 100vh;
}
uni-image {
width: 100%;
}
// 轮播图分页器颜色
uni-swiper .uni-swiper-dot-active {
background-color: #fff !important;
}
.welcome_backes {
width: 100%;
position: fixed;
height: 100%;
background: #999999;
.content {
width: 558rpx;
height: 730rpx;
background: rgba(255, 255, 255, 1);
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
margin: auto;
.title {
width: 558rpx;
text-align: center;
height: 29rpx;
font-size: 30rpx;
font-weight: bold;
color: rgba(51, 51, 51, 1);
line-height: 29rpx;
margin: 30rpx 0 24rpx 0;
}
.scroll {
height: 560rpx;
.protocol_content {
display: block;
width: 494rpx;
height: 528rpx;
margin: 10rpx auto 30rpx;
font-size: 24rpx;
font-weight: 400;
text-align: left;
line-height: 36rpx;
text-align: justify;
letter-spacing: 1rpx;
text-indent: 2rem;
color: rgba(51, 51, 51, 1);
}
}
.to_agree {
width: 558rpx;
font-size: 30rpx;
font-weight: bold;
color: rgba(255, 121, 16, 1);
text-align: center;
padding-top: 27rpx;
border-top: #D8D8D8 solid 1px;
}
}
}
</style>

15
components/shop/group/index.vue
View File

@@ -8,12 +8,13 @@
</view>
</view>
<view class="label">
<!-- <u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> -->
<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24" inactive-color="#333333"></u-tabs>
</view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx;">
<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
<!-- 最多显示3个 -->
<view v-if="groupList[i]" class="group-container">
<view v-if="groupList[i]">
<sitem :info="info" v-for="(info, index) in groupList[i].slice(0, 3)" :key="index"></sitem>
</view>
<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList[i] || !groupList[i].length" style="margin: 0 auto;"></u-empty>
@@ -61,7 +62,7 @@ export default {
gc_id: id,
}).then(res => {
this.groupList[this.current] = res.data;
console.log(this.groupList);
// console.log(this.groupList);
this.$forceUpdate();
})
},
@@ -105,12 +106,10 @@ export default {
.list {
box-sizing: border-box;
padding: 0 30rpx;
.group-container {
display: flex;
> view {
&:not(:nth-child(3n)) {
margin-right: 20rpx;
}
display: flex;
> view {
&:not(:nth-child(3n)) {
margin-right: 20rpx;
}
}
}

22
components/shop/group/item.vue
View File

@@ -3,8 +3,8 @@
<image class="head" :src="info.pintuan_image" mode="widthFix"></image>
<text class="title u-line-1">{{ info.pintuan_goods_name }}</text>
<view class="price">
<view class="value">￥{{ info.pintuan_goods_price }}</view>
<view class="btn">立即拼团</view>
<view>￥{{ info.pintuan_goods_price }}</view>
<view>立即拼团</view>
</view>
</view>
</template>
@@ -61,22 +61,18 @@ export default {
margin-top: 10rpx;
}
.price{
display: flex;
align-items: center;
// align-content: flex-end;
justify-content: space-between;
margin-top: 16rpx;
.value {
// display: flex;
// align-items: center;
// justify-content: space-between;
margin-top: 10rpx;
> view:first-child{
font-size: 26rpx;
color: #FF3131;
// margin-bottom: 12rpx;
margin-bottom: 12rpx;
}
.btn {
> view:last-child{
font-size: 22rpx;
height: 22rpx;
color: #FDD360;
text-align: end;
// margin-top:8rpx;
}
}
}

8
components/shop/list/index.vue
View File

@@ -2,6 +2,7 @@
<view class="list">
<view class="top">商品推荐</view>
<view>
<!-- <u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="26" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> -->
<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24" inactive-color="#333333"></u-tabs>
</view>
<swiper class="swiper-box" :current="swiperCurrent" @animationfinish="animationfinish" :style="{height: swiperHeight}">
@@ -13,7 +14,7 @@
</swiper-item>
</swiper>
<!-- 加载更多 -->
<u-loadmore class="load-size" :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="loadMore"></u-loadmore>
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="loadMore"></u-loadmore>
</view>
</template>
<script>
@@ -48,7 +49,7 @@ export default {
this.getGoodsClassRecommend();
},
methods: {
loadMore() {
loadMore(page) {
if(!this.timer) return false;
this.loadStatus = "loading";
this.page++;
@@ -71,7 +72,6 @@ export default {
},
getGoodsClassRecommend() {
this.$u.api.getGoodsClassRecommend().then(res => {
console.log(res)
if (res.errCode == 0) {
// 初始化 current
this.current = 0;
@@ -97,7 +97,7 @@ export default {
},
setSwiperHeight() {
// height: 480rpx, margin-bottom: 26rpx
const height = Math.ceil(this.goodsList[this.current].length / 2) * (450 + 26);
const height = Math.ceil(this.goodsList[this.current].length / 2) * (480 + 26);
this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
// console.log(this.swiperHeight);
},

8
components/shop/list/item.vue
View File

@@ -4,7 +4,7 @@
<view class="info">
<text class="title u-line-2">{{ info.goods_name }}</text>
<!-- <text class="jianjie u-line-1">{{ info.goods_advword }}</text> -->
<text class="price">￥{{ info.goods_price }}<text style="font-size:22rpx;color:#999;text-decoration:line-through;display: inline-block;margin-left:20rpx"> ￥{{info.goods_marketprice}}</text></text>
<text class="price">￥{{ info.goods_price }}</text>
</view>
</view>
</template>
@@ -34,7 +34,7 @@ export default {
url: 'pageB/sdetails/index',
params: {
id: this.info.goods_id,
// type: 1,
type: 1,
}
})
}
@@ -44,14 +44,14 @@ export default {
<style lang="scss" scoped>
.item{
width: 330rpx;
height: 450rpx;
height: 480rpx;
margin-bottom: 26rpx;
background-color: #f8f8f8;
border-radius: 10rpx 10rpx 0rpx 0rpx;
.img{
width: 330rpx;
height: 300rpx;
background: rgb(114, 110, 110);
background: rgba(245,245,245,1);
border-radius: 10rpx 10rpx 0rpx 0rpx;
margin-bottom: 24rpx;
}

7
components/shop/recommend/pintuan.vue
View File

@@ -10,8 +10,8 @@
<view class="connect">
<view class="user">
<view class="avatar">
<image src="/static/image/common/32.png"></image>
<image src="/static/image/common/31.png"></image>
<image :src="info.member_avatar[0]"></image>
<image :src="info.member_avatar[1]"></image>
</view>
<view class="num">{{ info.pintuan_limit_number }}人团</view>
</view>
@@ -91,7 +91,7 @@ export default {
}
}
.connect{
padding:10rpx 0 30rpx;
padding:10rpx 30rpx 30rpx;
display: flex;
align-items: center;
.user {
@@ -110,6 +110,7 @@ export default {
left: 0;
top: 0;
z-index: 8;
background-color: aqua;
}
&:last-child {
left: 32rpx;

4
components/shop/seckill/index.vue
View File

@@ -19,7 +19,7 @@
</view>
<view class="next" @click="viewMore">
<text>查看更多</text>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
<u-icon name="arrow-right" color="#999" size="18"></u-icon>
</view>
</view>
<view class="list">
@@ -82,7 +82,7 @@ export default {
background-color: #000;
}
.mah {
color: #999999;
vertical-align: text-top;
}
}
}

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

@@ -33,7 +33,7 @@ export default {
border-radius: 50%;
}
>text{
max-width: 100rpx;
width: 100rpx;
margin-top: 14rpx;
font-size: 24rpx;
color: #333;

24
components/shop/special-shop/index.vue
View File

@@ -1,26 +1,26 @@
<template>
<view class="special">
<view v-if="type == 'spike'" @click="spikeGoods">
<image :src="item.groupbuy_image1" mode="aspectFill"></image>
<view v-if="type == 'spike'">
<image :src="item.groupbuy_image1" @click="spikeGoods"></image>
<view class="right">
<view class="name u-line-1">{{ item.goods_name }}</view>
<view class="name u-line-1" @click="spikeGoods">{{ item.goods_name }}</view>
<view class="price">
<view class="groupbuy-price">￥{{ item.groupbuy_price }}</view>
<view class="goods-price">￥{{ item.goods_price }}</view>
<view class="groupbuy-price">{{ item.groupbuy_price }}</view>
<view class="goods-price">{{ item.goods_price }}</view>
</view>
<view class="buy">
<view class="num">剩余{{ item.inventory }}件</view>
<view class="btn">立即购买</view>
<view class="btn" @click="spikeGoods">立即购买</view>
</view>
</view>
</view>
<view v-if="type == 'group'" @click="toDetailsPage">
<image :src="item.pintuan_image"></image>
<view class="right">
<view class="name u-line-1">{{ item.pintuan_goods_name }}</view>
<view v-if="type == 'group'">
<image :src="item.pintuan_image" @click="toDetailsPage"></image>
<view class="right">
<view class="name u-line-1" @click="toDetailsPage">{{ item.pintuan_goods_name }}</view>
<view class="price group">
<view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view>
<view class="btn">立即拼团</view>
<view class="groupbuy-price">{{ item.pintuan_goods_price }}</view>
<view class="btn" @click="toDetailsPage">立即拼团</view>
</view>
</view>
</view>

9
components/shop/youhq/index.vue
View File

@@ -2,12 +2,11 @@
<view class="coupon-swiper">
<view class="top">
<view class="title">全部优惠券</view>
<view class="view-more" @click="toCouponPage">
<text>查看更多</text>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
</view>
<view class="view-more" @click="toCouponPage">查看更多></view>
</view>
<!-- <u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="60" ></u-tabs-swiper> -->
<u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24" inactive-color="#333333"></u-tabs>
<!-- :style="{ height: swiperHeight }" -->
<swiper class="box" :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
<!-- 最多显示四个 -->
@@ -115,8 +114,6 @@ export default {
.view-more {
font-size: 20rpx;
color: rgba(153,153,153,1);
display: flex;
align-items: center;
}
}
.box {

4
main.js
View File

@@ -5,10 +5,6 @@ import uView from "uview-ui";
Vue.config.productionTip = false
Vue.use(uView);
App.mpType = 'app'
// 当前 app 版本号
Vue.prototype.$app_version = '1.0.0';
Vue.prototype.imService = new IMService();
Vue.prototype.a = 1;
import store from '@/common/store/index.js'

31
manifest.json
View File

@@ -2,8 +2,8 @@
"name" : "德铭阳光",
"appid" : "__UNI__EBFF00A",
"description" : "",
"versionName" : "1.0.1",
"versionCode" : 107,
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@@ -11,18 +11,11 @@
"nvueCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : false,
"waiting" : false,
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
},
"safearea" : {
//安全区域配置，仅iOS平台生效
"bottom" : {
// 底部安全区域配置
"offset" : "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"
}
},
/* 模块配置 */
"modules" : {
"OAuth" : {},
@@ -67,13 +60,7 @@
"abiFilters" : [ "armeabi-v7a", "x86" ]
},
/* ios打包配置 */
"ios" : {
"privacyDescription" : {
"NSLocationAlwaysAndWhenInUseUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。",
"NSLocationWhenInUseUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。",
"NSLocationAlwaysUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。"
}
},
"ios" : {},
/* SDK配置 */
"sdkConfigs" : {
"ad" : {},
@@ -125,10 +112,10 @@
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
"hdpi" : "static/app/icon/72x72.png",
"xhdpi" : "static/app/icon/96x96.png",
"xxhdpi" : "static/app/icon/144x144.png",
"xxxhdpi" : "static/app/icon/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",

10
package-lock.json generated
View File

@@ -6,13 +6,13 @@
"dependencies": {
"blueimp-md5": {
"version": "2.17.0",
"resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.17.0.tgz",
"integrity": "sha512-x5PKJHY5rHQYaADj6NwPUR2QRCUVSggPzrUKkeENpj871o9l9IefJbO2jkT5UvYykeOK9dx0VmkIo6dZ+vThYw=="
"resolved": "https://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.17.0.tgz?cache=0&sync_timestamp=1595922448921&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fblueimp-md5%2Fdownload%2Fblueimp-md5-2.17.0.tgz",
"integrity": "sha1-9PysCIsRX3tARfGfXaWenQGxu5Y="
},
"uview-ui": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.6.2.tgz",
"integrity": "sha512-AvTXUk8A/AdJazxTziApw0NMv61jlE9cEO+Jxe84cTvcm2Ej7Ngf8zb3a6aSPVi6OVu81vTCC71R1wN7dZC3ig=="
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.0.tgz",
"integrity": "sha512-1UdMUGJqWx60ALbXXXs3rQHKUNBARDIV5XHc06mKFxpccO/i0tzoSqS6RuPdmYwXU1q59wnIU+NLABvcU5u4vw=="
},
"vuex": {
"version": "3.5.1",

2
package.json
View File

@@ -14,7 +14,7 @@
"license": "ISC",
"dependencies": {
"blueimp-md5": "^2.17.0",
"uview-ui": "^1.6.2",
"uview-ui": "^1.5.0",
"vuex": "^3.5.1"
}
}

442
pageA/bindinges/bindinges.vue
View File

@@ -3,28 +3,32 @@
<view>
<view class="login">
<view class="content">
<view class="title">请绑定手机号</view>
<view class="title">手机登录</view>
<view class="labales">
<input type="number" maxlength="11" v-model="phone" placeholder="手机号" />
<text>手机号</text>
<input type="tel" placeholder="" />
</view>
<view class="labales flex-inp">
<input type="number" maxlength="6" placeholder="请输入验证码" v-model="sms_code" />
<u-button id="btn" class="identifying" :hair-line="false" hover-class="none" :class="is_sendcode ? 'sended' : ''" @click="getCode" :disabled="is_sendcode">{{ is_sendcode ? time_count + "后可以重新发送" : "发送验证码" }}</u-button>
<view class="labales">
<text>请输入验证码</text>
<input type="tel" placeholder="" />
<text class="identifying">获取验证码</text>
</view>
<!-- 服务协议 -->
<view class="pact">
<checkbox-group @change="change">
<checkbox class="check-tit" color="#1ADE00" :checked="checked" />
</checkbox-group>
<view></view>
<text>我已详细阅读并同意</text>
<text class="pact_text" v-for="(item,index) in pactList" :key="index" @click="infoPact(index)">
{{ item }}
</text>
<text class="pact_text">《用户协议》</text>
<text class="pact_text">《隐私协议》</text>
<text class="pact_text">《使用协议》</text>
<u-checkbox-group @change="checkboxGroupChange" size="27">
<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
shape="circle" size="14" active-color="#19BE6B"></u-checkbox>
</u-checkbox-group>
</view>
</view>
<!-- denglu QQ weixin -->
<view class="btn-login" @click="bindPhone">{{login}}</view>
<u-toast ref="uToast" />
<u-button>{{login}}</u-button>
</view>
</view>
</template>
@@ -32,151 +36,81 @@
export default {
data() {
return {
phone: "",
sms_code: "",
login: '绑定',
show: true,
checked: false,
// 时间
timer: null,
is_sendcode: false, // 60s
time_count: 60,
pactList: [ "《用户协议》", "《隐私协议》" ],
list: [{
checked: false,
disabled: false
}],
value: '',
login: '注册',
show: true
};
},
methods: {
// 勾选协议
change(e) {
this.checked = !this.checked;
console.log(this.checked);
},
// 获取验证码
getCode() {
if (this.$u.test.isEmpty(this.phone)) {
this.$refs.uToast.show({
title: '手机号格式不能为空！',
type: 'error',
})
return;
}
if(!(/^1[3456789]\d{9}$/.test(this.phone))){
this.$refs.uToast.show({
title: '手机号格式不正确！',
type: 'warning',
})
return;
}
this.$u.api.sendSmsCode({
member_mobile: this.phone,
smslog_type: 4,
}).then(res => {
if (res.errCode == 0) {
console.log(res);
this.$refs.uToast.show({
title: res.message,
type: 'success',
})
// 发送验证码
this.getSendCode();
} else {
this.$refs.uToast.show({
title: res.message,
type: 'warning',
})
}
})
},
// 绑定手机号
bindPhone() {
if (this.$u.test.isEmpty(this.phone)) {
this.$refs.uToast.show({
title: '手机号不能为空！',
type: 'error',
})
return;
}
if(!(/^1[3456789]\d{9}$/.test(this.phone))){
this.$refs.uToast.show({
title: '手机号格式不正确！',
type: 'warning',
})
return;
}
if(this.$u.test.isEmpty(this.sms_code)){
this.$refs.uToast.show({
title: '验证码不能为空！',
type: 'warning',
})
return;
}
if(this.sms_code.length == 0){
this.$refs.uToast.show({
title: '验证码有误！',
type: 'warning',
})
return;
}
if(!this.checked){
this.$refs.uToast.show({
title: '请同意协议！',
type: 'warning',
})
return;
}
this.$u.api.mobileBind({
member_mobile: this.phone,
sms_code: this.sms_code,
}).then(res => {
console.log(res);
if (res.errCode == 0) {
this.$refs.uToast.show({
title: res.message,
type: 'success',
})
uni.navigateTo({
url: '/pageA/topick/topick'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'warning',
})
}
})
},
// 协议详情
infoPact(index) {
// console.log(index);
uni.navigateTo({
url: '/pageA/pactList/pactList?index=' + index
});
},
// 60s
getSendCode() {
const TIME_COUNT = 60;
if (!this.timer) {
this.time_count = TIME_COUNT;
this.is_sendcode = true;
this.timer = setInterval(() => {
if (this.time_count > 0 && this.time_count <= TIME_COUNT) {
this.time_count--;
} else {
this.is_sendcode = false;
clearInterval(this.timer);
this.timer = null;
}
}, 1000);
}
},
// 选中某个复选框时，由checkbox时触发
checkboxChange(e) {
//console.log(e);
},
// 选中任一checkbox时，由checkbox-group触发
checkboxGroupChange(e) {
// console.log(e);
},
mask_u(){
this.show = !this.show
},
}
};
</script>
<style lang="scss" scoped>
page {
background-color: #fff;
}
.uni-page-wrapper{
background: #fff;
}
.login {
// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
.images {
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
z-index: -1;
}
.backes {
background: rgba(0, 0, 0, 0.4);
position: fixed;
width: 100%;
height: 100%;
z-index: -1;
}
text {
z-index: 9;
color: #fff;
}
.more_Login {
overflow: hidden;
zoom: 1;
width: 630rpx;
margin: 0 auto;
}
.more_Login text {
display: inline-block;
width: 50%;
float: left;
font-size: 30rpx;
color: rgba(255, 255, 255, 1);
line-height: 36px;
margin: 97rpx 0;
}
.more_Login .other {
text-align: right;
}
}
.title {
font-size: 36rpx;
@@ -190,87 +124,163 @@
z-index: 99999;
margin: 0 auto;
padding-top: 130rpx;
.labales {
position: relative;
display: flex;
align-items: center;
padding: 20rpx;
border-bottom: 1px #BFBFBF solid;
input {
width: 100%;
}
}
.flex-inp {
justify-content: space-between;
margin-top: 70rpx;
}
.labales text {
font-size: 30rpx;
color: #999;
}
.identifying {
flex-shrink: 0;
font-size: 26rpx;
font-weight: 500;
color: #FF780F !important;
border: none;
background-color: #fff;
.labales {
border-bottom: 1px #BFBFBF solid;
margin-bottom: 90rpx;
}
.sended {
color: #666 !important;
}
.labales {
position: relative;
}
.identifying {
position: absolute;
right: 0;
top: 0;
bottom: 0;
margin: auto;
font-size: 30rpx;
font-weight: 500;
color: #FF780F!important;
}
}
.pact text {
font-size: 22rpx;
font-weight: 400;
color: #333;
line-height: 36px;
}
.pact {
display: flex;
align-items: center;
flex-wrap: wrap;
margin: 20rpx 0;
&>text {
font-size: 22rpx;
font-weight: 400;
color: #333;
}
}
.check-tit {
font-size: 20rpx;
}
::v-deep uni-checkbox .uni-checkbox-input {
width: 24rpx;
height: 24rpx;
border-color: #d1d1d1 !important;
border-radius: 50% !important;
}
::v-deep uni-checkbox .uni-checkbox-input-checked:before {
font-size: 28rpx;
}
.pact_text {
font-size: 22px;
font-weight: 400;
color: rgba(129, 188, 253, 1) !important;
line-height: 36px;
}
.btn-login {
width: 650rpx;
height: 90rpx;
margin: 300rpx auto 0;
text-align: center;
line-height: 90rpx;
color: #fff;
font-size: 34rpx;
border-radius: 50rpx !important;
background-color: #FF780F;
}
//单选框的样式
.pact {
position: relative;
padding-left: 38rpx;
}
button::after{ border: none; }
.u-checkbox-group {
position: absolute;
left: 0;
top: 0;
bottom: 0;
margin: auto;
}
.u-checkbox__icon--square {
border-radius: 50rpx !important;
width: 22rpx;
height: 22rpx;
}
.u-btn {
width: 628rpx;
height: 98rpx;
background: rgba(255, 120, 15, 1) !important;
border-radius: 49rpx;
margin: 0 auto;
font-size: 36rpx;
color: rgba(255, 255, 255, 1) !important;
line-height: 36px;
border: 1px #ff780f solid;
outline: none;
border-color: rgba(255, 120, 15, 1) !important;
margin-top: 225rpx;
}
.warp {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
}
.rect {
width: 558rpx;
height: 300rpx;
background-color: #fff;
border-radius: 20rpx;
overflow: hidden;
zoom: 1;
position: relative;
display: flex;
flex-wrap:wrap;
display: -webkit-flex; /* Safari */
.rect_view{
width: 100rpx;
height: 100rpx;
.image{
width: 45rpx;
height: 53rpx;
display: inline-block;
}
flex:1;
margin-top: 77rpx;
}
.rect_view:nth-child(2) image{
width: 57rpx;
height: 45rpx;
}
.rect_butoon{
width: 100%;
position: absolute;
bottom: 0;
height: 85rpx;
text-align: center;
line-height: 85rpx;
border-top: 1px #999999 solid;
}
view{
color: #666;
font-size:24rpx;
margin-top: 30rpx;
}
}
.rect_view:nth-child(1) image,.rect_view:nth-child(1) view{
float: right;
}
.rect_view:nth-child(1) image{
margin-right: 20rpx;
}
.rect_view:nth-child(1){
position: relative;
margin-right: 79rpx;
}
.rect_view:nth-child(1) view{
position: absolute;
bottom: 0;
right: 0;
}
.rect_view:nth-child(2) image,.rect_view:nth-child(2) view{
float: left;
}
.rect_view:nth-child(2) image{
margin-left: 20rpx;
}
.rect_view:nth-child(2){
position: relative;
}
.rect_view:nth-child(2) view{
position: absolute;
bottom: 0;
left: 0;
}
u-button{
margin-top: 225rpx;
}
</style>

68
pageA/login/login.vue
View File

@@ -34,8 +34,7 @@
<!-- 注册 -->
<view class="more_Login">
<text @click="registerUrl()">{{register}}</text>
<!-- TODO 苹果因审核原因暂时隐藏第三方登录 -->
<text v-if="platform != 'ios'" class="other" @click="mask_u">其他方式登录</text>
<text class="other" @click="mask_u">其他方式登录</text>
</view>
<!-- denglu QQ weixin -->
<view class="buttones">
@@ -62,7 +61,6 @@
</view>
</template>
<script>
import IMService from '@/static/imservice.js'
import identifying from '@/components/logininput/identifying'
import {
mapMutations
@@ -93,34 +91,22 @@
}, {
"id": '2',
"text": "《隐私协议》"
},
// {
// "id": '3',
// "text": "《使用协议》"
// },
],
}, {
"id": '3',
"text": "《使用协议》"
}, ],
temp_url: "", // 上个页面路径
pagesArr: ["pages/mine/index"], // 特殊路径
platform: '', // 手机平台
};
},
onLoad() {
// 数据的请求
// this.apiwelcome();
// 获取手机平台
uni.getSystemInfo({
success: (res) => {
console.log(res);
this.platform = res.platform
}
});
},
onShow() {
let pages = getCurrentPages();
let prePage = pages[pages.length - 2];
this.temp_url = prePage.route;
console.log(this.imService.lianjie)
this.imService.disconnect()
// console.log(this.temp_url);
},
// 切断正常返回
@@ -195,7 +181,6 @@
me.loginIn(res.data.token); //存储一个字符传值
// 缓存用户的信息
uni.setStorageSync('user_info',res.data);
this.imService.disconnect()
if (res.data.member.has_labels) {
uni.switchTab({
url: '/pages/index/index'
@@ -241,20 +226,13 @@
member_nickname: data.userInfo.nickName,
member_avatar: data.userInfo.avatarUrl,
}).then(res => {
console.log(res.errCode);
if (res.errCode == 0) {
this.loginIn(res.data.token);
uni.setStorageSync('user_info',res.data);
this.show = false;
console.log(res.data.member.member_mobilebind);
if(res.data.member.member_mobilebind) {
uni.switchTab({
url: "/pages/index/index"
});
} else {
uni.navigateTo({
url: '/pageA/bindinges/bindinges'
});
}
uni.switchTab({
url: "../../pages/index/index"
})
}
})
}
@@ -268,11 +246,11 @@
uni.login({
provider: 'weixin',
success: (wxres) => {
// console.log(wxres);
console.log(wxres);
uni.getUserInfo({
provider: 'weixin',
success: (data) => {
// console.log(data);
console.log(data);
this.$u.api.wechatLogin({
member_wxopenid: data.userInfo.openId,
member_nickname: data.userInfo.nickName,
@@ -281,18 +259,10 @@
console.log(res);
if (res.errCode == 0) {
this.loginIn(res.data.token);
uni.setStorageSync('user_info',res.data);
this.show = false;
console.log(res.data.member.member_mobilebind);
if(res.data.member.member_mobilebind) {
uni.switchTab({
url: "/pages/index/index"
});
} else {
uni.navigateTo({
url: '/pageA/bindinges/bindinges'
});
}
uni.switchTab({
url: "../../pages/index/index"
})
}
})
}
@@ -329,11 +299,11 @@
tochange() {
},
goIndex() {
uni.switchTab({
url: "/pages/index/index"
})
}
goIndex() {
uni.switchTab({
url: "/pages/index/index"
})
}
},
components: {
identifying

23
pageA/pactList/pactList.vue
View File

@@ -29,9 +29,9 @@ export default {
document_code: 'agreement'
}).then((res)=>{
// console.log(res.data.document_title);
uni.setNavigationBarTitle({
title: res.data.document_title
})
uni.setNavigationBarTitle({
title: res.data.document_title
})
let data = common.unescapeHTML(res.data.document_content);
this.document_content = data;
})
@@ -41,9 +41,9 @@ export default {
document_code: 'privacy'
}).then((res)=>{
// console.log(res.data.document_title);
uni.setNavigationBarTitle({
title: res.data.document_title
})
uni.setNavigationBarTitle({
title: res.data.document_title
})
let data = common.unescapeHTML(res.data.document_content);
this.document_content = data
})
@@ -53,9 +53,9 @@ export default {
document_code: 'use'
}).then((res)=>{
// console.log(res.data.document_title);
uni.setNavigationBarTitle({
title: res.data.document_title
})
uni.setNavigationBarTitle({
title: res.data.document_title
})
let data = common.unescapeHTML(res.data.document_content);
this.document_content = data
})
@@ -69,15 +69,16 @@ export default {
</script>
<style lang="scss" scoped>
.packlist{}
.packlist > view{
width: 90%;
margin: 0 auto;
padding: 16upx 0;
font-size: 30upx;
font-size: 26upx;
color: #333;
}
.rict_type {
text-indent: 1rem;
line-height: 1.4;
line-height: 1.2;
}
</style>

9
pageA/register/register.vue
View File

@@ -82,11 +82,10 @@
}, {
"id": '2',
"text": "《隐私协议》"
},
// {
// "id": '3',
// "text": "《使用协议》"
// },
}, {
"id": '3',
"text": "《使用协议》"
},
]
};

15
pageB/comment/index.vue
View File

@@ -3,11 +3,11 @@
<view class="label-list">
<view v-for="(label, index) in evaluateSpec" :key="index" :class="{'active': current == index}" @click="current=index">{{ index + '(' + label + ')' }}</view>
</view>
<view class="comment-container" v-if="isShow">
<view class="comment-container">
<view v-for="(item, index) in evalueList" :key="index" class="itme">
<comment :reply="true" :content="item"></comment>
</view>
<u-empty text="暂无评价" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
<u-empty text="暂无评论" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
</view>
<!-- 加载更多 -->
<u-loadmore :status="loadStatus" bgColor="#EEEBEE" margin-top="20" margin-bottom="20" v-if="evalueList.length >= 12"></u-loadmore>
@@ -25,7 +25,6 @@ export default {
evaluateSpec: {},
loadStatus: 'loadmore',
timer: true,
isShow: false, // 是否显示组建
}
},
components: {
@@ -51,7 +50,7 @@ export default {
if(!this.timer) return false;
this.loadStatus = "loading";
this.page++;
this.getAllEvalue({ type: this.current, load: 'loadmore' }).then(length => {
this.getAllEvalue({ type: this.current, load: 'more' }).then(length => {
if(length == 0) {
this.page--;
this.loadStatus = 'nomore';
@@ -73,23 +72,21 @@ export default {
}
})
},
async getAllEvalue({ type, load = 'reload' } = {}) {
async getAllEvalue({ type, load } = {}) {
let params = {
goods_id: this.id,
page: this.page,
}
if(type) Object.assign(params, { type: type });
this.isShow = false;
const res = await this.$u.api.getAllEvalue(params);
this.isShow = true;
if (res.errCode == 0) {
if(load == 'loadmore') this.evalueList.push(...res.data);
if(load) this.evalueList.push(...res.data);
else this.evalueList = res.data;
} else {
this.evalueList = [];
}
return res.data.length;
},
}
}
};
</script>

12
pageB/components/details/userinfo.vue
View File

@@ -4,7 +4,7 @@
<view class="info">
<view class="avatar">
<image :src="item.member_avatar" mode="aspectFill"></image>
<view class="posi-type" v-if="item.live_status != 0" @click="tozhibo">
<view class="posi-type">
<view>
<u-icon name="play-right-fill" color="#fff" size="20rpx"></u-icon>
</view>
@@ -136,16 +136,6 @@ export default {
deep: true
},
methods: {
tozhibo(){
this.$u.route({
url:"/pages/zhibo/index",
params:{
url:item.url,
id:item.live_id,
rid:item.chatroom_id
}
})
},
// 打开个性
openPro() {
this.is_open = !this.is_open;

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

@@ -31,16 +31,12 @@
height: 60rpx;
background-color: #ececec;
color: #999;
// text-align: center;
// line-height: 60rpx;
text-align: center;
line-height: 60rpx;
box-sizing: border-box;
border-radius: 6rpx;
margin-right: 26rpx;
margin-bottom: 20rpx;
border: #ececec 1rpx solid;
display: flex;
align-items: center;
justify-content: center;
}
.xuanzhong{
border: #ff780f 1rpx solid;
@@ -58,30 +54,12 @@ export default {
select: 0
}
},
props:['item','title', 'default'],
watch: {
props:['item','title'],
watch:{
select(){
// console.log(this.select)
console.log(this.select)
this.$emit("sel", this.select);
}
},
mounted() {
this.setDefaultValue();
},
methods: {
setDefaultValue() {
for (const ikey in this.item) {
if (this.item.hasOwnProperty(ikey)) {
const ielement = this.item[ikey];
for (const dkey in this.default) {
if (this.default.hasOwnProperty(dkey)) {
const delement = this.default[dkey];
if(ikey == dkey) this.select = ikey;
}
}
}
}
}
}
}
}
</script>

65
pageB/components/userinfo/index.vue
View File

@@ -1,9 +1,8 @@
<template>
<view class="userinfo" @click="stopClick()">
<view class="userinfo">
<view class="userhead">
<image class="avatar" :src="item.member_avatar" @click="gotoInfo(item.role,item.member_id,item.store_id)"></image>
<!-- <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text> -->
<image class="follow" :src=" !is_follow ? '../../static/image/userinfo/follow.png' : '../../static/image/userinfo/followed.png' " mode="" @click="following(item.member_id)"></image>
<image class="avatar" :src="item.member_avatar"></image>
<text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text>
</view>
<!-- 点赞 -->
<view class="operat zan">
@@ -24,7 +23,7 @@
<text class="operat-span">{{ comment_num }}</text>
</view>
<!-- 购物车 -->
<view class="operat gouwu" v-if="cart_num">
<view class="operat gouwu">
<image class="operat-img" :src=" is_cart ? '../../static/image/userinfo/gouwuche1.png' : '../../static/image/userinfo/gouwuche.png' "
mode="" @click="carting()"></image>
</view>
@@ -63,10 +62,16 @@
.follow {
z-index: 100;
position: absolute;
top: 80rpx;
left: 34rpx;
width: 50rpx;
height: 50rpx;
top: 90rpx;
left: 40rpx;
width: 36rpx;
height: 36rpx;
text-align: center;
line-height: 36rpx;
font-size: 34rpx;
border-radius: 50%;
color: #fff;
background-color: #FF780F;
}
.operat {
@@ -75,7 +80,6 @@
/* #endif */
align-items: center;
flex-direction: column;
// padding: 0 30rpx;
}
.operat-span {
@@ -100,20 +104,18 @@
is_collect: this.list.is_collect || false,
is_content: false,
is_cart: false,
cart_num: 0,
comment_num: this.list.comment_num || 0,
item: this.list || {},
item: this.list || {}
}
},
watch: {
list(newValue, old) {
// console.log(newValue.goods.length);
console.log(newValue);
this.item = newValue || {};
this.is_follow = this.list.is_attention || false;
this.is_like = this.list.is_like || false;
this.is_collect = this.list.is_collect || false;
this.comment_num = this.list.comment_num || 0;
this.cart_num = newValue.goods.length;
},
cart(newValue, old) {
// console.log(newValue);
@@ -134,7 +136,7 @@
// 关注
following(id) {
uni.request({
url: "https://mall.dmygkeji.com/api/member/attentionMember",
url: "https://dmmall.sdbairui.com/api/member/attentionMember",
method: "POST",
data: {
member_id: id
@@ -150,11 +152,6 @@
title: res.data.message,
icon: "none"
})
} else if (res.data.errCode == 401) {
uni.showToast({
title: "您还没有登录，请先登录！",
icon: "none"
})
}
}
})
@@ -163,7 +160,7 @@
likeType(id) {
// console.log(id);
uni.request({
url: "https://mall.dmygkeji.com/api/article/articleLike",
url: "https://dmmall.sdbairui.com/api/article/articleLike",
method: "POST",
data: {
article_id: id
@@ -177,11 +174,6 @@
// console.log(res);
this.is_like = !this.is_like;
this.list.like_num = res.data.data.num;
} else if (res.data.errCode == 401) {
uni.showToast({
title: "您还没有登录，请先登录！",
icon: "none"
})
} else {
uni.showToast({
title: res.data.message,
@@ -194,7 +186,7 @@
// 收藏
collecting(id) {
uni.request({
url: "https://mall.dmygkeji.com/api/article/articleCollect",
url: "https://dmmall.sdbairui.com/api/article/articleCollect",
method: "POST",
data: {
article_id: id
@@ -208,11 +200,6 @@
console.log(res.data.num);
this.is_collect = !this.is_collect;
this.list.collect_num = res.data.data.num;
} else if (res.data.errCode == 401) {
uni.showToast({
title: "您还没有登录，请先登录！",
icon: "none"
})
} else {
uni.showToast({
title: res.data.message,
@@ -240,20 +227,6 @@
cart: this.is_cart
});
},
gotoInfo(type,id,s_id) {
if (type == 2) {
uni.navigateTo({
url: "/pageC/merchant/index?id=" + s_id
})
} else {
uni.navigateTo({
url: "/pageB/details/index?id=" + id
})
}
},
// 冒泡
stopClick() {
}
}
}
</script>

20
pageB/coupon/details.vue
View File

@@ -45,7 +45,6 @@
<view>我们有万能穿搭公式</view>
</view>
</view>
<u-toast ref="uToast" />
</view>
</template>
<script>
@@ -57,18 +56,21 @@ export default {
},
onLoad(option) {
this.price = option.price;
// this.isNewmembervoucher();
},
methods: {
// 是否显示新人优惠券
isNewmembervoucher() {
this.$u.api.isNewmembervoucher().then(res => {
if(res.errCode == 0) {
this.price = res.data.price;
}
})
},
exchangeCoupon() {
this.$u.api.getCoupon({ id: 1 }).then(res => {
if(res.errCode == 0) {
this.$refs.uToast.show({
title: res.message,
url: '/pageE/tool/MineCoupon'
})
} else {
this.$u.toast(res.message);
}
this.$u.toast(res.message);
if(res.errCode == 0) {}
})
},
}

89
pageB/coupon/index.vue
View File

@@ -1,89 +0,0 @@
<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 lang="scss">
page{
background-color: rgba(0,0,0,0);
}
.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: 92rpx;
font-weight: bold;
top: 200rpx;
left: 50%;
font-family: PingFang SC;
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>

46
pageB/details/index.vue
View File

@@ -19,8 +19,7 @@
<view class="box">
<videoItem v-for="item in listInfo" :key="item.article_id" :item="item"
@getArticlelist="getArticlelist"></videoItem>
<view class="no-data" v-if="!listInfo && page">暂无数据</view>
<u-loadmore v-else class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
<view class="no-data" v-show="!listInfo && !page">暂无数据</view>
</view>
</scroll-view>
</view>
@@ -75,14 +74,7 @@ export default {
userInfo: {}, // 用户信息
listInfo: [], // 列表详情
member_id: 0,
page: 1,
status: 'loadmore',
iconType: 'circle',
loadText: {
loadmore: '轻轻上拉',
loading: '努力加载中',
nomore: '实在没有了'
},
page: 0,
}
},
onLoad(option) {
@@ -90,24 +82,14 @@ export default {
this.member_id = option.id;
this.getUserInfo(option.id);
this.getArticlelist();
},
onReachBottom() {
// this.page++;
this.getArticlelist();
},
methods:{
// 获取信息
getUserInfo(id) {
this.$u.post("MemberExpert/expertInfo",{member_id: id}).then(res => {
console.log(res);
// console.log(res);
this.userInfo = res.data.info;
console.log(this.userInfo.is_attention);
if(this.userInfo.is_attention == 1){
this.$u.api.dynamicRead({id}).then((res)=>{
console.log(res)
})
}
// console.log(this.userInfo);
})
},
// 获取列表
@@ -119,23 +101,13 @@ export default {
}).then(res => {
if (res.errCode == 0) {
// console.log(res);
// this.listInfo = res.data.list;
this.listInfo = res.data.list;
// console.log(this.listInfo);
if (this.page == 1) {
this.listInfo = res.data.list;
this.status = "loadmore";
} else if (res.data.length == 0) {
this.status = "nomore";
} else {
this.listInfo = this.listInfo.concat(res.data.list);
}
this.page++;
} else {
console.log(res.message);
}
})
},
dianji(a){
console.log(a);
if(typeof a == "object"){
@@ -143,13 +115,7 @@ export default {
}else{
this.num = a
}
if (a == 0) {
this.page = 1;
this.getArticlelist();
} else if (a == 1) {
this.page = 1;
this.getArticlelist();
}
this.getArticlelist();
}
}
}

111
pageB/follow/index.vue
View File

@@ -1,49 +1,43 @@
<template>
<view class="follow">
<scroll-view scroll-y :style="{ height: viewHeight }" @scrolltolower="loadmore" class="container">
<view class="sosuo" @click="searchValue">
<image src="/static/image/common/10.png"></image>
<text>输入达人名称</text>
</view>
<view class="list" style="margin-left:-20rpx">
<darenItem style="margin-top:20rpx;margin-left:20rpx;" v-for="item in recommendList" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
</view>
<u-loadmore :status="loadStatus" bgColor="#ECECEC" font-size="14" margin-top="40" margin-bottom="20" v-if="recommendList.length > pageSize" @loadmore="loadmore"></u-loadmore>
</scroll-view>
<view class="sosuo" @click="searchValue">
<image src="/static/image/common/10.png"></image>
<text>输入达人名称</text>
</view>
<view class="list" style="margin-left:-20rpx">
<darenItem style="margin-top:20rpx;margin-left:20rpx;" v-for="item in recommendList" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
</view>
</view>
</template>
<style lang="scss" scoped>
.follow{
background-color: #ECECEC;
min-height: calc(100vh - var(--window-top));
.container {
box-sizing: border-box;
padding: 20rpx 30rpx;
.sosuo{
width: 100%;
height: 60rpx;
border-radius: 30rpx;
background-color: #fff;
display: flex;
align-items: center;
justify-content: center;
>image{
width: 29rpx;
height: 29rpx;
}
>text{
font-size: 24rpx;
color: #999;
margin-left: 15rpx;
}
}
.list{
display: flex;
flex-wrap: wrap;
width: calc(100% + 23rpx);
margin-right: -23rpx;
}
}
padding: 20rpx 30rpx;
.sosuo{
width: 100%;
height: 60rpx;
border-radius: 30rpx;
background-color: #fff;
display: flex;
align-items: center;
justify-content: center;
>image{
width: 29rpx;
height: 29rpx;
}
>text{
font-size: 24rpx;
color: #999;
margin-left: 15rpx;
}
}
.list{
display: flex;
flex-wrap: wrap;
width: calc(100% + 23rpx);
margin-right: -23rpx;
}
}
</style>
<script>
@@ -56,45 +50,22 @@ export default {
},
data(){
return{
pageSize: 2,
recommendList: [], // 推荐达人
page: 1,
loadStatus: 'loadmore',
timer: true,
viewHeight: '',
}
},
onLoad() {
this.setViewHeight();
},
onShow() {
this.getRecommendList();
},
methods: {
async getRecommendList({ load = 'reload' } = {}) {
const res = await this.$u.api.getAllRecommendList({ page: this.page });
this.timer = true;
if(res.errCode == 0) {
if(load == 'reload') this.recommendList = res.data.list;
if(load == 'loadmore') this.recommendList.push(...res.data.list);
}
return res.data.list.length;
},
loadmore() {
if(!this.timer) return false;
this.timer = false;
this.loadStatus = "loading";
this.page++;
this.getRecommendList({ load: "loadmore" }).then(length => {
this.loadStatus = "nomore";
if(length == 0) this.page--;
}).catch(() => {
this.loadStatus = "nomore";
this.page--;
getRecommendList() {
this.$u.api.getRecommendList().then(res => {
if(res.errCode == 0) {
this.recommendList = res.data.list;
}
})
},
changeType(member_id){
// console.log(member_id);
console.log(member_id);
this.$emit("pChangeType")
this.$u.api.attentionMember({
member_id: member_id
@@ -105,13 +76,9 @@ export default {
},
searchValue() {
uni.navigateTo({
url: '/pageB/search/index?type=2&curent=1'
url: '/pageB/search/index?type=2'
})
},
setViewHeight() {
const res = uni.getSystemInfoSync();
this.viewHeight = res.windowHeight + 'px';
}
},
}
</script>

129
pageB/photo/index.vue
View File

@@ -24,8 +24,8 @@
<!-- 用户操作 -->
<userinfo class="userinfo" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
<!-- 评论 -->
<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" @touchmove.stop.prevent="moveHandle">
<view class="comment-top">
<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" height="700rpx">
<view class="top">
<text>评论</text>
<u-icon name="close" color="#333" size="28" @click="is_comment=false"></u-icon>
</view>
@@ -47,15 +47,12 @@
<view class="info">
<image :src="child.member_avatar" mode=""></image>
<text>{{ child.member_nickname }}</text>
<u-icon class="icon" name="play-right-fill" color="#666" size="10rpx" v-if="0"></u-icon>
<text v-if="0">{{ child.reply_member_nickname }}</text>
<u-icon v-if="!child.is_nickanme" class="icon" name="play-right-fill" color="#666" size="10rpx"></u-icon>
<text v-if="!child.is_nickanme">{{ child.reply_member_nickname }}</text>
</view>
<view class="child_content">{{ child.content }}</view>
</view>
<view class="more-reply" v-if="item.reply_count" @click="getReplyList(item.id)">
{{ child_end[item.id] ? "暂无更多回复" : "展开更多回复" }}
<u-icon name="arrow-down" v-if="!child_end[item.id]"></u-icon>
</view>
<view class="more-reply" v-if="item.reply_count" @click="getReplyList(item.id)">展开更多回复<u-icon name="arrow-down"></u-icon></view>
</view>
</block>
<view class="no-data" v-if="!commentList.length">还没有评论，快来评论吧！</view>
@@ -69,7 +66,7 @@
<!-- 评论box -->
<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
<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>
</view>
</u-popup>
@@ -83,8 +80,8 @@
<view v-for="(item,index) in list.goods" :key="index" class="item" @click="gotoInfo(item.goods_id)">
<image :src="item.goods_image" mode="aspectFill"></image>
<view>
<text class="cart-title u-line-1">{{ item.goods_advword }}</text>
<text class="cart-info u-line-2">{{ item.goods_name }}</text>
<text class="title">{{ item.goods_advword }}</text>
<text class="name">{{ item.goods_name }}</text>
<text class="price">{{ item.goods_promotion_price }}</text>
</view>
</view>
@@ -162,32 +159,27 @@
display: flex;
flex-wrap: wrap;
.label {
height: 40rpx;
padding: 4rpx 14rpx;
margin-right: 10rpx;
margin-bottom: 10rpx;
font-size: 26rpx;
text-align: center;
line-height: 38rpx;
padding: 6rpx 10rpx;
margin: 0 10rpx 10rpx 0;
font-size: 24rpx;
color: #fff;
border-radius: 10rpx;
background-color: rgba(0, 0, 0, .6);
border-radius: 6rpx;
background-color: #000000;
opacity: 0.5;
}
}
}
.userinfo{
z-index: 9999;
position: absolute;
right: 30rpx;
top: 50%;
transform: translateY(-285rpx);
}
.pl {
.comment-top {
.top {
z-index: 1000;
position: fixed;
top: 0;
left: 0;
display: flex;
align-items: center;
justify-content: space-between;
@@ -205,7 +197,7 @@
.scroll-box {
z-index: 99;
margin: 88rpx 0 100rpx 0;
height: 600rpx;
height: 100%;
.box {
display: flex;
align-items: center;
@@ -225,7 +217,6 @@
height: 60rpx;
font-size: 26rpx;
color: #333;
pointer-events: none;
.time {
font-size: 22rpx;
color: #999;
@@ -238,13 +229,10 @@
}
.content {
padding: 0 20rpx 10rpx 90rpx;
pointer-events: none;
}
.child-content {
margin: 6rpx 90rpx 6rpx;
// pointer-events: none;
.child-box {
pointer-events: none;
.info {
display: flex;
align-items: center;
@@ -264,7 +252,6 @@
}
.child_content {
margin: 18rpx 0 18rpx 30rpx;
font-size: 26rpx;
}
}
.more-reply {
@@ -305,7 +292,6 @@
height: 90rpx;
& > input {
width: 80%;
font-size: 24rpx;
padding: 4rpx 20rpx;
border-radius: 20rpx;
}
@@ -344,18 +330,11 @@
& > view {
display: flex;
flex-direction: column;
justify-content: space-around;
width: 500rpx;
color: #343434;
justify-content: space-between;
color: #333;
font-size: 28rpx;
.cart-title {
line-height: 40rpx;
font-size: 29rpx;
.title {
}
.cart-info {
font-size: 24rpx;
line-height: 1.2;
}
.name {
width: 500rpx;
height: 80rpx;
@@ -365,8 +344,6 @@
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
margin:8rpx 0;
line-height:36rpx;
}
.price {
color: #FF3131;
@@ -430,7 +407,7 @@ export default {
list:{},
swiper_id: "",
page: 0, // 主评论
page_: {}, // 子评论
page_: [], // 子评论
cart_type: false, // 显示购物车
is_comment: false, // 显示评论
is_focus: false, // 聚焦
@@ -440,12 +417,10 @@ export default {
cart_len: 0,
photo_len: 0,
comment_num: 0,
is_more: true,
edit_text: "有爱评论，说点好听的 ~",
edit_text_other: "有爱评论，说点好听的 ~",
commentList: [], // 评论
allList: {}, // 全部子评论
child_end: {},
allList: [], // 全部子评论
status: 'loadmore',
iconType: 'circle',
loadText: {
@@ -459,7 +434,6 @@ export default {
onLoad(option){
this.article_id = option.id;
this.articleInfo(this.article_id);
this.allList = {};
},
// 监听返回按钮
onBackPress() {
@@ -518,33 +492,18 @@ export default {
this.commentList = this.commentList.concat(res.data);
}
this.page++;
let list = this.commentList;
list.forEach((item,index) => {
// console.log(item);
item.page = 0;
item.commentList = [];
this.page_[item.id] = 0;
this.child_end[item.id] = false;
})
this.commentList = list;
}
})
},
// 打开评论输入
openKeyInput(data,index) {
let me = this;
// console.log(data);
this.is_edit = true;
setTimeout(() => {
this.is_focus = true;
}, 200)
uni.onKeyboardHeightChange(function(res){
if (res.height == 0) {
me.is_focus = false;
}
})
this.comment_id = index;
if (data.content) {
if (data.id) {
this.edit_text_other = "回复@" + data.member_nickname;
this.pid = data.id;
this.reply_id = data.member_id;
@@ -567,25 +526,15 @@ export default {
pid: this.pid,
reply_id: this.reply_id,
}).then(res => {
// console.log(res.data);
this.send_value = "";
// console.log(res.data.data);
if (res.errCode == 0) {
this.send_value = "";
this.comment_num = res.data.num;
// console.log(this.comment_num);
this.is_edit = false;
// console.log(res.data.data.reply_id);
let p_id = res.data.data.pid;
// console.log(p_id);
if (res.data.data.pid) {
this.commentList[this.comment_id].reply_count = true;
// console.log(this.allList[p_id]);
if (this.allList[p_id]) {
this.allList[p_id].push(res.data.data);
} else {
this.allList[p_id] = [];
this.allList[p_id].push(res.data.data);
}
// console.log(this.allList);
this.allList[this.comment_id].unshift(res.data.data);
} else {
this.commentList.unshift(res.data.data);
}
@@ -596,23 +545,15 @@ export default {
},
// 发现回复列表
getReplyList(id) {
uni.showLoading({
title: "loading..."
})
this.page_[id] = 0;
if (!this.page_[id] === 0) {
}
console.log(this.page_[id]);
this.$u.post("article/articleReplyList", {id: id, page: this.page_[id]}).then(res => {
uni.hideLoading();
console.log(this.page_);
if (res.errCode == 0) {
if (this.page_[id] == 0) {
this.allList[id] = res.data;
} else {
this.allList[id] = this.allList[id].concat(res.data);
}
this.page_[id]++;
this.$forceUpdate();
// console.log(this.allList);
} else if (res.errCode == 1) {
this.child_end[id] = true;
this.$forceUpdate();
this.allList[id] = res.data;
}
})
},
@@ -629,7 +570,6 @@ export default {
},
// 评论滚动到底部
scrollBottom(e) {
console.log(1);
this.getComment();
},
// 跳转到商品
@@ -639,17 +579,12 @@ export default {
url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
})
},
// 禁止滚动
moveHandle(e) {
console.log(e);
return;
},
goBack() {
uni.navigateBack({
delta: 1
})
},
focus(e) {
focus() {
setTimeout(function(){
uni.showSoftKeybord;
}, 200)

44
pageB/playVideo/index.nvue
View File

@@ -1,44 +0,0 @@
<template>
<view style="width:750rpx" :style="{'height':height}">
<image @click="calose()" style="width:30rpx;height:30rpx;position: fixed;top:80rpx;right:30rpx;" src="/static/image/clons.png"></image>
<video :src="url" class="video" :style="{'padding-top':top,'height': width}" :autoplay="true"></video>
</view>
</template>
<style>
.video{
width: 750rpx;
}
</style>
<script>
export default {
name:"video",
data(){
return {
url:"",
top:0,
height:0,
width:0
}
},
onLoad(a){
const res = uni.getSystemInfoSync();
let height = res.windowHeight
let width = res.windowWidth
this.width = width + ( (height - width) / 2) + 'px'
console.log(this.width)
this.top = (height - width) / 2+ 'px'
console.log(this.top)
this.height = height + 'px';
console.log(a)
this.url = a.url
},
methods:{
calose(){
uni.navigateBack({
delta: 1
});
}
}
}
</script>

220
pageB/sdetails/index.vue
View File

@@ -19,27 +19,19 @@
</view>
<view class="info">
<view class="title u-line-2">
<text class="store-name" @click="toStorePage(goodsInfo.store_id)">{{ goodsInfo.store_name }}</text>
<text class="store-name">{{ goodsInfo.store_name }}</text>
<text class="goods-name">{{ goodsInfo.goods_name }}</text>
</view>
<view class="price-collect">
<view class="pic" v-if="type == 2">
<view class="pic" v-if="type != 3">
<text>￥{{ goodsInfo.pintuan_price || '0.00' }}</text>
<s>￥{{ goodsInfo.goods_price || '0.00' }}</s>
</view>
<view class="pic" v-else-if="type == 1">
<text>￥{{ goodsInfo.goods_price || '0.00' }}</text>
<s>￥{{ goodsInfo.goods_marketprice || '0.00' }}</s>
<view class="collect" @click="switchCollect(goodsInfo.goods_collect)">
<u-icon name="star" color="#474747" size="28" v-if="!goodsInfo.goods_collect"></u-icon>
<u-icon name="star-fill" color="#FF7807" size="28" v-else></u-icon>
<text>{{ !goodsInfo.goods_collect ? '收藏' : '已收藏' }}</text>
</view>
<view class="collect" @click="switchCollect(goodsInfo.is_collect)">
<u-icon name="star-fill" color="#FF7807" size="28" v-if="goodsInfo.is_collect == 1"></u-icon>
<u-icon name="star" color="#474747" size="28" v-else></u-icon>
<text>{{ goodsInfo.is_collect == 1 ? '已收藏' : '收藏' }}</text>
</view>
</view>
<view class="shuliang">
<text>历史销售数量：{{goodsInfo.goods_salenum}}</text>
<text>库存仅剩数量：{{goodsInfo.goods_storage}}</text>
</view>
</view>
<view class="hr"></view>
@@ -49,7 +41,7 @@
<!-- <navs :value="'选择尺码'"></navs> -->
<view class="comment">
<view class="title">
<view class="left">商品评价（{{ evaluate.evaluate_num || '0' }}）</view>
<view class="left">商品评价（{{ evaluate.evaluate_num }}）</view>
<view class="right" @click="viewComment">
<text>查看全部</text>
<image src="/static/image/common/1.png"></image>
@@ -108,7 +100,7 @@
</u-popup>
<u-popup v-model="showInvolvementUser" mode="center" z-index="10078">
<view class="involvement-container" v-if="involvemenGroupInfo.length">
<view class="title">参与<text class="user-name u-line-1">{{ involvemenGroupInfo[0].member_nickname }}</text>的拼团</view>
<view class="title u-line-1">参与{{ involvemenGroupInfo[0].member_nickname }}的拼团</view>
<view class="involvement-view">
<view class="item" v-for="(user, i) in involvemenGroupInfo" :key="i">
<image class="avatar" :src="user.member_avatar"></image>
@@ -125,11 +117,6 @@
<view class="heng"></view>
</view>
<view class="rich">
<view class="goods-video" v-if="list.length && goodsInfo.video" @click="playVideo">
<image class="video-play" src="/static/videoPlay.png"></image>
<view class="blacks"></view>
<image class="video-img" :src="list[0].image" mode="aspectFill"></image>
</view>
<rich-text :nodes="goodsInfo.mobile_body"></rich-text>
</view>
<!-- 选择规格数量 -->
@@ -139,19 +126,20 @@
<view class="head">
<image class="image" :src="goodsInfo.goods_image"></image>
<view class="info">
<view class="goods-name u-line-2">{{goodsInfo.goods_name}}</view>
<text class="u-line-2">{{goodsInfo.goods_name}}</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>
<guige @sel="self" ref="guige" v-for="(item,index) in goodsInfo.spec_value" :key="index" :title="goodsInfo.spec_name[index]" :item="item" :default="goodsInfo.goods_spec"></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">
<text>购买数量</text>
<u-number-box v-model="goodsNumber" :min="1"></u-number-box>
</view>
<!-- <view style="height:100rpx"></view> -->
<view style="height:100rpx"></view>
</view>
<u-toast ref="uToast" />
</scroll-view>
</u-popup>
<!-- 普通商品 tool -->
@@ -192,7 +180,7 @@
<view class="btn" v-else @click="spikeGoods">立即秒杀</view>
</view>
<!-- <tloos @buy="buy" @xuanze="xuanze" :id="id" :info="goodsInfo" :type="type"></tloos> -->
<u-toast ref="uToast" :z-index='200000' />
<u-toast ref="uToast" />
</view>
</template>
<script>
@@ -208,7 +196,7 @@ export default {
goodsInfo: {}, // 商品信息
storeInfo: {}, // 店铺信息
glist: [], // 规格列表
id: 0, // 商品id
id: 0, // 商品id/秒杀id/拼团 id
type: '', // 商品类型 商品详情 1普通 2拼团 3秒杀 4优惠券
groupUser: [], // 拼团用户
user_suc: [], // 拼团成功用户
@@ -227,9 +215,7 @@ export default {
sel: "", // 拼接的规格
quanxuan: false, // 规格是否选择
debounce: true, // 防止多次提交订单
storeid:0, // 店铺 id
pintuan_id: '', // 拼团 id
groupbuy_id: '', // 秒杀 id
storeid:0 // 店铺id
}
},
components: {
@@ -255,7 +241,7 @@ export default {
// this.type = 1;
this.id = option.id;
// 先请求普通商品详情获取商品类型再渲染页面
this.ordinaryDetails();
this.ordinaryDetails(this.id);
},
onShow() {
this.debounce = true;
@@ -294,7 +280,7 @@ export default {
id:this.storeid
}).then((res)=>{
console.log(res)
let user = new Friend(res.data.member_id,res.data.store_name,res.data.member_avatar)
let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
this.$u.route({
url:"/pageD/privateChat/privateChat",
params:{
@@ -391,58 +377,55 @@ export default {
purchase() {
this.settlementOrder();
},
getGoodsDetails() {
getGoodsDetails(id) {
switch (this.type) {
case 1:
this.ordinaryDetails();
this.ordinaryDetails(id);
break;
case 2:
this.pinTuanDetails();
this.pinTuanDetails(id);
break;
case 3:
this.spikeGoodsDetails();
this.spikeGoodsDetails(id);
break;
default:
break;
}
},
// 普通商品详情
ordinaryDetails() {
this.$u.api.getGoodsDetails({ id: this.id }).then(res => {
ordinaryDetails(id) {
this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
// console.log(res)
if (res.errCode == 0) {
this.evaluate = res.data.goods_evaluate_info;
this.goodsInfo = res.data.goods;
this.storeInfo = res.data.store;
this.setSwiperList(res.data.goods_image);
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.setTitle();
if(this.type == 1) {
this.id = res.data.goods.goods_id;
} else if(this.type == 2) {
this.id = res.data.goods.goods_id;
this.pintuan_id = res.data.goods.pintuan_id;
this.getGoodsDetails();
this.id = res.data.goods.pintuan_id;
this.getGoodsDetails(this.id);
} else if(this.type == 3) {
this.id = res.data.goods.goods_id;
this.groupbuy_id = res.data.groupbuy_id;
this.getGoodsDetails();
this.id = res.data.groupbuy_id;
this.getGoodsDetails(this.id);
}
}
})
},
// 拼团详情
pinTuanDetails() {
// console.log(this.id);
pinTuanDetails(id) {
this.$u.api.getPinTuanDetails({
pintuan_id: this.pintuan_id,
goods_id: this.id,
pintuan_id: id
}).then(res => {
if(res.errCode == 0) {
this.evaluate = res.data.data.goods_evaluate_info;
this.goodsInfo = res.data.data.goods;
this.pintuan_id = res.data.data.pintuan_id;
this.setSwiperList(res.data.data.goods_image);
this.glist = res.data.data.spec_list;
this.user_suc = res.data.data.user_suc;
@@ -452,14 +435,13 @@ export default {
})
},
// 秒杀详情
spikeGoodsDetails() {
spikeGoodsDetails(id) {
this.$u.api.getSpikeInfo({
groupbuy_id: this.groupbuy_id,
goods_id: this.id,
groupbuy_id: id
}).then(res => {
if(res.errCode == 0) {
// this.id = res.data.groupbuy_id;
this.groupbuyInfo = res.data.groupbuyInfo;
this.groupbuy_id = res.data.groupbuyInfo.groupbuy_id;
this.evaluate = res.data.goodsInfo.goods_evaluate_info;
this.goodsInfo = res.data.goodsInfo.goods;
this.setSwiperList(res.data.goodsInfo.goods_image);
@@ -480,26 +462,13 @@ export default {
}
})
},
// 验证能否拼团
async pintuanVerify({ pintuan_id, pintuangroup_headid }) {
const res = await this.$u.api.pintuanVerify({
pintuan_id: pintuan_id,
pintuangroup_headid: pintuangroup_headid,
})
if(res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
});
}
return res.errCode;
},
/*
* @description 下单 订单步骤1：展示结算数据
* @params {Number} type involvement 拼团或者 默认开团
* @params {Number} num 数量
* @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
**/
async settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
if(type != 'involvement') {
if(!this.showSpec) {
this.showSpec = true;
@@ -521,33 +490,26 @@ export default {
}
}
if(!this.debounce) return;
this.debounce = false;
let params = {
ifcart: ifcart,
cart_id: [this.goodsInfo.goods_id + '|' + num],
}
if(this.type == 2) {
if(type == 'involvement') {
// 验证能否拼团
const whether = await this.pintuanVerify({
pintuan_id: this.pintuan_id,
pintuangroup_headid: this.involvemenGroupInfo[0].user_id
}).then(status => {
if(status != 0) return true;
else return false;
})
if(whether) return false;
// const userId = uni.getStorageSync('user_info').member.member_id;
this.$store.commit('setGroupHeadId', this.involvemenGroupInfo[0].user_id);
// console.log(this.$store.state.pintuangroup_headid);
Object.assign(params, {
pintuan_id: this.pintuan_id,
pintuan_id: this.id,
pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id,
})
} else {
Object.assign(params, {
pintuan_id: this.pintuan_id,
pintuan_id: this.id,
})
}
}
this.debounce = false;
this.$u.api.settlementOrder(params).then(res => {
if(res.errCode == 0) {
// console.log('type' + this.type);
@@ -557,10 +519,8 @@ export default {
url: '/pageC/cart/ConfirmOrder'
})
} else {
this.$refs.uToast.show({
title: res.message,
});
this.debounce = true;
this.$u.toast(res.message);
}
})
},
@@ -583,10 +543,7 @@ export default {
if(sel != 0){
arr.push(sel)
}
}
// console.log(arr)
// 后台的 spec 是按升序排的
arr.sort((a, b) => a - b);
}
// console.log(arr)
if(arr.length == index){
this.sel = arr.join("|")
@@ -599,11 +556,8 @@ export default {
// console.log(id)
// 选择完规格后设商品type = 1
// this.type = 1;
// 改变 goods_id
// console.log(this.glist);
this.getGoodsDetails(this.glist[id])
this.id = this.glist[id];
// console.log(this.id);
this.getGoodsDetails();
},
// 设置页面标题
setTitle() {
@@ -648,21 +602,14 @@ export default {
current: arr[index]
})
},
switchCollect(status = 0) {
if(status == 1) {
switchCollect(status) {
if(status) {
this.removeFavorite();
} else {
this.addFavoriteGoods();
}
},
addFavoriteGoods() {
// // 尝试登录
// if (!this.$store.state.hasLogin) {
// uni.navigateTo({
// url: "pageA/login/login"
// })
// return false;
// }
this.$u.api.addFavoriteGoods({ fid: this.goodsInfo.goods_id }).then(res => {
if(res.errCode == 0) {
this.getGoodsDetails(this.id);
@@ -679,17 +626,6 @@ export default {
this.$u.toast(res.message);
}
})
},
toStorePage(id) {
this.$u.route('pageC/merchant/index', {
id: id
});
},
playVideo() {
console.log(this.goodsInfo.video);
this.$u.route('/pageB/playVideo/index', {
url: this.goodsInfo.video
});
}
},
}
@@ -780,15 +716,7 @@ export default {
.goods-name {
line-height: 1.5;
}
}
.shuliang{
padding-top: 33rpx;
font-size: 24rpx;
color:#656565;
display: flex;
justify-content: space-between;
}
.price-collect {
display: flex;
align-items: center;
@@ -1031,13 +959,6 @@ export default {
font-size: 32rpx;
color: rgba(51,51,51,1);
position: relative;
display: flex;
align-items: center;
justify-content: center;
.user-name {
display: inline-block;
max-width: 200rpx;
}
&::after {
content: '';
position: absolute;
@@ -1108,30 +1029,6 @@ export default {
}
.rich {
width: 100%;
.goods-video {
position: relative;
.video-img {
width: 100%;
}
.blacks {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.35);
z-index: 8;
}
.video-play {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 100rpx;
height: 100rpx;
z-index: 9;
}
}
}
.group-tool {
position: fixed;
@@ -1202,11 +1099,10 @@ export default {
background-color: #fff;
display: flex;
position: fixed;
height: 98rpx;
width: 100%;
bottom: 0;
left: 0;
padding-bottom: env(safe-area-inset-bottom);
// border-top: 1rpx solid #ececec;
bottom:0;
border-top: 1rpx solid #ececec;
z-index: 10076;
.navs{
display: flex;
@@ -1236,11 +1132,9 @@ export default {
}
.spec-popup {
padding: 30rpx;
margin-bottom: 130rpx;
box-sizing: border-box;
// height: 600rpx;
max-height: 60vh;
.head {
max-height: 750rpx;
.head{
display: flex;
margin-bottom: 30rpx;
.image{
@@ -1255,26 +1149,24 @@ export default {
justify-content: space-between;
margin-left: 27rpx;
flex-direction: column;
.goods-name {
height: 76rpx;
line-height: 38rpx;
>text:first-child{
font-size: 28rpx;
color: #333;
}
> text:last-child {
>text:last-child{
font-size: 30rpx;
color: #ff3131;
}
}
}
.num {
.num{
height: 84rpx;
display: flex;
border-bottom: #ececec solid 2rpx;
justify-content: space-between;
align-items: center;
> text {
>text{
font-size: 26rpx;
color: #666;
}

31
pageB/search/index.vue
View File

@@ -15,21 +15,13 @@ export default {
return{
type: '', // 1 商家达人社区 2 商品
keyword: "",
searchwordlist: [],
sid:0
searchwordlist: [],
}
},
// type: 1 商品 2: 其他
// type: 2 商品 1: 其他
onLoad(option) {
console.log(option.id)
if(option.id != undefined || option.id){
this.sid = option.id
}
this.type = option.type;
this.curent = option.curent || 0
this.getWordList();
if(option.type == 1) this.setNavSearchInput('搜索您需要的商品');
else if(option.type == 2) this.setNavSearchInput('请输入搜索内容');
},
// 点击搜索按钮
onNavigationBarButtonTap(e) {
@@ -44,18 +36,6 @@ export default {
this.search(this.keyword);
},
methods:{
setNavSearchInput(placeholder) {
// #ifdef APP-PLUS
// 修改 placeholder
webview.setStyle({
'titleNView': {
"searchInput": { //修改当前窗口search样式
"placeholder": placeholder,
}
}
})
// #endif
},
getWordList() {
this.$u.api.searchwordlist({type:this.type}).then(res => {
console.log(res)
@@ -71,8 +51,7 @@ export default {
}
let params = {
value: value,
type: this.type,
curent:this.curent
type: this.type,
}
if(this.type == 2) {
this.$u.route({
@@ -80,10 +59,6 @@ export default {
params: params,
})
}else{
if(this.sid !=0 ){
params.sid = this.sid
console.log(this.sid)
}
this.$u.route({
url: "/pageB/search/searchGoods",
params: params,

29
pageB/search/out.vue
View File

@@ -7,7 +7,7 @@
</view>
<view class="evaluation" :class="{ 'current' : current == 2 }" @click="switchCurrent(2)">社区</view>
</view>
<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore" v-show="current == 0" :scroll-top="scrollTop" @scroll="scroll">
<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore" v-show="current == 0">
<view v-for="goods in goodsList" :key="goods.store_id" class="goods-item" @click="toDetailsPage(goods.store_id)">
<image :src="goods.store_avatar"></image>
<view class="right">
@@ -18,7 +18,7 @@
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
<u-empty mode="list" v-if="!goodsList.length"></u-empty>
</scroll-view>
<scroll-view style="width:100%;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 2 " :scroll-top="scrollTop" @scroll="scroll">
<scroll-view style="width:100%;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 2 ">
<view class="box" style="padding: 0 30rpx;">
<view style="display:flex">
<view>
@@ -34,9 +34,9 @@
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
<u-empty mode="list" v-if="!goodsList.length"></u-empty>
</scroll-view>
<scroll-view style="width:100%;padding: 0rpx 30rpx;margin-right:23rpx;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 1 " :scroll-top="scrollTop" @scroll="scroll">
<scroll-view style="width:100%;padding: 20rpx 30rpx;margin-right:23rpx;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 1 ">
<view class="list" >
<darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0px 3rpx 7rpx 0px rgba(153, 153, 153, 0.35);" v-for="item in goodsList" :key="item.member_id" :info="item" v-on:pChangeType="changeType"></darenItem>
<darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0px 3rpx 7rpx 0px rgba(153, 153, 153, 0.35);" v-for="item in goodsList" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
</view>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
<u-empty mode="list" v-if="!goodsList.length"></u-empty>
@@ -59,11 +59,7 @@ export default {
scrollHeight: '',
loadStatus: 'loadmore',
timer: true, // 防止上拉加载短时间内多次调用,
value:"",
scrollTop: 0,
old: {
scrollTop: 0
}
value:""
}
},
components:{
@@ -82,22 +78,16 @@ export default {
},
onLoad(option) {
this.value = option.value;
this.current = option.curent
this.setViewHeight();
this.ShopSearch()
this.setNavSearchInput(this.value);
},
onNavigationBarSearchInputConfirmed(value) {
this.value = value.text
this.page = 1
// console.log(this.value)
this.ShopSearch()
},
methods: {
scroll: function(e) {
this.old.scrollTop = e.detail.scrollTop; // 必要
},
// 动态设置导航栏搜索框内容
setNavSearchInput(keyword) {
// #ifdef APP-PLUS
@@ -173,7 +163,6 @@ export default {
page: this.page
})
this.timer = true;
console.log(JSON.stringify(res))
if(res.errCode == 0) {
if(load == 'reload') this.goodsList = res.data.list;
else if(load == 'loadmore') this.goodsList.push(...res.data.list);
@@ -214,14 +203,13 @@ export default {
},
switchCurrent(current) {
// if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
this.page = 1;
this.current = current;
this.goodsList = []
this.ShopSearch()
},
setViewHeight() {
const res = uni.getSystemInfoSync();
this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 92 + 'px';
this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 90 + 'px';
},
toDetailsPage(id) {
this.$u.route('/pageC/merchant/index', {
@@ -243,11 +231,10 @@ export default {
box-sizing: border-box;
padding: 30rpx 40rpx;
display: flex;
// margin-bottom: 30rpx;
height: 92rpx;
margin-bottom: 30rpx;
> view {
height: 30rpx;
line-height: 1;
line-height: 30rpx;
flex: 1;
font-size: 32rpx;
color: rgba(51,51,51,1);

51
pageB/search/searchGoods.vue
View File

@@ -11,15 +11,12 @@
</view>
<view class="evaluation" :class="{ 'current' : current == 2 }" @click="switchCurrent(2)">好评</view>
</view>
<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore" :scroll-top="scrollTop" @scroll="scroll">
<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-item" @click="toDetailsPage(goods.goods_id)">
<image :src="goods.goods_image"></image>
<view class="right">
<view class="name u-line-1">{{ goods.goods_name }}</view>
<view class="briefing u-line-1">{{ goods.goods_advword }}</view>
<view class="price">￥{{ goods.goods_price }}
<text style="font-size:22rpx;color:#999;text-decoration:line-through;display: inline-block;margin-left:20rpx"> ￥{{goods.goods_marketprice}}</text>
</view>
<view class="briefing u-line-2">{{ goods.goods_advword }}</view>
</view>
</view>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
@@ -40,12 +37,7 @@ export default {
scrollHeight: '',
loadStatus: 'loadmore',
timer: true, // 防止上拉加载短时间内多次调用,
value:"",
scrollTop: 0,
old: {
scrollTop: 0
},
sid:''
value:""
}
},
watch: {
@@ -60,21 +52,14 @@ export default {
},
onLoad(option) {
this.value = option.value
this.sid = option.sid
this.setViewHeight();
this.ShopSearch()
this.setNavSearchInput(this.value);
},
onNavigationBarSearchInputConfirmed(value) {
this.value = value.text
this.page = 1
this.ShopSearch()
},
methods: {
scroll: function(e) {
this.old.scrollTop = e.detail.scrollTop; // 必要
},
setNavSearchInput(keyword) {
console.log(keyword);
// #ifdef APP-PLUS
@@ -110,21 +95,18 @@ export default {
// 排序方式 goods_salenum：销量　evaluation_count：评价　goods_price_asc：价格从低到高　goods_price_desc：价格从高到低
async ShopSearch({ load = 'reload' } = {}) {
console.log(this.value);
console.log(this.sid)
this.setNavSearchInput(this.value);
const sort = this.setOrderSort();
const res = await this.$u.api.ShopSearch({
keyword: this.value,
page: this.page,
order: sort,
sid:this.sid
})
this.timer = true;
if(res.errCode == 0) {
if(load == 'reload') this.goodsList = res.data.data;
else if(load == 'loadmore') this.goodsList.push(...res.data.data);
}
console.log(res)
return res.data.data.length;
},
loadMore() {
@@ -145,18 +127,13 @@ export default {
})
},
switchCurrent(current) {
this.page = 1
if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
this.scrollTop = this.old.scrollTop
this.$nextTick(function() {
this.scrollTop = 0
});
this.ShopSearch()
if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
this.current = current;
},
setViewHeight() {
const res = uni.getSystemInfoSync();
this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 92 + 'px';
this.scrollHeight = res.windowHeight - res.windowWidth / 750 * 90 + 'px';
},
toDetailsPage(id) {
this.$u.route('/pageB/sdetails/index', {
@@ -167,17 +144,15 @@ export default {
};
</script>
<style lang="scss" scoped>
.classify-goods {
.tab-container {
box-sizing: border-box;
padding: 30rpx 40rpx;
display: flex;
// margin-bottom: 30rpx;
height: 92rpx;
margin-bottom: 30rpx;
> view {
height: 30rpx;
line-height: 1;
line-height: 30rpx;
flex: 1;
font-size: 32rpx;
color: rgba(51,51,51,1);
@@ -222,21 +197,15 @@ export default {
}
.right {
width: 418rpx;
height: 200rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
.name {
font-size: 30rpx;
color: rgba(51,51,51,1);
margin-bottom: 20rpx;
}
.briefing {
font-size: 28rpx;
color: rgba(102,102,102,1);
}
.price {
font-size: 26rpx;
color: rgba(255,49,49,1);
line-height: 42rpx;
}
}
}

33
pageB/tipsinfo/index.vue
View File

@@ -1,33 +0,0 @@
<template>
<view class="u-content">
<u-parse :html="info"></u-parse>
</view>
</template>
<style lang="scss" scoped>
.u-content{
line-height: 46rpx;
font-size: 30rpx;
color: #333;
padding: 30rpx;
}
</style>
<script>
export default {
data(){
return {
info:""
}
},
onLoad(o){
console.log(o.id)
this.$u.api.tipsinfo({document_code:o.id}).then((res)=>{
console.log(JSON.stringify(res))
uni.setNavigationBarTitle({
title: res.data.document_title
});
this.info = res.data.document_content
})
}
}
</script>

2
pageB/triedDress/index.vue
View File

@@ -139,7 +139,7 @@ export default {
goods_id: this.goodsInfo.goods_id,
num: this.number,
store_id: this.store.store_id,
appointment_time: Math.floor(new Date(this.time).getTime() / 1000),
appointment_time: new Date(this.time),
}).then(res => {
if (res.errCode == 0) {
this.$refs.uToast.show({

664
pageB/video/video.nvue
View File

@@ -1,141 +1,74 @@
<template>
<view class="container">
<view>
<video id="videoId" :style="videoSize" :src="src" autoplay="true" :show-fullscreen-btn="false" @play="playing"
@pause="pausing" @ended="videoEnd" @timeupdate="timeupdate" :show-play-btn="false" :controls="false" @click="stoping"
:enable-progress-gesture="false" :show-center-play-btn="false"></video>
@timeupdate="timeupdate" :show-play-btn="false" controls="false" @click="stoping" :enable-progress-gesture="false"></video>
<cover-image class="close" @click="goBack" src="../../static/close.png">
</cover-image>
<cover-image class="pause" @click="stoping" src="../../static/videoPlay.png" v-if="!is_play">
</cover-image>
<!-- 用户操作 -->
<userinfo class="user-info" :style="{ top: fixTop }" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num"
@openCart="openPopup"></userinfo>
<!-- 视频信息 -->
<cover-view class="info-box">
<view class="video-info-box" :style="{ width: time_count > 99 ? '180rpx' : '160rpx' }">
<userinfo class="user-info" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
<cover-view class="info-box" @click="stopClick">>
<view class="video-info-box">
<image class="image-play" src="../../static/videoIcon.png" mode=""></image>
<text class="video-slip">视频</text>
<text class="time">{{ time_count }}s</text>
<text class="time">{{ time_count == 1 ? 0 : time_count }}s</text>
</view>
<view>
<text class="name" @click="gotoInfo(list)">@{{ list.member_nickname }}</text>
<text class="name">@{{ list.member_nickname }}</text>
</view>
<view @click="stopClick">
<view>
<text class="title">{{ list.article_title }}</text>
</view>
<view @click="stopClick">
<view>
<text class="centent">{{ list.article_content }}</text>
</view>
<view class="label-box" @click="stopClick">
<view class="label-box">
<block v-for="(item,index) in list.label" :key="index">
<text class="label" :style="{ width: labelLen[index] * 40 + 'rpx' }">{{ item.name }}</text>
</block>
</view>
</cover-view>
<!-- 单个商品 -->
<cover-view class="good-one" :style="{ bottom: fixTop - 100 }" v-if="cart_len == 1 && cart_type">
<view class="one-list" v-for="(item,index) in list.goods" :key="index" @click="goGoodInfo(item.goods_id)">
<image class="one-image" :src="item.goods_image" mode=""></image>
<view class="one-box">
<text class="title-one">{{ item.goods_advword }}</text>
<text class="content-one">{{ item.goods_name }}</text>
<text class="good-price">￥{{ item.goods_promotion_price }}</text>
</view>
<cover-view class="content-box" v-if="is_comment">
<view class="content-title">
<text class="tips">评论</text>
<text class="close-down" @click="closeComment">×</text>
</view>
</cover-view>
<!-- 遮罩层 -->
<cover-view class="mask" @click.stop="stopClick" :style="videoSize" v-if="is_edit || is_comment || cart_type && cart_len >= 2">
<!-- 评论 -->
<cover-view class="content-box" v-if="is_comment" ref="contentBox">
<view class="content-title">
<text class="tips">评论</text>
<text class="close-down" @click="closeComment">×</text>
</view>
<scroller class="comment-list">
<view class="" v-for="(item,index) in commentList" :key="index">
<view class="comment-list-box">
<view class="comment-list-header">
<image class="avatar" :src="item.member_avatar" mode=""></image>
<view class="comment-title-info">
<text class="comment-title">{{ item.member_nickname }}</text>
<text class="comment-time">{{ item.create_time }}</text>
</view>
</view>
<text class="reply" @click="openKeyInput(item,index)">回复</text>
</view>
<view class="content-main">
<text class="content-style">{{ item.content }}</text>
</view>
<view class="more-content-box">
<view class="child-box" v-for="(child,cid) in allList[item.id]" :key="cid">
<view class="child-info">
<image class="child-avatar" :src="child.member_avatar" mode=""></image>
<text class="child-name">{{ child.member_nickname }}</text>
<text v-if="0">{{ child.reply_member_nickname }}</text>
</view>
<text class="child_content">{{ child.content }}</text>
</view>
<!-- <view> -->
<text class="more-comment" @click="getReplyList(item.id)" v-if="item.reply_count">
{{ child_end[item.id] ? "暂无更多回复" : "展开更多回复" }}
</text>
<!-- </view> -->
</view>
</view>
<view class="send-box" @click="openKeyInput">
<input class="send-val" type="text" :placeholder="edit_text" placeholder-class="placeholder-class"
disabled="true" @click="openKeyInput" />
<text class="btn-send">发送</text>
</view>
<loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
<loading-indicator class="indicator"></loading-indicator>
<text class="indicator-text">努力加载中</text>
</loading>
</scroller>
</cover-view>
<!-- 评论框 -->
<cover-view class="edit-box" :style="videoSize" v-if="is_edit" @click="hideEdit">
<view class="input-main">
<input class="edit-input" type="text" :focus="is_focus" :placeholder=" edit_text_other ? edit_text_other : edit_text"
placeholder-class="placeholder-class" v-model="send_value" />
<text class="btn-send" @click="sendComment">发送</text>
</view>
<!-- <view class="key-height" :style="{ height: editTop }"></view> -->
</cover-view>
<!-- 购物车 -->
<cover-view class="cart-box" v-if="cart_type">
<view class="cart-title">
<text class="tips">全部商品</text>
<text class="close-down" @click="cart_type = false">×</text>
</view>
<scroller class="cart-list">
<view class="" v-for="(item,index) in list.goods" :key="index">
<view class="cart-list-header" @click="goGoodInfo(item.goods_id)">
<image class="goods-img" :src="item.goods_image" mode=""></image>
<view class="goods-info">
<text class="good-title">{{ item.goods_advword }}</text>
<text class="good-name">{{ item.goods_name }}</text>
<text class="good-price">{{ item.goods_promotion_price }}</text>
<scroller class="comment-list">
<view class="" v-for="(item,index) in commentList" :key="index">
<view class="comment-list-box">
<view class="comment-list-header">
<image class="avatar" :src="item.member_avatar" mode=""></image>
<view>
<text class="comment-title">{{ item.member_nickname }}</text>
<text class="comment-time">{{ item.create_time }}</text>
</view>
</view>
<text class="reply">回复</text>
</view>
<loading v-if="0" class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
<loading-indicator class="indicator"></loading-indicator>
<text class="indicator-text">努力加载中</text>
</loading>
</scroller>
</cover-view>
</cover-view>
<!-- 返回按钮 -->
<cover-image class="close" @click="goBack" src="../../static/close.png">
</cover-image>
<!-- 暂停按钮 -->
<cover-view class="pause" :style="{ top: fixTop + 100 }">
<cover-image class="pause-img" src="../../static/videoPlay.png" @click="stoping" v-if="!is_play">
</cover-image>
<view class="content-main">
<text class="content-style">{{ item.content }}</text>
</view>
</view>
<view class="send-box">
<input class="send-val" type="text" value="" />
<text class="btn-send">发送</text>
</view>
<loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
<loading-indicator class="indicator"></loading-indicator>
<text class="indicator-text">努力加载中</text>
</loading>
</scroller>
</cover-view>
<list class="cart-box">
<cell></cell>
</list>
</view>
</template>
<script>
import userinfo from "../components/userinfo/index" // 点赞组件
const temp_url = "https://mall.dmygkeji.com/api/";
const temp_url = "https://dmmall.sdbairui.com/api/";
export default {
components: {
userinfo
@@ -143,66 +76,29 @@
data() {
return {
videoSize: {},
fixTop: 0,
editTop: 0,
list: {},
labelLen: [],
cart_len: 0, // 购物车个数
cart_type: false, // 显示购物车
is_comment: false, // 显示评论
is_edit: false, // 显示输入
is_focus: false, //
comment_num: 0, // 评论数
edit_text: "有爱评论，说点好听的 ~",
edit_text_other: "有爱评论，说点好听的 ~",
pid: 0, // 主键
reply_id: 0, // 回复id
allList: {}, // 全部子评论
page_: {},
page: 0,
comment_id: 0,
send_value: "", // 评论
commentList: [], // 评论列表
src: "",
is_play: true,
time_count: 0,
linear: null,
loadinging: false,
child_end: {},
};
},
onLoad(option) {
this.article_id = option.id;
this.getVideoInfo(option.id);
this.getInfo();
this.allList = {};
},
onReady() {
this.videoBox = uni.createVideoContext("videoId", this);
},
onHide() {
if (uni.getSystemInfoSync().platform == "ios") {
console.log("ios");
} else if (uni.getSystemInfoSync().platform == "android") {
this.videoBox.pause();
}
},
onBackPress() {
if (this.cart_type) {
this.cart_type = !this.cart_type;
} else if (this.is_edit) {
this.is_edit = !this.is_edit;
} else if (this.is_comment) {
this.is_comment = !this.is_comment;
} else {
return false;
}
return true;
},
methods: {
moveHandle() {
return false;
},
// 获取信息
getVideoInfo(article_id) {
uni.request({
@@ -217,8 +113,6 @@
success: (res) => {
this.list = res.data.data.info;
this.src = res.data.data.info.video_path;
this.cart_len = res.data.data.info.goods.length;
console.log(this.cart_len);
let item = res.data.data.info.label;
let arr = [];
item.forEach(data => {
@@ -245,118 +139,40 @@
},
success: (res) => {
if (res.data.errCode == 0) {
// console.log(res.data);
console.log(res.data);
this.commentList = res.data.data;
}
let list = this.commentList;
list.forEach((item,index) => {
console.log(item);
item.page = 0;
item.commentList = [];
this.page_[item.id] = 0;
this.child_end[item.id] = false;
})
console.log(list);
this.commentList = list;
}
})
},
// 发布评论
sendComment() {
console.log(this.article_id, this.send_value, this.pid, this.reply_id);
if (this.send_value.length == 0) {
uni.showToast({
title: "输入内容不能为空！",
icon: "none"
})
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,
},
header: {
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
},
success: (res) => {
console.log(res);
this.is_edit = false;
this.send_value = "";
if (res.data.errCode == 0) {
this.comment_num = res.data.num;
let p_id = res.data.data.data.pid;
console.log(this.pid, this.reply_id, this.comment_id);
if (res.data.data.data.pid) {
this.commentList[this.comment_id].reply_count = true;
console.log(this.allList[p_id]);
if (this.allList[p_id]) {
this.allList[p_id].push(res.data.data.data);
} else {
this.allList[p_id] = [];
this.allList[p_id].push(res.data.data.data);
}
console.log(this.allList);
} else {
this.commentList.unshift(res.data.data.data);
}
// console.log(this.commentList);
} else if (res.data.errCode == 401) {
uni.showToast({
title: "您还没有登录，请先登录！",
icon: "none",
// success: () => {
// setTimeout(function() {
// this.$u.route("/pageA/login/login")
// }, 2000)
// }
})
} else {
uni.showToast({
title: res.data.message,
icon: "none"
})
}
}
})
},
// 发现回复列表
getReplyList(id) {
uni.showLoading({
title: "loading..."
})
uni.request({
url: temp_url + "article/articleReplyList",
method: "POST",
data: {
id: id,
page: this.page_[id],
},
header: {
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
},
success: (res) => {
uni.hideLoading();
console.log(this.page_);
if (res.data.errCode == 0) {
if (this.page_[id] == 0) {
this.allList[id] = res.data.data;
} else {
this.allList[id] = this.allList[id].concat(res.data.data);
}
this.page_[id]++;
this.$forceUpdate();
} else if (res.data.errCode == 1) {
this.child_end[id] = true;
this.$forceUpdate();
}
console.log(this.allList);
}
})
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() {
@@ -364,9 +180,8 @@
success: (res) => {
this.videoSize = {
width: "750rpx",
height: res.screenHeight + "px",
height: res.screenHeight + "px"
}
this.fixTop = res.screenHeight / 3;
}
})
},
@@ -375,19 +190,6 @@
// console.log(e);
if (e.type == "play") {}
},
pausing(e) {
if (e.type == "pause") {
this.is_play = false;
}
},
// 结束
videoEnd(e) {
// console.log(e);
if (e.type == "ended") {
this.is_play = false;
this.time_count = 0;
}
},
// 暂停
stoping() {
this.is_play = !this.is_play;
@@ -400,9 +202,8 @@
// 监听视频
timeupdate(e) {
this.time_count = parseInt(e.detail.duration) - parseInt(e.detail.currentTime);
// console.log(e.detail.currentTime,e.detail.duration);
if (e.detail.duration == e.detail.currentTime) {
// this.is_play = false;
this.is_play = false;
}
// let num = parseInt((e.detail.currentTime/e.detail.duration)*100);
// this.linear = num + "%";
@@ -410,59 +211,17 @@
},
// 打开弹窗
openPopup(data) {
// console.log(data);
if (this.cart_len >= 2) {
}
console.log(data);
this.cart_type = data.cart;
this.is_comment = data.comment;
if (this.is_comment) {
this.page = 0;
this.getComment();
// this.is_play = true;
}
},
// 打开评论输入
openKeyInput(data, index) {
// console.log(data);
let me = this;
this.is_focus = true;
setTimeout(() => {
this.is_edit = true;
}, 500)
uni.onKeyboardHeightChange(function(res) {
console.log(res);
if (res.height == 0) {
me.is_focus = false;
me.is_edit = false;
} else {
me.editTop = res.height + "rpx";
}
})
this.comment_id = index;
if (data.id) {
this.edit_text_other = "回复@" + data.member_nickname;
this.pid = data.id;
this.reply_id = data.member_id;
} else {
this.edit_text_other = "有爱评论，说点好听的 ~";
this.pid = "";
this.reply_id = "";
}
// console.log(this.pid, this.edit_text_other);
},
blue() {
this.is_focus = false;
},
// 关闭评论
closeComment() {
this.is_comment = false;
this.is_edit = false;
// console.log(this.is_comment,this.is_play);
// if (!this.is_comment && this.is_play) {
// console.log(1);
// this.is_play = false;
// }
},
// 下拉加载
onloading(e) {
@@ -472,17 +231,6 @@
this.loadinging = false;
}, 2000)
},
// 跳转
goGoodInfo(id) {
uni.navigateTo({
url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
})
},
gotoInfo(id) {
console.log(id);
},
// 收起键盘
hideEdit() {},
// stop
stopClick(event) {
event.stopPropagation();
@@ -497,45 +245,29 @@
</script>
<style>
.container {
position: relative;
}
/* 关闭 */
.close {
z-index: 99;
position: fixed;
top: 100rpx;
right: 70rpx;
top: 80rpx;
right: 60rpx;
width: 30rpx;
height: 30rpx;
}
/* 暂停 */
.pause {
z-index: 99;
position: fixed;
top: 600rpx;
left: 330rpx;
width: 100rpx;
height: 100rpx;
/* #ifdef H5 */
top: 500rpx;
/* #endif */
}
.pause-img {
width: 100rpx;
height: 100rpx;
}
/* 用户操作 */
.user-info {
position: fixed;
right: 26rpx;
/* #ifdef H5 */
top: 400rpx;
/* #endif */
top: 360rpx;
right: 30rpx;
}
/* 底部信息 */
@@ -549,6 +281,7 @@
.video-info-box {
flex-direction: row;
align-items: center;
width: 160rpx;
height: 40rpx;
padding: 4rpx 10rpx;
margin-bottom: 20rpx;
@@ -557,63 +290,13 @@
background-color: rgba(255, 255, 255, .6);
}
.good-one {
position: fixed;
right: 160rpx;
width: 420rpx;
padding: 20rpx;
border-radius: 10rpx;
background-color: rgba(0, 0, 0, 0.6);
}
.one-list {
flex-direction: row;
}
.one-image {
width: 160rpx;
height: 160rpx;
margin-right: 20rpx;
border-radius: 4rpx;
}
.one-box {
justify-content: space-around;
color: #333;
}
.title-one {
width: 200rpx;
font-size: 28rpx;
color: #fff;
lines: 1;
text-overflow: ellipsis;
}
.content-one {
width: 200rpx;
font-size: 24rpx;
color: #fff;
lines: 2;
text-overflow: ellipsis;
}
.mask {
z-index: 10000;
position: fixed;
top: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.5);
}
.content-box {
z-index: 999;
z-index: 99;
position: fixed;
bottom: 0;
left: 0;
width: 750rpx;
height: 700rpx;
padding-bottom: 50rpx;
margin-bottom: 88rpx;
background-color: #fff;
}
@@ -632,64 +315,24 @@
}
.comment-list-box {
padding: 20rpx 30rpx;
padding: 30rpx;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.content-main {
flex-direction: row;
padding-left: 100rpx;
}
.content-style {
width: 600rpx;
font-size: 28rpx;
font-size: 26rpx;
color: #333;
lines: 2;
}
.more-content-box {
margin-left: 100rpx;
}
.child-box {}
.child-info {
margin: 10rpx 0;
flex-direction: row;
align-items: center;
}
.child-avatar {
width: 30rpx;
height: 30rpx;
margin-right: 10rpx;
border-radius: 50%;
}
.child-name {
font-size: 22rpx;
color: #333;
}
.child_content {
width: 550rpx;
padding-top: 6rpx;
margin-left: 40rpx;
font-size: 26rpx;
}
.more-comment {
width: 150rpx;
height: 40rpx;
font-size: 22rpx;
line-height: 4;
color: #999;
}
.comment-list-header {
flex-direction: row;
}
@@ -700,10 +343,6 @@
margin-right: 20rpx;
border-radius: 50%;
}
.comment-title-info {
justify-content: space-between;
}
.comment-title {
font-size: 26rpx;
@@ -721,7 +360,6 @@
font-weight: 500;
color: #333;
}
.send-box {
z-index: 10000;
position: fixed;
@@ -737,128 +375,24 @@
border-color: #ececec;
background-color: #fff;
}
.send-val {
width: 600rpx;
height: 88rpx;
font-size: 36rpx;
}
.btn-send {
padding: 0 20rpx;
font-size: 28rpx;
color: #666;
font-size: 30rpx;
color: #303133;
}
.close-down {
padding: 10rpx;
font-size: 50rpx;
text-align: center;
color: #333;
}
.edit-box {
z-index: 1000;
position: fixed;
bottom: 0;
left: 0;
width: 750rpx;
background-color: rgba(0, 0, 0, 0.8);
}
.input-main {
position: fixed;
left: 0;
bottom: 0;
/* #ifdef H5 */
display: flex;
/* #endif */
flex-direction: row;
align-items: center;
justify-content: space-between;
width: 750rpx;
padding: 0 20rpx;
line-height: 80rpx;
background-color: #fff;
border-top-right-radius: 10rpx;
border-top-left-radius: 10rpx;
}
.key-height {
width: 750rpx;
background-color: #fff;
}
.edit-input {
width: 600rpx;
height: 80rpx;
padding: 0 10rpx;
font-size: 24rpx;
color: #333;
}
.cart-box {
z-index: 1000;
position: fixed;
bottom: 0;
left: 0;
width: 750rpx;
height: 700rpx;
background-color: #fff;
}
.cart-title {
flex-direction: row;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 20rpx;
border-color: #f2f2f2;
border-bottom-width: 1rpx;
background-color: #fff;
}
.cart-list {}
.cart-list-header {
padding: 20rpx;
flex-direction: row;
border-bottom-width: 1rpx;
border-bottom-color: #ececec;
}
.goods-img {
width: 160rpx;
height: 160rpx;
border-radius: 10rpx;
margin-right: 20rpx;
}
.goods-info {
justify-content: space-around;
}
.good-title {
width: 500rpx;
color: #333;
font-size: 30rpx;
lines: 1;
text-overflow: ellipsis;
}
.good-name {
width: 500rpx;
font-size: 24rpx;
line-height: 30rpx;
lines: 2;
text-overflow: ellipsis;
}
.good-price {
font-size: 28rpx;
color: #FF3131;
}
.image-play {
width: 22rpx;
height: 20rpx;
@@ -883,16 +417,13 @@
}
.title {
width: 700rpx;
color: #fff;
font-size: 30rpx;
font-size: 26rpx;
margin-bottom: 20rpx;
lines: 1;
text-overflow: ellipsis;
}
.centent {
width: 700rpx;
width: 500rpx;
color: #fff;
font-size: 28rpx;
margin-bottom: 20rpx;
@@ -905,6 +436,7 @@
}
.label {
lines: 3;
width: 100rpx;
height: 40rpx;
padding: 4rpx 10rpx;
@@ -912,7 +444,6 @@
margin-bottom: 10rpx;
font-size: 26rpx;
text-align: center;
line-height: 38rpx;
color: #666666;
border-radius: 10rpx;
background-color: rgba(255, 255, 255, .6);
@@ -936,9 +467,4 @@
height: 30rpx;
color: #999;
}
.placeholder-class {
font-size: 13px;
color: #666;
}
</style>

280
pageC/cart/ConfirmOrder.vue
View File

@@ -26,7 +26,7 @@
<view class="info">
<view class="name u-line-2">{{ goods.goods_name }}</view>
<view class="cart-info">
<view class="price">￥{{ goods.goods_price }}</view>
<view class="price">￥{{ goods.goods_total }}</view>
<view>×{{ goods.goods_num }}</view>
</view>
</view>
@@ -34,29 +34,20 @@
</view>
</view>
<view class="order-info">
<view class="show-view" @click="showCoupon({type: 2, store_id: item[0].store_id})" v-if="orderType == 1 || orderType == 5">
<view @click="showCoupon({type: 2, store_id: item[0].store_id})" v-if="orderType == 1 || orderType == 5">
<view class="title">优惠券折扣</view>
<view class="value">
<view>-￥{{ storeCoupon[item[0].store_id] ? storeCoupon[item[0].store_id].voucher_price.toFixed(2) : '0.00' }}</view>
<image src="../static/image/1.png"></image>
</view>
</view>
<view class="show-view">
<view>
<view class="title">运费</view>
<view class="value">
<view v-if="freight">￥{{ freight | setFreight(index) }}</view>
</view>
</view>
<view class="remark">
<view class="title">订单备注</view>
<u-input v-model="remark[index]" type="textarea" style="margin-top:-5rpx" :height="88" placeholder="选填" />
</view>
</view>
<view class="pick-up" v-if="delivery.type == 3">
<view class="title">自提地址</view>
<view class="content">{{ orderInfo.store_list[index].store_address }}</view>
</view>
<view class="store-total">共{{ item | getTotalNum }}件 小计：<text>￥{{ orderInfo.store_goods_total[index] | getStorePrice(storeCoupon, index) }}</text></view>
</view>
</view>
<view class="common-active">
@@ -74,27 +65,19 @@
<image src="../static/image/1.png"></image>
</view>
</view>
<view>
<view class="title">开具发票</view>
<view class="value" @click="selectInvoice">
<view class="invoice" v-if="!hasInvoice">本次不开具发票</view>
<view class="invoice" v-else>{{ hasInvoice == 1 ? '个人或事业单位发票' : '企业发票' }}</view>
<image src="../static/image/1.png"></image>
</view>
</view>
</view>
<u-popup v-model="couponStatus" mode="bottom">
<scroll-view class="coupon-choose" scroll-y style="height: 50vh;" v-if="this.couponType.type == 1">
<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 1">
<view class="title">优惠券详情</view>
<view class="text">平台优惠券</view>
<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_all_list" :key="index" :type="true" :sel="coupon.sel"></Coupon>
<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_all_list.length" style="height: 200rpx"></u-empty>
<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_all_list" :key="index"></Coupon>
<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_all_list.length"></u-empty>
</scroll-view>
<scroll-view class="coupon-choose" scroll-y style="height: 50vh;" v-if="this.couponType.type == 2">
<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 2">
<view class="title">优惠券详情</view>
<view class="text">店铺优惠券</view>
<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_list[this.couponType.store_id]" :key="index" :type="true" :sel="coupon.sel"></Coupon>
<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_list[this.couponType.store_id].length" style="height: 200rpx"></u-empty>
<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_list[this.couponType.store_id]" :key="index"></Coupon>
<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_list[this.couponType.store_id].length"></u-empty>
</scroll-view>
</u-popup>
<view class="bottom">
@@ -124,23 +107,13 @@ export default {
deliveryList: [{
text: '快递',
value: 'express',
disabled: false,
type: 1,
}, {
text: '骑手',
value: 'takeawayer',
disabled: false,
type: 2,
}, {
text: '自提',
value: 'selfraising',
disabled: false,
type: 3,
}],
delivery: {
text: '快递',
value: 'express',
type: 1,
}, // 配送方式
couponList: [],
couponStatus: false,
@@ -150,35 +123,12 @@ export default {
goodsClass: [],
orderType: '', // 订单类型 1 普通订单 2 拼团订单 3 秒杀订单 4 优惠券 5 购物车订单
debounce: true,
hasInvoice: 0,
remark: {}
}
},
components: {
Coupon
},
filters: {
// 店铺总数量
getTotalNum(data, coupon) {
let num = 0;
data.forEach(item => {
num += item.goods_num;
})
return num;
},
// 店铺总金额
getStorePrice(price, coupon, index) {
for (const key in coupon) {
if (coupon.hasOwnProperty(key)) {
const element = coupon[key];
if(index == key) {
price -= Number(element.voucher_price);
}
}
}
return price;
},
// 订单总数量
setTotalNumber(data) {
let num = 0;
for (const key in data) {
@@ -192,17 +142,14 @@ export default {
return num;
},
setFreight(freight, index) {
return freight[index] || '0.00';
return freight[index];
}
},
onLoad(option) {
this.orderType = this.$store.state.orderType;
this.orderInfo = this.$store.state.orderInfo;
// 判断是否可选自提
if(!this.orderInfo.is_selfraising) this.deliveryList[2].disabled = true;
// console.log('orderType' + this.orderType);
console.log('orderType' + this.orderType);
// console.log(this.orderInfo);
this.initRemark();
this.getGoodsClass();
this.setTotalPrice();
},
@@ -216,13 +163,9 @@ export default {
} else {
if(this.$store.getters.getOrderAddress) this.addressInfo = this.$store.state.orderAddress;
}
// 是否开发票
this.hasInvoice = this.$store.getters.hasInvoice;
// console.log(this.hasInvoice);
},
beforeDestroy() {
this.$store.commit('updateAddress', {});
this.$store.commit('setInvoiceInfo', {});
},
watch: {
'$store.state.orderAddress'(value) {
@@ -231,17 +174,6 @@ export default {
},
},
methods: {
initRemark() {
// 初始化备注
const obj = this.orderInfo.store_cart_list;
for (const key in obj) {
if (obj.hasOwnProperty(key)) {
const element = obj[key];
this.remark[key] = '';
}
}
console.log(this.remark);
},
// 如果有pintuangroup_headid为参团不然为开团
async withImmediate(type) {
let params = {
@@ -250,10 +182,8 @@ export default {
// console.log(this.orderInfo);
// console.log(this.$store.state.pintuangroup_headid);
if(this.orderInfo.pintuangroup_id) {
Object.assign(params, {
pintuangroup_headid: this.$store.state.pintuangroup_headid,
pintuangroup_id: this.orderInfo.pintuangroup_id
});
Object.assign(params, { pintuangroup_headid: this.$store.state.pintuangroup_headid });
Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id });
}
console.log(params);
this.$u.api.withImmediate(params).then(res => {
@@ -268,7 +198,6 @@ export default {
})
},
intermediate() {
console.log(this.remark);
if(!this.debounce) return;
this.debounce = false;
if(this.orderType == 2) {
@@ -320,9 +249,6 @@ export default {
cart_id: id,
address_id: this.addressInfo.address_id,
buy_city_id: this.addressInfo.city_id,
member_deliver_type: this.delivery.type,
invoice_id: this.$store.getters.getInvoiceId, // 发票抬头ID，不开票传0
pay_message: this.remark,
}
if(coupon.length) Object.assign(params, { voucher_id: coupon });
if(this.orderType == 2) {
@@ -330,17 +256,16 @@ export default {
if(this.orderInfo.pintuangroup_id) Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id });
}
// console.log(params);
// return;
this.$u.api.sendOrder(params).then(res => {
if(res.errCode == 0) {
this.$u.route({
type: 'redirect',
url: '/pageC/cart/cashier',
params: {
ifcart: ifcart,
ifcart: params.ifcart,
pay_sn: res.data.pay_sn,
price: res.data.order_total_amount,
order_id: res.data.order_list[0].order_id,
order_id: res.data.order_list[0].order_id,
}
})
} else {
@@ -357,37 +282,15 @@ export default {
this.couponStatus = true;
},
useCoupon(coupon) {
// console.log(coupon)
if(this.couponType.type == 1){
this.choiceCoupon = {}
for(let i in this.orderInfo.store_voucher_all_list){
if(this.orderInfo.store_voucher_all_list[i].voucher_id == coupon.voucher_id && !this.orderInfo.store_voucher_all_list[i].sel){
this.orderInfo.store_voucher_all_list[i].sel = true
this.choiceCoupon = coupon;
}else{
this.orderInfo.store_voucher_all_list[i].sel = false
}
}
this.$forceUpdate()
}
if(this.couponType.type == 1) this.choiceCoupon = coupon;
if(this.couponType.type == 2) {
this.storeCoupon = {}
for(let i in this.orderInfo.store_voucher_list[this.couponType.store_id]){
console.log(this.orderInfo.store_voucher_list[this.couponType.store_id][i])
if(this.orderInfo.store_voucher_list[this.couponType.store_id][i].voucher_id == coupon.voucher_id && !this.orderInfo.store_voucher_list[this.couponType.store_id][i].sel){
this.orderInfo.store_voucher_list[this.couponType.store_id][i].sel = true
Object.assign(this.storeCoupon, {
[this.couponType.store_id]: coupon
})
}else{
this.orderInfo.store_voucher_list[this.couponType.store_id][i].sel = false
}
}
this.$forceUpdate()
Object.assign(this.storeCoupon, {
[this.couponType.store_id]: coupon
})
}
// console.log(this.choiceCoupon);
// console.log(this.storeCoupon);
// this.couponStatus = false;
this.couponStatus = false;
this.setTotalPrice(); // 计算总价
},
getFreight() {
@@ -406,71 +309,40 @@ export default {
},
setTotalPrice() {
const goods = this.orderInfo.store_goods_total;
let [freight, price, minPrice] = [0, 0, 0];
// 运费
for(const key in this.freight) {
if(this.freight.hasOwnProperty(key)) {
const element = this.freight[key];
freight += Number(element);
}
}
// 商品价格减去优惠券
// 店铺
for(const gid in goods) {
if(goods.hasOwnProperty(gid)) {
// 计算最小价格
minPrice += 0.01;
// 每个店铺所有商品的价格
let sprice = Number(goods[gid]);
if(JSON.stringify(this.storeCoupon) != '{}') {
for(const cid in this.storeCoupon) {
if(this.storeCoupon.hasOwnProperty(cid)) {
const cprice = this.storeCoupon[cid];
// 商品减去优惠券价格
if(gid == cid) {
sprice -= cprice.voucher_price;
// 每个店铺最低付款 0.01
if(sprice <= 0) sprice = 0.01;
}
}
}
// console.log(this.freight);
const freight = this.freight;
let price = 0;
// 商品价格加上运费
[goods, freight].forEach(object => {
for (const key in object) {
if (object.hasOwnProperty(key)) {
const element = object[key];
price += Number(element);
}
// 所有商品总价
price += sprice;
}
}
})
// 减去优惠券
// 平台
if(JSON.stringify(this.choiceCoupon) != '{}') price -= Number(this.choiceCoupon.voucher_price);
// 每个店铺最低付款 0.01
if(price <= minPrice) price = minPrice;
// console.log("minPrice" + minPrice);
// console.log("freight:" + freight);
// console.log("price:" + price);
this.totalPrice = (price + freight).toFixed(2);
},
async setDelivery(index) {
// console.log(index);
if(index == 1) {
if(!this.isTakeawayer) {
this.$u.toast('此地区不支持骑手配送');
return false;
}
this.delivery = this.deliveryList[index];
this.getFreight();
}
if(index == 2) {
for (const key in this.freight) {
if (this.freight.hasOwnProperty(key)) {
this.freight[key] = '0.00';
// 店铺
if(JSON.stringify(this.storeCoupon) != '{}') {
for (const key in this.storeCoupon) {
if (this.storeCoupon.hasOwnProperty(key)) {
const element = this.storeCoupon[key];
price -= element.voucher_price;
}
}
this.setTotalPrice(); // 计算总价
this.delivery = this.deliveryList[index];
}
if(index == 0) {
this.delivery = this.deliveryList[index];
this.getFreight();
// console.log(price);
this.totalPrice = price.toFixed(2);
},
setDelivery(index) {
if(index == 1) {
if(!this.isTakeawayer) this.$u.toast('此地区不支持骑手配送');
return false;
}
this.delivery = this.deliveryList[index];
this.getFreight();
},
settlement() {
uni.navigateTo({
@@ -486,10 +358,7 @@ export default {
uni.navigateTo({
url: '/pageE/more/Address?type=choose'
});
},
selectInvoice() {
this.$u.route('/pageC/cart/selectInvoice');
},
}
},
};
</script>
@@ -498,7 +367,6 @@ export default {
min-height: calc(100vh - var(--window-top));
background-color: #ECECEC;
padding-top: 1rpx;
padding-bottom: 200rpx;
.info-address {
padding: 30rpx;
display: flex;
@@ -561,7 +429,7 @@ export default {
height: 60rpx;
border-radius: 50%;
margin-right: 15rpx;
// background-color: aquamarine;
background-color: aquamarine;
}
> view {
font-size: 28rpx;
@@ -569,7 +437,6 @@ export default {
margin-right: 15rpx;
}
.right {
margin-left: auto;
flex-shrink: 0;
width: 11rpx;
height: 22rpx;
@@ -587,7 +454,7 @@ export default {
width: 180rpx;
height: 160rpx;
border-radius: 10rpx;
// background-color: aqua;
background-color: aqua;
flex-shrink: 0;
}
.info {
@@ -630,7 +497,7 @@ export default {
}
}
.order-info {
.show-view {
> view {
height: 98rpx;
background: rgba(255,255,255,1);
padding: 35rpx 30rpx;
@@ -655,53 +522,11 @@ export default {
}
}
}
.remark {
background: rgba(255,255,255,1);
padding: 35rpx 30rpx;
display: flex;
justify-content: space-between;
margin-bottom: 2rpx;
.title {
font-size: 28rpx;
color: rgba(102,102,102,1);
margin-right: 20rpx;
}
/deep/ .u-input {
font-size: 28rpx;
.u-input__textarea {
padding: 0;
}
}
}
}
.pick-up {
padding: 30rpx;
background: rgba(255,255,255,1);
.title {
font-size: 28rpx;
color: #666666;
margin-bottom: 30rpx;
}
.content {
font-size: 30rpx;
color: #343434;
line-height: 40rpx;
}
}
.store-total {
text-align: right;
padding: 34rpx 30rpx;
background: rgba(255,255,255,1);
font-size: 28rpx;
color: #656565;
> text {
color: #FF770F;
}
}
}
}
.common-active {
padding-bottom: 30rpx;
padding-bottom: 200rpx;
> view {
height: 98rpx;
background: rgba(255,255,255,1);
@@ -719,9 +544,6 @@ export default {
align-items: center;
font-size: 30rpx;
color:rgba(51,51,51,1);
.invoice {
font-size: 26rpx;
}
> image {
width: 12rpx;
height: 22rpx;

38
pageC/cart/index.vue
View File

@@ -3,7 +3,7 @@
<u-checkbox-group class="cart-main" @change="storeChange">
<view v-for="(store, s_index) in list" :key="s_index" class="cart-item">
<view class="store">
<u-checkbox v-model="store.checked" shape="circle" active-color="#FF780F" icon-size="26" :name="s_index" @change="storeaAloneChange"></u-checkbox>
<u-checkbox v-model="store.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="s_index" @change="storeaAloneChange"></u-checkbox>
<view class="name" @click="viewStoreDetails(store.store_id)">
<image :src="store.store_avatar"></image>
<view>{{ store.store_name }}</view>
@@ -12,7 +12,7 @@
<view class="goods">
<u-checkbox-group @change="goodsChange($event, s_index)">
<view v-for="(goods, g_index) in store.goods" :key="g_index" class="goods-item">
<u-checkbox v-model="goods.checked" shape="circle" active-color="#FF780F" icon-size="26" :name="g_index"></u-checkbox>
<u-checkbox v-model="goods.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="g_index"></u-checkbox>
<image :src="goods.goods_image" @click="viewGoodsDetails(goods.goods_id)"></image>
<view class="info">
<view class="name u-line-2" @click="viewGoodsDetails(goods.goods_id)">{{ goods.goods_name }}</view>
@@ -31,7 +31,7 @@
</view>
<view class="balance">
<u-checkbox-group>
<u-checkbox v-model="checkedAll" shape="circle" active-color="#FF780F" icon-size="26" label-size="30" @change="totalChange">
<u-checkbox v-model="checkedAll" shape="circle" active-color="#FF780F" icon-size="35" label-size="30" @change="totalChange">
全选
</u-checkbox>
</u-checkbox-group>
@@ -326,13 +326,10 @@ export default {
font-weight: 500;
color: rgba(255,49,49,1);
}
/deep/ .u-numberbox {
.u-numberbox {
border: 1rpx solid rgba(217,215,215,1);
border-radius:4px;
.u-icon-minus, .u-icon-plus {
width: 38rpx;
}
.u-number-input {
/deep/ .u-number-input {
margin: 0;
color: #333 !important;
border: 1rpx #D9D7D7 solid {
@@ -341,6 +338,31 @@ export default {
}
}
}
// .num {
// display: flex;
// width: 118rpx;
// height: 39rpx;
// border: 1rpx solid rgba(217,215,215,1);
// border-radius:4px;
// .reduce, .increase {
// flex: 1;
// font-size: 11rpx;
// color: #FF780F;
// line-height: 39rpx;
// text-align: center;
// }
// .value {
// flex: 1;
// font-size: 22rpx;
// color:rgba(51,51,51,1);
// line-height: 39rpx;
// text-align: center;
// border: 1rpx #D9D7D7 solid {
// top: 0px;
// bottom: 0px;
// }
// }
// }
}
}
}

186
pageC/cart/selectInvoice.vue
View File

@@ -1,186 +0,0 @@
<template>
<view class="select-invoice">
<view class="invoice-type">
<view class="title">发票类型</view>
<u-radio-group v-model="type" @change="radioGroupChange" icon-size="0" active-color="#FF780F" size="16">
<u-radio
v-for="(item, index) in list" :key="index"
:name="item.type"
>
{{item.name}}
</u-radio>
</u-radio-group>
</view>
<view class="invoice-list" v-if="currentList.length">
<u-radio-group v-model="invoice" @change="selectInvoice" active-color="#FF780F" icon-size="22" size="30" :wrap="true">
<u-radio
v-for="(item, index) in currentList" :key="index"
:name="item.invoice_id"
>
{{ item.invoice_title }}
</u-radio>
</u-radio-group>
</view>
<view class="invoice-none" v-if="!currentList.length">您当前还未添加抬头发票，<text @click="addInvoice">点击立即添加</text></view>
<view class="btn-group">
<view class="submit" @click="submit">提交申请</view>
<view class="cancel" @click="cancel">不开发票</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
type: 1,
list: [{
type: 1,
name: '个人或事业单位'
}, {
type: 2,
name: '企业'
}],
invoice: '',
invoiceList: [],
currentList: [],
}
},
onShow() {
this.type = 1;
this.getInvoiceList();
},
watch: {
type(value) {
let invoiceList = this.invoiceList.filter(item => item.invoice_type == value);
this.currentList = invoiceList;
}
},
methods: {
getInvoiceList() {
this.$u.api.getInvoiceList().then(res => {
this.invoiceList = res.data;
this.currentList = this.invoiceList.filter(item => item.invoice_type == this.type);
// console.log(this.invoiceList);
})
},
radioGroupChange(e) {
this.type = e;
},
selectInvoice(e) {
this.invoice = e;
},
submit() {
console.log(this.invoice);
if(!this.invoice) {
this.$u.toast('请选择发票');
return false;
}
this.$store.commit('setInvoiceInfo', {
invoice_type: this.type,
invoice_id: this.invoice
});
this.$u.route({ type: 'back' });
},
cancel() {
this.$store.commit('setInvoiceInfo', {
invoice_type: 0
});
this.$u.route({ type: 'back' });
},
addInvoice() {
this.$u.route('/pageE/more/EditInvoice', { action: 1 });
},
}
};
</script>
<style lang="scss" scoped>
.select-invoice {
min-height: calc(100vh - var(--window-top));
background: #ECECEC;
padding-top: 1rpx;
.invoice-type {
height: 98rpx;
background: #FFFFFF;
margin-bottom: 2rpx;
padding: 35rpx 30rpx;
display: flex;
align-items: center;
.title {
font-size: 30rpx;
color: #333333;
width: 120rpx;
margin-right: 50rpx;
}
.u-radio-group {
flex: 1;
/deep/ .u-radio {
.u-radio__icon-wrap {
margin: 0 20rpx;
position: relative;
background-color: #DBDBDB;
&::before {
content: '';
position: absolute;
width: 29rpx;
height: 29rpx;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
border: 1rpx solid #DBDBDB;
border-radius: 50%;
}
}
.u-radio__icon-wrap--checked {
background-color: #FF780F;
&::before {
border-color: #FF780F;
}
}
}
}
}
.invoice-list {
background-color: #FFFFFF;
/deep/ .u-radio-group {
.u-radio {
padding: 30rpx;
height: 80rpx;
line-height: 1 !important;
.u-radio__icon-wrap {
margin-right: 20rpx;
}
}
}
}
.invoice-none {
text-align: center;
margin-top: 70rpx;
font-size: 26rpx;
color: #333333;
> text {
color: #FF780F;
}
}
.btn-group {
margin-top: 250rpx;
> view {
width: 690rpx;
height: 98rpx;
border-radius: 49rpx;
font-size: 36rpx;
margin: 0 auto;
line-height: 98rpx;
text-align: center;
}
.submit {
background: #FF780F;
color: #FFFFFF;
margin-bottom: 20rpx;
}
.cancel {
background: #FFFFFF;
color: #FF780F;
}
}
}
</style>

48
pageC/classify/goods.vue
View File

@@ -1,6 +1,5 @@
<template>
<view class="classify-goods">
<u-search style="padding: 0 30rpx" placeholder="请搜索商品" v-model="keyword" @search="select" @custom="select"></u-search>
<view class="tab-container">
<view class="salenum" :class="{ 'current' : current == 0 }" @click="switchCurrent(0)">销量</view>
<view class="price" :class="{ 'current' : current == 1 }" @click="switchCurrent(1)">
@@ -17,13 +16,7 @@
<image :src="goods.goods_image"></image>
<view class="right">
<view class="name u-line-1">{{ goods.goods_name }}</view>
<view class="briefing u-line-1">{{ goods.goods_advword }}</view>
<!-- <view class="price">￥{{ goods.goods_price }}</view> -->
<view class="price">
<view class="type-tag" v-show="goods.goods_type != 1">{{ goods.goods_type == 2 ? "秒杀" : "拼团" }}</view>
<view class="present">￥{{ goods.goods_price }}</view>
<view class="origin">￥{{ goods.goods_marketprice }}</view>
</view>
<view class="briefing u-line-2">{{ goods.goods_advword }}</view>
</view>
</view>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
@@ -44,8 +37,6 @@ export default {
scrollHeight: '',
loadStatus: 'loadmore',
timer: true, // 防止上拉加载短时间内多次调用
keyword:"",
sel:""
}
},
watch: {
@@ -84,7 +75,6 @@ export default {
gc_id: this.cid,
page: this.page,
order: sort,
keyword:this.sel
})
this.timer = true;
if(res.errCode == 0) {
@@ -128,11 +118,6 @@ export default {
id: id,
type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
});
},
select(){
this.sel = this.keyword;
this.page = 1;
this.goodsListByClassId({ laod: 'reload' });
}
}
};
@@ -191,42 +176,15 @@ export default {
}
.right {
width: 418rpx;
height: 200rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
.name {
font-size: 30rpx;
color: rgba(51,51,51,1);
margin-bottom: 20rpx;
}
.briefing {
font-size: 28rpx;
color: rgba(102,102,102,1);
}
// .price {
// font-size: 26rpx;
// color: rgba(255,49,49,1);
// }
.price {
display: flex;
align-items: center;
.type-tag {
padding: 4rpx 10rpx;
color: #fff;
font-size: 22rpx;
border-radius: 10rpx;
background-color: #FF7810;
}
.present {
font-size: 26rpx;
color: rgba(255,49,49,1);
margin-right: 20rpx;
}
.origin {
text-decoration: line-through;
font-size: 24rpx;
color: #999;
}
line-height: 42rpx;
}
}
}

38
pageC/components/merchant/list-item.vue
View File

@@ -1,10 +1,6 @@
<template>
<view class="listItem">
<view v-if="type == '2'" class="video-container">
<image :src="url" mode="aspectFill" class="video"></image>
<view class="backs"></view>
<image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
</view>
<video v-if="type == '2'" :src="url" :show-fullscreen-btn="true"></video>
<image v-else :src="url" mode="aspectFill"></image>
</view>
</template>
@@ -13,39 +9,11 @@
width: 365rpx;
height: 500rpx;
overflow: hidden;
> image {
>image,video{
width: 100%;
height: 100%;
margin-bottom: 20rpx;
}
.video-container {
width: 100%;
height: 100%;
margin-bottom: 20rpx;
position: relative;
.video {
width: 100%;
height: 100%;
}
.backs {
width: 100%;
height: 100%;
position: absolute;
top: 0;
right: 0;
background-color: rgba($color: #000000, $alpha: 0.35);
z-index: 9;
}
.play-video {
position: absolute;
width: 100rpx;
height: 100rpx;
z-index: 19;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}
}
</style>
<script>
@@ -56,6 +24,6 @@ export default {
}
},
props:['url','type'],
props:['url','type']
}
</script>

29
pageC/components/merchant/video-top.vue
View File

@@ -1,8 +1,6 @@
<template>
<view class="videoTop">
<image :src="url" mode="aspectFill" class="video"></image>
<view class="backs"></view>
<image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
<video :src="url" :show-fullscreen-btn="true"></video>
</view>
</template>
<style lang="scss" scoped>
@@ -10,31 +8,10 @@
width: 100%;
height: 284rpx;
margin-bottom: 20rpx;
position: relative;
.video{
position: absolute;
>video{
width: 100%;
height: 100%;
z-index: 9;
}
.backs {
width: 100%;
height: 100%;
position: absolute;
top: 0;
right: 0;
background-color: rgba(0, 0, 0, 0.35);
z-index: 9;
}
.play-video {
position: absolute;
width: 100rpx;
height: 100rpx;
z-index: 19;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}
</style>
<script>
@@ -44,6 +21,6 @@ export default {
return {
}
},
props:['url'],
props:['url']
}
</script>

10
pageC/groupBuy/index.vue
View File

@@ -6,12 +6,12 @@
</view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-item" v-for="(_, index) in tabList" :key="index">
<scroll-view scroll-y style="width: 100%;height: 100%;" @scrolltolower="onreachBottom">
<scroll-view scroll-y style="width: 100%;" @scrolltolower="onreachBottom">
<view v-if="pinTuanList[index]">
<SpecialGoods v-for="(item, index) in pinTuanList[index]" :key="index" :item="item" type='group'></SpecialGoods>
</view>
<u-empty text="暂无商品" mode="list" color="#000" margin-top="120" v-if="!pinTuanList[index] || !pinTuanList[index].length"></u-empty>
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="pinTuanList[index]" @loadmore="onreachBottom"></u-loadmore>
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="!pinTuanList[index] || pinTuanList[index].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
<u-empty text="暂无商品" mode="list" color="#000" v-if="!pinTuanList[index] || !pinTuanList[index].length"></u-empty>
</scroll-view>
</swiper-item>
</swiper>
@@ -22,6 +22,7 @@ import SpecialGoods from "../../components/shop/special-shop/index";
export default {
data() {
return {
pageSize: 12,
tabList: [],
current: -1,
swiperCurrent: 0,
@@ -41,7 +42,6 @@ export default {
},
watch: {
current(index) {
this.page = 0;
this.getPinTuanList({ id: this.tabList[index].gc_id, load: 'reload' });
}
},
@@ -56,7 +56,7 @@ export default {
})
},
// 拼团列表
async getPinTuanList({ id, load }) {
async getPinTuanList({ id, page, load }) {
const res = await this.$u.api.getPinTuanList({
page: this.page,
gc_id: id,

8
pageC/merchant/classifyGoods.vue
View File

@@ -14,7 +14,7 @@
</view>
<scroll-view scroll-y class="scroll-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
<view class="goods-container">
<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-view">
<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-view" @click="toDetailsPage(goods.goods_id)">
<goodsItem :info="goods"></goodsItem>
</view>
</view>
@@ -128,6 +128,12 @@ export default {
this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
// console.log(this.scrollHeight);
},
toDetailsPage(id) {
this.$u.route('/pageB/sdetails/index', {
id: id,
type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
});
},
setTitle(title){
uni.setNavigationBarTitle({
title: title

13
pageC/merchant/details.vue
View File

@@ -25,7 +25,7 @@
<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
</view>
<view class="image-list" v-if="info.business_licence_number_electronic">
<image :src="info.business_licence_number_electronic" @click="previewImage(info.business_licence_number_electronic)"></image>
<image :src="info.business_licence_number_electronic"></image>
</view>
</view>
</view>
@@ -42,15 +42,6 @@ export default {
// console.log(res)
this.info = res.data
})
},
methods: {
previewImage(urls) {
// console.log(urls);
const imageList = [urls];
uni.previewImage({
urls: imageList,
});
},
}
};
</script>
@@ -68,6 +59,7 @@ export default {
height: 140rpx;
border-radius: 70rpx;
margin-bottom: 29rpx;
background-color: aqua;
}
.name {
font-size: 28rpx;
@@ -132,6 +124,7 @@ export default {
width: 239rpx;
height: 170rpx;
flex-shrink: 0;
background-color: aqua;
}
}
}

18
pageC/merchant/goods.vue
View File

@@ -14,11 +14,11 @@
</view>
<scroll-view scroll-y class="scroll-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
<view class="goods-container">
<view v-for="(goods, index) in goodsList" :key="index" class="goods-view">
<view v-for="(goods, index) in goodsList" :key="index" class="goods-view" @click="toDetailsPage(goods.goods_id)">
<goodsItem :info="goods"></goodsItem>
</view>
</view>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-bottom="120" v-if="goodsList.length >= pageSize"></u-loadmore>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
<u-empty mode="list" v-if="!goodsList.length"></u-empty>
</scroll-view>
</view>
@@ -28,7 +28,7 @@ import goodsItem from "@/components/shop/list/item"
export default {
data() {
return {
pageSize: 5,
pageSize: 15,
cid: '',
page: 1,
current: 0,
@@ -83,7 +83,7 @@ export default {
page: this.page,
order: sort,
})
// this.timer = true;
this.timer = true;
if(res.errCode == 0) {
this.pageSize = res.data.per_page;
if(load == 'reload') this.goodsList = res.data.data;
@@ -92,8 +92,8 @@ export default {
return res.data.data.length;
},
loadMore() {
// if(this.goodsList.length < this.pageSize) return false;
// if(!this.timer) return false;
if(this.goodsList.length < this.pageSize) return false;
if(!this.timer) return false;
this.loadStatus = "loading";
this.page++;
this.getStoreGoodsList({ load: 'loadmore' }).then(length => {
@@ -118,6 +118,12 @@ export default {
this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * otherHeight + 'px';
// console.log(this.scrollHeight);
},
toDetailsPage(id) {
this.$u.route('/pageB/sdetails/index', {
id: id,
type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
});
}
}
};
</script>

211
pageC/merchant/index.vue
View File

@@ -14,18 +14,15 @@
<view>我的</view>
</view>
</view> -->
<view class="top" :style="{'background':'url(' + info.store_banner + ') 100% 100% no-repeat' }">
<view class="mantle"></view>
<view class="main-container" :style="{ 'padding-top': paddingTop }">
<image :src="info.store_avatar"></image>
<view class="info">
<view class="name u-line-1">{{info.store_name}}</view>
<view class="num">粉丝数：{{info.store_collect}}</view>
</view>
<view class="btn" @click="attentionMember">
<image :src="info.is_attention == 0 ? '/static/image/shop/14.png' : '/static/image/shop/8.png'"></image>
<view>{{ info.is_attention == 0 ? "关注" : "已关注" }}</view>
</view>
<view class="top" :style="{'background-image':'url(' + info.store_banner + ')'}">
<image :src="info.store_avatar"></image>
<view class="info">
<view class="name u-line-1">{{info.store_name}}</view>
<view class="num">粉丝数：{{info.store_collect}}</view>
</view>
<view class="btn" @click="attentionMember">
<image src="/static/image/shop/8.png"></image>
<view>{{ info.is_attention == 0 ? "关注" : "已关注" }}</view>
</view>
</view>
<view class="follow" v-if="info.attention_member && info.attention_member.length">
@@ -42,18 +39,18 @@
<view class="main">
<scroll-view class="video-image" scroll-y v-if="cur==0 && indextop.length" :style="{ height: scrollHeiht }">
<view v-for="item in indextop" :key="item.id" class="container-top">
<videoTop :url="item.article_pic" v-if="item.type == 2" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></videoTop>
<imageTop v-else :url="item.article_pic" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></imageTop>
<videoTop :url="item.article_pic" v-if="item.type == 2" @click.native="toDetailsPage(item.article_id)"></videoTop>
<imageTop v-else :url="item.article_pic" @click.native="toDetailsPage(item.article_id)"></imageTop>
</view>
<view v-if="indexlist.length" class="container-bottom">
<listitem v-for="item in indexlist" :key="item.article_id" :type="item.type" :url="item.article_pic" class="bottom-item" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></listitem>
<listitem v-for="item in indexlist" :key="item.id" :type="item.type" :url="item.article_pic" class="bottom-item" @click.native="toDetailsPage(item.article_id)"></listitem>
</view>
</scroll-view>
<view class="item" v-if="cur==1">
<goods :sid="sid"></goods>
</view>
</view>
<view class="tabbar" :style="safeareaStyle">
<view class="tabbar">
<view @click="switchCurrent(0)">
<image src="/static/image/shop/9.png"></image>
<view>商品分类</view>
@@ -91,10 +88,8 @@ export default {
indexlist: [],
indextop: [],
info: {},
page: 1,
page: 0,
scrollHeiht: '',
paddingTop: 0,
safeareaStyle: "", // 苹果底部
}
},
components:{
@@ -109,31 +104,10 @@ export default {
// this.getStoreImgVideoList();
},
onNavigationBarButtonTap(e) {
console.log(e.index);
if(e.index == 0) this.$u.route('/pageC/cart/index');
// console.log(e.index);
if(e.index == 1) this.$u.route('/pageC/cart/index');
// if(e.index == 0) this.show = true;
},
onNavigationBarSearchInputClicked() {
this.$u.route('pageB/search/index', {
type: 1,
id:this.sid
});
},
onLoad(option){
this.sid = option.id;
// console.log(this.sid);
this.getStoreInfo();
this.getArticlelist();
this.setViewHeight();
// this.getStoreImgVideoList();
// #ifdef APP-PLUS
this.device = uni.getSystemInfoSync(); // 获取信息
console.log(this.device.safeArea);
// #endif
},
onShow() {
this.cur = 0;
},
methods: {
customers(){
console.log(this.$store.state.hasLogin)
@@ -153,12 +127,12 @@ export default {
this.time = time;
this.date = date
}
// console.log(123)
console.log(123)
this.$u.api.getAtwillUserInfo({
id:this.sid
}).then((res)=>{
console.log(res)
let user = new Friend(res.data.member_id,res.data.store_name,res.data.member_avatar)
let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
this.$u.route({
url:"/pageD/privateChat/privateChat",
params:{
@@ -172,10 +146,11 @@ export default {
}
},
toDetailsPage({ id, type }) {
toDetailsPage(id) {
// console.log(11);
let src = type == 1 ? 'pageB/photo/index' : 'pageB/video/video';
this.$u.route(src, {　id: id　});
this.$u.route('pageB/photo/index', {
id: id
});
},
switchCurrent(current) {
this.cur = current;
@@ -186,9 +161,7 @@ export default {
}
},
getStoreInfo() {
// console.log(this.sid )
this.$u.api.getStoreInfo({ id: this.sid }).then((res)=>{
// console.log(JSON.stringify(res))
this.info = res.data;
uni.stopPullDownRefresh();
})
@@ -218,17 +191,15 @@ export default {
}).then(res => {
uni.stopPullDownRefresh();
if (res.errCode == 0) {
let articleList = res.data.list;
// articleList.unshift({}, {}, {}, {});
// articleList.push({}, {});
// this.articleList = res.data.list;
if(JSON.stringify(res.data) != '[]') {
if(articleList.length > 0) {
this.indextop = [articleList[0]]
if(res.data.list.length > 0) {
this.indextop = [res.data.list[0]]
// this.indextop = [res.data.list[0], res.data.list[1]];
}
if(articleList.length > 1) {
this.indextop.push(articleList[1]);
this.indexlist.push(...articleList.slice(2,));
if(res.data.list.length > 1) {
this.indextop.push(res.data.list[1]);
this.indexlist.push(...res.data.list.slice(2,));
}
}
}
@@ -236,26 +207,24 @@ export default {
},
setViewHeight() {
const res = uni.getSystemInfoSync();
this.scrollHeiht = res.windowHeight - res.windowWidth / 750 * (350 + 140 + 20) + 'px';
this.paddingTop = res.windowWidth / 750 * (90 + 50) + 'px';
// console.log(this.paddingTop);
this.scrollHeiht = res.windowHeight - (73 + 20 + 170) + 'px';
}
},
onLoad(option){
this.sid = option.id;
// console.log(this.sid);
this.getStoreInfo();
this.getArticlelist();
this.setViewHeight();
// this.getStoreImgVideoList();
}
};
</script>
<style lang="scss" scoped>
/*坑：解决iphoneX等大屏手机底部小黑条挡住tab的解决方法：安全区域距离底部边界距离env() 跟 constant() 需要同时存在，而且顺序不能换。*/
/* #ifdef H5 */
body {
padding-bottom: constant(safe-area-inset-bottom);/* 兼容 iOS < 11.2 */
padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS >= 11.2 */
}
/* #endif */
.merchant {
// min-height: 100vh;
background-color: #ECECEC;
padding-top: calc(350rpx - var(--window-top));
overflow: hidden;
.top {
position: fixed;
top: 0;
@@ -263,72 +232,52 @@ body {
z-index: 9;
width: 750rpx;
height: 350rpx;
// background-color: #999999;
.mantle {
width: 750rpx;
height: 350rpx;
position: absolute;
top: 0;
left: 0;
z-index: 10;
background-color: #999999;
opacity: 0.7;
background-color: #999999;
display: flex;
align-items: center;
padding: 168rpx 60rpx 0 30rpx;
> image {
margin-right: 40rpx;
width: 140rpx;
height: 140rpx;
border-radius: 50%;
background-color: aqua;
}
.main-container {
.info {
width: 220rpx;
color: rgba(255,255,255,1);
.name {
margin-bottom: 30rpx;
font-size: 28rpx;
font-weight: 500;
}
.num {
font-size: 24rpx;
}
}
.btn {
margin-left: auto;
width: 162rpx;
height: 60rpx;
border: 2rpx solid rgba(255,255,255,1);
border-radius: 30rpx;
display: flex;
align-items: center;
// padding-top: calc(var(--status-bar-height) + 54);
padding: 0 60rpx 0 30rpx;
position: absolute;
top: 0;
left: 0;
z-index: 19;
width: 750rpx;
height: 350rpx;
justify-content: center;
> image {
margin-right: 40rpx;
width: 140rpx;
height: 140rpx;
border-radius: 50%;
// background-color: aqua;
width: 28rpx;
height: 28rpx;
flex-shrink: 0;
margin-right: 14rpx;
}
.info {
width: 220rpx;
> view {
white-space: nowrap;
font-size: 26rpx;
color: rgba(255,255,255,1);
.name {
margin-bottom: 30rpx;
font-size: 28rpx;
font-weight: 500;
}
.num {
font-size: 24rpx;
}
}
.btn {
margin-left: auto;
width: 162rpx;
height: 60rpx;
border: 2rpx solid rgba(255,255,255,1);
border-radius: 30rpx;
display: flex;
align-items: center;
justify-content: center;
> image {
width: 28rpx;
height: 28rpx;
flex-shrink: 0;
margin-right: 14rpx;
}
> view {
white-space: nowrap;
font-size: 26rpx;
color: rgba(255,255,255,1);
}
}
}
}
.follow {
height: 140rpx;
background-color: #ffffff;
width: 100%;
margin-bottom: 20rpx;
@@ -363,14 +312,14 @@ body {
margin-right: 35rpx;
}
text-align: center;
width: 96rpx;
width: 90rpx;
> image {
width: 60rpx;
height: 60rpx;
border-radius: 50%;
flex-shrink: 0;
margin-bottom: 20rpx;
// background-color: aqua;
background-color: aqua;
}
.nickname {
font-size: 22rpx;
@@ -382,8 +331,7 @@ body {
}
.main{
.video-image {
box-sizing: border-box;
padding-bottom: 100rpx;
padding-bottom: 98rpx;
}
.container-top {
> view {
@@ -399,18 +347,21 @@ body {
margin-bottom: 10rpx;
}
}
// > view {
// margin-top: 20rpx;
// }
}
.tabbar {
border-top: 1rpx #DBDADA solid;
width: 100%;
height: 98rpx;
background: rgba(251,251,251,1);
display: flex;
padding: 10rpx 55rpx;
position: fixed;
bottom: 0;
left: 0;
z-index: 9;
padding: 10rpx 55rpx;
padding-bottom: env(safe-area-inset-bottom);
> view {
flex: 1;
text-align: center;

2
pageC/merchant/storeClassify.vue
View File

@@ -12,7 +12,7 @@
<view v-for="classifyA in classifyList" :key="classifyA.gc_parent_id" class="classify-view">
<view class="title">{{ classifyA.gc_parent_name }}</view>
<view class="classifyA-view">
<view v-for="classifyB in classifyA.gc_child" :key="classifyB.gc_id" class="classifyB-item u-line-1" @click="viewGoods({ type: classifyB.gc_id, name: classifyB.gc_name })">{{ classifyB.gc_name }}</view>
<view v-for="classifyB in classifyA.gc_child" :key="classifyB.gc_id" class="classifyB-item u-line-1" @click="viewGoods({ type: classifyB.gc_parent_id, name: classifyB.gc_parent_name })">{{ classifyB.gc_parent_name }}</view>
</view>
</view>
</view>

72
pageC/spike/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<scroll-view class="spike" scroll-y @scrolltolower="onreachBottom">
<view class="spike">
<view class="title">
<view class="name">全部秒杀</view>
<view class="name">全部秒杀</view>
<view class="time">
<text class="num">{{ seckillTime.littleHour || '00' }}</text>
<text class="mah">:</text>
@@ -19,61 +19,36 @@
<view class="spike-list">
<SpecialGoods v-for="(item, index) in spikeList" :key="index" :item="item" type='spike'></SpecialGoods>
<u-empty mode="list" v-if="!spikeList.length" :margin-top="240"></u-empty>
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="onreachBottom"></u-loadmore>
</view>
</scroll-view>
</view>
</template>
<script>
import SpecialGoods from "@/components/shop/special-shop/index"
import SpecialGoods from "../../components/shop/special-shop/index"
export default {
data() {
return {
spikeList: [],
page: 0,
seckillTime: {},
timer: true, // 限制下拉刷新
loadStatus: 'loadmore',
seckillTime: {}
}
},
components: {
SpecialGoods
},
onShow() {
this.getSpikeList({ load: "reload" });
this.getSpikeList();
},
methods: {
// 全部秒杀
async getSpikeList({ load }) {
const res = await this.$u.api.getSpikeList({
page: this.page,
})
this.timer = true;
if (res.errCode == 0) {
this.seckillTime = {
bigHour: res.data.bigHour,
littleHour: res.data.littleHour,
getSpikeList() {
this.$u.api.getSpikeList({ page: this.page }).then(res => {
if(res.errCode == 0) {
this.spikeList = res.data.list;
this.seckillTime = {
bigHour: res.data.bigHour,
littleHour: res.data.littleHour,
}
}
if(load == 'reload') this.spikeList = res.data.list;
else if(load == 'loadmore') this.spikeList.push(...res.data.list);
}
this.$forceUpdate();
return res.data.list.length;
},
onreachBottom() {
if(!this.timer) return false;
this.loadStatus = "loading";
this.page++;
this.getSpikeList({ load: "loadmore" }).then(length => {
// console.log(length);
if(length == 0) {
this.page--;
this.loadStatus = 'nomore';
} else {
this.loadStatus = 'loadmore';
}
}).catch(() => {
this.loadStatus = "nomore";
this.page--;
})
},
}
@@ -81,10 +56,9 @@ export default {
</script>
<style lang="scss" scoped>
.spike{
height: calc(100vh - var(--window-top));
min-height: calc(100vh - var(--window-top));
padding: 30rpx;
border-top: 1rpx solid rgba(236,236,236,1);
box-sizing: border-box;
.title{
margin-bottom: 30rpx;
display: flex;
@@ -98,22 +72,14 @@ export default {
display: flex;
align-items: center;
font-size: 20rpx;
> text {
text-align: center;
line-height: 26rpx;
}
.num{
// box-sizing: content-box;
width: 26rpx;
// height: 25rpx;
background-color: #000;
color: #ffffff;
box-sizing: content-box;
width: 25rpx;
height: 25rpx;
background-color: #bfbfbf;
margin: 0 10rpx;
padding: 2rpx;
}
.mah {
color: #999999;
}
}
}
}

31
pageD/activity/activity.vue
View File

@@ -1,5 +1,5 @@
<template>
<view id="actives" :style="{height : height + 'px'}">
<view id="actives">
<!-- 活动消息推送 -->
<block v-for="(item, index) in actives" :key="index">
<view class="time">{{ item.addtime }}</view>
@@ -7,7 +7,7 @@
<view class="content">
<view class="title">{{item.title}}</view>
<view class="images_about">
<image :src="item.picture" mode="aspectFill"></image>
<image :src="item.goods_image" mode="aspectFill"></image>
<view>
<text class="u-line-2">{{item.summary}}</text>
</view>
@@ -15,7 +15,6 @@
</view>
</view>
</block>
<u-loadmore :status="loadStatus" bg-color="#ECECEC" margin-top="20" v-if="loadStatus=='nomore'" />
</view>
</template>
@@ -23,20 +22,13 @@
export default {
data() {
return {
height:'600',
actives: [],
loadStatus: 'loadmore'
actives: [
]
};
},
onLoad(){
var _that = this
_that.messageactivityList();
uni.getSystemInfo({
success: function (res) {
console.log(res.windowHeight);
_that.height = res.windowHeight
}
});
this.messageactivityList()
},
methods: {
titletext(){
@@ -45,9 +37,7 @@
messageactivityList(){
this.$u.api.messageactivityList({}).then((res)=>{
if (res.errCode == 0) {
this.actives = res.data;
// 目前没有分页,只无数据提示用,他们建议这样做
if(!this.actives.length) this.loadStatus = 'nomore';
this.actives = res.data;
}
})
}
@@ -57,7 +47,7 @@
};
</script>
<style lang="scss">
<style lang="scss" scoped>
page {
background-color: #ECECEC;
}
@@ -65,7 +55,7 @@
height: 100%;
}
#actives{
background: #ECECEC;
height: 100%;
.time {
padding: 30rpx 0;
color: #666;
@@ -83,7 +73,7 @@
padding: 39rpx 0 30rpx;
}
.content{
width:94%;
width:630rpx;
padding: 30rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
@@ -107,7 +97,6 @@
justify-content: center;
width: 100%;
height: 140rpx;
line-height: 36rpx;
padding: 20rpx;
background: rgba(241,241,241,1);
& > text {

50
pageD/attention/attention.vue
View File

@@ -1,18 +1,15 @@
<template>
<view class="attention">
<view class="attention_box" v-for="(item,index) in attention" :key="index" @click="navto(item.friend_tomid)">
<view style="position:relative">
<view>
<image :src="item.friend_tomavatar" mode="aspectFill"></image>
<view class="tishi" v-if="item.unread_message"></view>
</view>
<view>{{item.friend_tomnickname}}</view>
<view>{{item.friend_tomname}}</view>
<view>{{item.live_status ? '正在直播' : '未直播'}}</view>
<view class="cur_two" @click="tapClick(index)">已关注</view>
<!-- <view class="cur" @click="tapClick(index)" v-else = "item.about == 2">未关注</view> -->
<view class="cur_two" @click="tapClick(index)" v-if = "item.about == 1">已关注</view>
<view class="cur" @click="tapClick(index)" v-else = "item.about == 2">未关注</view>
</view>
<u-loadmore :status="status" icon-type="iconType"/>
</view>
</template>
<script>
@@ -22,27 +19,12 @@
return {
rSelect:[],
type : '未关注',
attention: [],
page:1,
status:'loadmore'
attention: []
};
},
onReachBottom(){
if(this.status == 'loading' || this.status == 'nomore'){
return ;
}else{
this.status = "loading"
this.page++
this.snsfriendList()
}
},
onLoad(){
this.snsfriendList()
},
onShow(){
this.page = 1;
this.snsfriendList();
},
methods: {
// 点击切换颜色
tapClick(index) {
@@ -55,17 +37,8 @@
}
},
snsfriendList(){
this.$u.api.snsfriendList({page:this.page}).then((res)=>{
console.log(res)
if(this.page > 1){
this.attention.push(...res.data.data)
}else{
this.attention = res.data.data;
}
this.status = "loadmore"
if(res.data.data.length < parseInt(res.data.per_page)){
this.status = "nomore"
}
this.$u.api.snsfriendList({}).then((res)=>{
this.attention = res.data;
})
},
navto(id){
@@ -85,15 +58,6 @@
</script>
<style lang="scss" scoped>
.tishi{
position: absolute;
top: 5rpx;
left: 80rpx;
background-color: #ff5d00;
width: 12rpx;
height: 12rpx;
border-radius: 50%;
}
.attention {
display: flex;
flex-wrap: wrap;

544
pageD/chat/chat.vue Normal file
View File

@@ -0,0 +1,544 @@
<template>
<view class="content">
<view class="content-box" @touchstart="touchstart" id="content-box" :class="{'content-showfn':showFunBtn}">
<!-- 背景图- 定位方式 -->
<image class="content-box-bg" :src="_user_info.chatBgImg" :style="{ height: imgHeight }"></image>
<view class="content-box-loading" v-if="!loading"><u-loading mode="flower"></u-loading></view>
<view class="message" v-for="(item, index) in messageList" :key="index" :id="`msg-${item.hasBeenSentId}`">
<view class="message-item " :class="item.isItMe ? 'right' : 'left'">
<image class="img" :src="item.fromUserHeadImg" mode="" @tap="linkToBusinessCard(item.fromUserId)"></image>
<!-- contentType = 1 文本 -->
<view class="content" v-if="item.contentType == 1">{{ item.content }}</view>
<!-- contentType = 2 语音 -->
<view
class="content contentType2"
:class="[{ 'content-type-right': item.isItMe }]"
v-if="item.contentType == 2"
@tap="handleAudio(item)"
hover-class="contentType2-hover-class"
:style="{width:`${130+(item.contentDuration*2)}rpx`}"
>
<view
class="voice_icon"
:class="[
{ voice_icon_right: item.isItMe },
{ voice_icon_left: !item.isItMe },
{ voice_icon_right_an: item.anmitionPlay && item.isItMe },
{ voice_icon_left_an: item.anmitionPlay && !item.isItMe }
]"
></view>
<view class="">{{ item.contentDuration }}''</view>
</view>
<!-- contentType = 3 图片 -->
<view
class="content contentType3"
v-if="item.contentType == 3"
@tap="viewImg([item.content])"
>
<image :src="item.content" class="img" mode="widthFix"></image>
</view>
</view>
</view>
</view>
<!-- 底部聊天输入框 -->
<view class="input-box" :class="{ 'input-box-mpInputMargin': mpInputMargin }">
<view class="input-box-flex">
<!-- #ifndef H5 -->
<image v-if="chatType === 'voice'" class="icon_img" :src="require('@/static/pageD/voice.png')" @click="switchChatType('keyboard')"></image>
<image v-if="chatType === 'keyboard'" class="icon_img" :src="require('@/static/pageD/keyboard.png')" @click="switchChatType('voice')"></image>
<!-- #endif -->
<view class="input-box-flex-grow">
<input
v-if="chatType === 'voice'"
type="text"
class="content"
id="input"
v-model="formData.content"
:hold-keyboard="true"
:confirm-type="'send'"
:confirm-hold="true"
placeholder-style="color:#DDDDDD;"
:cursor-spacing="10"
@confirm="sendMsg(null)"
/>
<view
class="voice_title"
v-if="chatType === 'keyboard'"
:style="{ background: recording ? '#c7c6c6' : '#FFFFFF' }"
@touchstart.stop.prevent="startVoice"
@touchmove.stop.prevent="moveVoice"
@touchend.stop="endVoice"
@touchcancel.stop="cancelVoice"
>
{{ voiceTitle }}
</view>
</view>
<!-- 功能性按钮 -->
<image class=" icon_btn_add" :src="require('@/static/pageD/add.png')" @tap="switchFun"></image>
<!-- #ifdef H5 -->
<button class="btn" type="primary" size="mini" @touchend.prevent="sendMsg(null)">发送</button>
<!-- #endif -->
</view>
<view class="fun-box" :class="{'show-fun-box':showFunBtn}">
<u-grid :col="4" hover-class="contentType2-hover-class" :border="false" @click="clickGrid">
<u-grid-item v-for="(item, index) in funList" :index="index" :key="index" bg-color="#eaeaea">
<u-icon :name="item.icon" :size="52"></u-icon>
<view class="grid-text">{{ item.title }}</view>
</u-grid-item>
</u-grid>
</view>
</view>
<!-- //语音动画 -->
<view class="voice_an" v-if="recording">
<view class="voice_an_icon">
<view id="one" class="wave"></view>
<view id="two" class="wave"></view>
<view id="three" class="wave"></view>
<view id="four" class="wave"></view>
<view id="five" class="wave"></view>
<view id="six" class="wave"></view>
<view id="seven" class="wave"></view>
</view>
<view class="text">{{voiceIconText}}</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
fromUserInfo: {},
formData: {
content: '',
limit: 15,
index: 1
},
messageList: [],
loading: true, //标识是否正在获取数据
imgHeight: '1000px',
mpInputMargin: false, //适配微信小程序 底部输入框高度被顶起的问题
chatType:"voice", // 图标类型 'voice'语音 'keyboard'键盘
voiceTitle: '按住 说话',
Recorder: uni.getRecorderManager(),
Audio: uni.createInnerAudioContext(),
recording: false, //标识是否正在录音
isStopVoice: false, //加锁 防止点击过快引起的当录音正在准备(还没有开始录音)的时候,却调用了stop方法但并不能阻止录音的问题
voiceInterval:null,
voiceTime:0, //总共录音时长
canSend:true, //是否可以发送
PointY:0, //坐标位置
voiceIconText:"正在录音...",
showFunBtn:false, //是否展示功能型按钮
AudioExam:null, //正在播放音频的实例
funList: [
{ icon:"photo-fill",title:"照片",uploadType:["album"] },
{ icon:"camera-fill",title:"拍摄",uploadType:["camera"] },
],
};
},
methods: {
//拼接消息 处理滚动
async joinData() {
if (!this.loading) {
//如果没有获取数据 即loading为false时，return 避免用户重复上拉触发加载
return;
}
this.loading = false;
const data = await this.getMessageData();
//获取节点信息
const { index } = this.formData;
const sel = `#msg-${index > 1 ? this.messageList[0].hasBeenSentId : data[data.length - 1].hasBeenSentId}`;
this.messageList = [...data, ...this.messageList];
//填充数据后，视图会自动滚动到最上面一层然后瞬间再跳回bindScroll的指定位置 ---体验不是很好，后期优化
this.$nextTick(() => {
this.bindScroll(sel);
//如果还有数据
if (this.formData.limit >= data.length) {
this.formData.index++;
setTimeout(() => {
this.loading = true;
}, 200);
}
});
},
//处理滚动
bindScroll(sel, duration = 0) {
const query = uni.createSelectorQuery().in(this);
query
.select(sel)
.boundingClientRect(data => {
uni.pageScrollTo({
scrollTop: data && data.top - 40,
duration
});
})
.exec();
},
//获取消息
getMessageData() {
let getData = () => {
let arr = [];
let startIndex = (this.formData.index - 1) * this.formData.limit;
let endIndex = startIndex + this.formData.limit;
for (let i = startIndex; i < endIndex; i++) {
const isItMe = Math.random() > 0.5 ? true : false;
arr.unshift({
hasBeenSentId: i, //已发送过去消息的id
content: `很高兴认识你，这是第${i + 1}条消息。`,
fromUserHeadImg: isItMe ? this._user_info.headImg : this.fromUserInfo.fromUserHeadImg, //用户头像
fromUserId: isItMe ? this._user_info.id : this.fromUserInfo.fromUserId,
isItMe, //true此条信息是我发送的 false别人发送的
createTime: Date.now(),
contentType: 1, // 1文字文本 2语音
anmitionPlay: false //标识音频是否在播放
});
}
return arr;
};
return new Promise((resolve, reject) => {
const data = getData();
setTimeout(() => {
resolve(data);
}, 500);
});
},
//切换语音或者键盘方式
switchChatType(type) {
this.chatType = type;
this.showFunBtn =false;
},
//切换功能性按钮
switchFun(){
this.chatType = 'keyboard'
this.showFunBtn = !this.showFunBtn;
uni.hideKeyboard()
},
//发送消息
sendMsg(data) {
const params = {
hasBeenSentId: Date.now(), //已发送过去消息的id
content: this.formData.content,
fromUserHeadImg: this._user_info.headImg, //用户头像
fromUserId: this._user_info.id,
isItMe: true, //true此条信息是我发送的 false别人发送的
createTime: Date.now(),
contentType: 1
};
if (data) {
if(data.contentType == 2){
//说明是发送语音
params.content = data.content;
params.contentType = data.contentType;
params.contentDuration = data.contentDuration;
params.anmitionPlay = false;
}else if(data.contentType == 3){
//发送图片
params.content = data.content;
params.contentType = data.contentType;
}
} else if (!this.$u.trim(this.formData.content)) {
//验证输入框书否为空字符传
return;
}
this.messageList.push(params);
this.$nextTick(() => {
this.formData.content = '';
// #ifdef MP-WEIXIN
if(params.contentType == 1){
uni.pageScrollTo({
scrollTop: 99999,
duration: 0, //小程序如果有滚动效果 input的焦点也会随着页面滚动...
});
}else{
setTimeout(()=>{
uni.pageScrollTo({
scrollTop: 99999,
duration: 0, //小程序如果有滚动效果 input的焦点也会随着页面滚动...
});
},150)
}
// #endif
// #ifndef MP-WEIXIN
uni.pageScrollTo({
scrollTop: 99999,
duration: 100
});
// #endif
if(this.showFunBtn){
this.showFunBtn = false;
}
// #ifdef MP-WEIXIN
if (params.contentType == 1) {
this.mpInputMargin = true;
}
// #endif
//h5浏览器并没有很好的办法控制键盘一直处于唤起状态 而且会有样式性的问题
// #ifdef H5
uni.hideKeyboard();
// #endif
});
},
//用户触摸屏幕的时候隐藏键盘
touchstart() {
uni.hideKeyboard();
},
// userid 用户id
linkToBusinessCard(userId) {
this.$u.route({
url: 'pages/businessCard/businessCard',
params: {
userId
}
});
},
//准备开始录音
startVoice(e) {
if(!this.Audio.paused){
//如果音频正在播放 先暂停。
this.stopAudio(this.AudioExam)
}
this.recording = true;
this.isStopVoice = false;
this.canSend = true;
this.voiceIconText = "正在录音..."
this.PointY = e.touches[0].clientY;
this.Recorder.start({
format: 'mp3'
});
},
//录音已经开始
beginVoice(){
if (this.isStopVoice) {
this.Recorder.stop();
return;
}
this.voiceTitle = '松开 结束'
this.voiceInterval = setInterval(()=>{
this.voiceTime ++;
},1000)
},
//move 正在录音中
moveVoice(e){
const PointY = e.touches[0].clientY
const slideY = this.PointY - PointY;
if(slideY > uni.upx2px(120)){
this.canSend = false;
this.voiceIconText = '松开手指 取消发送 '
}else if(slideY > uni.upx2px(60)){
this.canSend = true;
this.voiceIconText = '手指上滑 取消发送 '
}else{
this.voiceIconText = '正在录音... '
}
},
//结束录音
endVoice() {
this.isStopVoice = true; //加锁 确保已经结束录音并不会录制
this.Recorder.stop();
this.voiceTitle = '按住 说话'
},
//录音被打断
cancelVoice(e){
this.voiceTime = 0;
this.voiceTitle = '按住 说话';
this.canSend = false;
this.Recorder.stop();
},
//处理录音文件
handleRecorder({ tempFilePath,duration }) {
let contentDuration;
// #ifdef MP-WEIXIN
this.voiceTime = 0;
if (duration < 600) {
this.voiceIconText="说话时间过短";
setTimeout(()=>{
this.recording = false;
},200)
return;
}
contentDuration = duration/1000;
// #endif
// #ifdef APP-PLUS
contentDuration = this.voiceTime +1;
this.voiceTime = 0;
if(contentDuration <= 0) {
this.voiceIconText="说话时间过短";
setTimeout(()=>{
this.recording = false;
},200)
return;
};
// #endif
this.recording = false;
const params = {
contentType: 2,
content: tempFilePath,
contentDuration: Math.ceil(contentDuration)
};
this.canSend && this.sendMsg(params);
},
//控制播放还是暂停音频文件
handleAudio(item) {
this.AudioExam = item;
this.Audio.paused ? this.playAudio(item) : this.stopAudio(item);
},
//播放音频
playAudio(item) {
this.Audio.src = item.content;
this.Audio.hasBeenSentId = item.hasBeenSentId;
this.Audio.play();
item.anmitionPlay = true;
},
//停止音频
stopAudio(item) {
item.anmitionPlay = false;
this.Audio.src = '';
this.Audio.stop();
},
//关闭动画
closeAnmition() {
const hasBeenSentId = this.Audio.hasBeenSentId;
const item = this.messageList.find(it => it.hasBeenSentId == hasBeenSentId);
item.anmitionPlay = false;
},
//点击宫格时触发
clickGrid(index){
if(index == 0){
this.chooseImage(['album'])
}else if(index == 1){
this.chooseImage(['camera'])
}
},
//发送图片
chooseImage(sourceType){
uni.chooseImage({
sourceType,
sizeType:['compressed'],
success:res=>{
this.showFunBtn = false;
for(let i = 0;i<res.tempFilePaths.length;i++){
const params = {
contentType: 3,
content: res.tempFilePaths[i],
};
this.sendMsg(params)
}
}
})
},
//查看大图
viewImg(imgList){
uni.previewImage({
urls: imgList,
// #ifndef MP-WEIXIN
indicator: 'number'
// #endif
});
},
},
onPageScroll(e) {
if (e.scrollTop < 50) {
this.joinData();
}
},
onNavigationBarButtonTap({ index }) {
if (index == 0) {
//用户详情 设置
} else if (index == 1) {
//返回按钮
this.$u.route({
type: 'switchTab',
url: 'pages/home/home'
});
}
},
//返回按钮事件
onBackPress(e) {
//以下内容对h5不生效
//--所以如果用浏览器自带的返回按钮进行返回的时候页面不会重定向 正在寻找合适的解决方案
this.$u.route({
type: 'switchTab',
url: 'pages/home/home'
});
return true;
},
onLoad(info) {
// { messageId,fromUserName,fromUserHeadImg } = info
const userInfo = this.firendList.filter(item => item.userId == info.fromUserId)[0];
console.log(userInfo)
this.fromUserInfo = {
fromUserName: userInfo.userName,
fromUserHeadImg: userInfo.headImg,
fromUserId: 4,
messageId: 2
};
//录音开始事件
this.Recorder.onStart(e => {
this.beginVoice();
});
//录音结束事件
this.Recorder.onStop(res => {
clearInterval(this.voiceInterval);
this.handleRecorder(res);
});
//音频停止事件
this.Audio.onStop(e => {
this.closeAnmition();
});
//音频播放结束事件
this.Audio.onEnded(e => {
this.closeAnmition();
});
},
onReady() {
//自定义返回按钮 因为原生的返回按钮不可阻止默认事件
// #ifdef H5
const icon = document.getElementsByClassName('uni-page-head-btn')[0];
icon.style.display = 'none';
// #endif
uni.setNavigationBarTitle({
title: this.fromUserInfo.fromUserName
});
this.joinData();
uni.getSystemInfo({
success: res => {
this.imgHeight = res.windowHeight + 'px';
}
});
uni.onKeyboardHeightChange(res => {
if (res.height == 0) {
// #ifdef MP-WEIXIN
this.mpInputMargin = false;
// #endif
}else{
this.showFunBtn = false;
}
});
}
};
</script>
<style lang="scss" scoped>
@import './index.scss'
</style>

354
pageD/chat/index.scss Normal file
View File

@@ -0,0 +1,354 @@
page {
background-color: #f3f3f3;
}
.content {
&-showfn{
padding-bottom: 0rpx;
padding-bottom: calc(420rpx + constant(safe-area-inset-bottom));
padding-bottom: calc(420rpx + env(safe-area-inset-bottom) );
/* #ifdef MP-WEIXIN */
/* #endif */
}
&-box {
width: 100%;
height: auto;
min-height: calc(100vh - env(safe-area-inset-top) - 200rpx);
box-sizing: content-box;
position: relative;
padding-bottom: 120rpx;
/* #ifdef APP-PLUS */
margin-bottom: 0rpx;
margin-bottom: constant(safe-area-inset-bottom);
margin-bottom: env(safe-area-inset-bottom);
/* #endif */
/* #ifdef MP-WEIXIN */
padding-bottom: 0rpx;
padding-bottom: calc(120rpx + constant(safe-area-inset-bottom));
padding-bottom: calc(120rpx + env(safe-area-inset-bottom) );
/* #endif */
&-bg {
width: 100%;
position: fixed;
/* #ifdef MP-WEIXIN */
bottom: 0;
bottom: constant(safe-area-inset-bottom);
bottom: env(safe-area-inset-bottom);
/* #endif */
/* #ifndef MP-WEIXIN */
top: 0;
left: 0;
/* #endif */
}
&-loading {
text-align: center;
padding: 20rpx 0;
}
.message {
padding: 13rpx 20rpx;
}
.message-item {
display: flex;
justify-content: flex-start;
align-items: flex-start;
align-content: flex-start;
flex-wrap: nowrap;
flex-direction: row;
.img {
width: 80rpx;
height: 80rpx;
border-radius: 5rpx;
}
.content {
padding: 20rpx;
max-width: 500rpx;
border-radius: 10rpx;
font-size: 28rpx;
}
// 语音
.contentType2 {
display: flex;
flex-direction: row;
align-items: center;
.voice_icon {
height: 34rpx;
width: 34rpx;
background-repeat: no-repeat;
background-size: 100%;
}
.voice_icon_right {
background-image: url(../../static/voice-left-3.png);
margin-left: 10rpx;
}
.voice_icon_left {
background-image: url(../../static/voice-right-3.png);
margin-right: 10rpx;
}
.voice_icon_right_an {
animation: voiceAn_right 1s linear alternate infinite;
}
.voice_icon_left_an {
animation: voiceAn_left 1s linear alternate infinite;
}
@keyframes voiceAn_right {
0% {
background-image: url(../../static/voice-left-1.png);
}
50% {
background-image: url(../../static/voice-left-2.png);
}
100% {
background-image: url(../../static/voice-left-3.png);
}
}
@keyframes voiceAn_left {
0% {
background-image: url(../../static/voice-right-1.png);
}
50% {
background-image: url(../../static/voice-right-2.png);
}
100% {
background-image: url(../../static/voice-right-3.png);
}
}
}
//图片
.contentType3{
padding: 0;
border-radius: 2rpx;
background-color: transparent !important;
.img{
width: 200rpx;
height: auto;
max-width: 300rpx;
max-height: 400rpx;
}
}
.contentType3::after{
border: none !important;
display: none !important;
}
.content-type-right {
flex-direction: row-reverse;
}
&.right {
flex-direction: row-reverse;
.content {
background-color: $uni-color-success;
margin-right: 28rpx;
word-break: break-all;
line-height: 36rpx;
position: relative;
&::after {
content: '';
display: block;
width: 0;
height: 0;
border-top: 10rpx solid transparent;
border-bottom: 10rpx solid transparent;
border-left: 16rpx solid $uni-color-success;
position: absolute;
right: -16rpx;
top: 30rpx;
}
}
}
&.left {
.content {
background-color: $uni-text-color-inverse;
margin-left: 28rpx;
word-break: break-all;
line-height: 36rpx;
position: relative;
&::after {
content: '';
display: block;
width: 0;
height: 0;
border-top: 10rpx solid transparent;
border-bottom: 10rpx solid transparent;
border-right: 16rpx solid $uni-text-color-inverse;
position: absolute;
left: -16rpx;
top: 30rpx;
}
}
}
}
}
.input-box {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
box-sizing: content-box;
z-index: 999;
background-color: #eaeaea;
/* #ifdef APP-PLUS */
margin-bottom: 0rpx;
margin-bottom: constant(safe-area-inset-bottom);
margin-bottom: env(safe-area-inset-bottom);
/* #endif */
/* #ifdef MP-WEIXIN */
padding-bottom: 0rpx;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
/* #endif */
&-flex {
display: flex;
justify-content: flex-start;
align-items: center;
flex-wrap: nowrap;
flex-direction: row;
padding: 20rpx;
box-sizing: border-box;
image{
width: 56rpx;
height: 56rpx;
}
.icon_img {
margin-right: 20rpx;
}
.icon_btn_add{
margin-left: 20rpx;
}
&-grow {
flex-grow: 1;
.content {
box-sizing: border-box;
background-color: #fff;
height: 80rpx;
padding: 0 20rpx;
border-radius: 12rpx;
font-size: 28rpx;
caret-color: $uni-color-success;
}
.voice_title {
text-align: center;
background-color: #ffffff;
height: 80rpx;
line-height: 80rpx;
border-radius: 12rpx;
}
}
.btn {
margin-left: 20rpx;
background-color: $u-type-success;
border: none;
}
}
.fun-box{
opacity: 0;
transition: all 0.1s ease-in-out;
height: 0;
.grid-text{
padding-top: 10rpx;
color: $uni-text-color-grey;
}
}
.show-fun-box{
opacity: 1;
height: 300rpx;
}
}
.input-box-mpInputMargin {
/* #ifdef MP-WEIXIN */
padding-bottom: 0rpx;
/* #endif */
}
.voice_an{
width: 300rpx;
height: 300rpx;
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%,-55%);
background-color: rgba(41,41,41,0.7);
color: white;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
border-radius: 10rpx;
.text{
padding-top: 30rpx;
}
@keyframes runVoice{
0%{
height: 10%;
}
20%{
height: 50%;
}
50%{
height: 100%;
}
80%{
height: 50%;
}
100%{
height: 0%;
}
}
.wave{
width:6rpx;
height: 100%;
margin-left: 10rpx;
border-radius: 50rpx;
background-color: #999;
vertical-align: middle;
display: inline-block;
}
.voice_an_icon{
width: 200rpx;
height: 100rpx;
line-height: 50rpx;
margin: 50rpx 0;
}
.voice_an_icon #one{
animation:runVoice 0.6s infinite 0.1s;
}
.voice_an_icon #two{
animation:runVoice 0.6s infinite 0.3s;
}
.voice_an_icon #three{
animation:runVoice 0.6s infinite 0.6s;
}
.voice_an_icon #four{
animation:runVoice 0.6s infinite 0.1s;
}
.voice_an_icon #five{
animation:runVoice 0.6s infinite 0.3s;
}
.voice_an_icon #six{
animation:runVoice 0.6s infinite 0.6s;
}
.voice_an_icon #seven{
animation:runVoice 0.6s infinite 0.1s;
}
}
}

3
pageD/components/GoEasyAudioPlayer/GoEasyAudioPlayer.vue
View File

@@ -40,12 +40,11 @@
padding: 6rpx 10rpx;
height: 72rpx;
line-height: 72rpx;
background: #FF780F;
background: #D02129;
font-size: 24rpx;
border-radius: 14rpx;
color: #ffffff;
display: flex;
flex-direction: row-reverse;
}
.audio-facade-bg{
background: url("./images/voice.png") no-repeat center;

BIN
pageD/components/GoEasyAudioPlayer/images/play.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
pageD/images/file.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 463 B

BIN
pageD/images/jianpan.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 932 B

BIN
pageD/images/record-appearance-icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 620 B

BIN
pageD/images/vedio.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 472 B

102
pageD/logistics/logistics.vue
View File

@@ -2,27 +2,22 @@
<view id="actives">
<!-- 活动消息推送 -->
<view class="activity" v-for="(item, index) in actives" :key="index">
<view class="times">{{item.kd_time}}</view>
<view class="times">{{item.type}}</view>
<view class="content">
<view class="store-name">
<image :src="item.store_avatar"></image>
<view class="name">{{item.store_name}}</view>
<view class="takeawayer" v-if="item.takeawayer_phone" @click="makePhone(item.takeawayer_phone)">
<u-icon name="phone-fill" color="#FF780F" size="28"></u-icon>
<text>联系骑手</text>
</view>
<view class="store_name">
<image src="../../pageE/static/mine/1.png"></image>
<view>小时代</view>
</view>
<view class="xiantiao"></view>
<view class="title">{{item.title}}</view>
<view class="images_about" @click="viewLogistics(item)">
<image :src="item.picture"></image>
<view class="title">{{item.name}}</view>
<view class="images_about">
<image :src="item.url"></image>
<view>
<text>{{item.summary}}</text>
<text>{{item.about}}</text>
</view>
</view>
</view>
</view>
<u-loadmore :status="loadStatus" bg-color="#ECECEC" margin-top="20" @loadmore="loadmore" />
</view>
</template>
@@ -31,70 +26,27 @@
data() {
return {
actives: [],
page: 1,
timer: true,
loadStatus: 'loadmore'
page: 1
};
},
onLoad() {
this.getCartList();
},
onReachBottom() {
this.loadmore();
},
},
methods: {
loadmore() {
if(!this.timer) return false;
this.loadStatus = "loading";
this.page++;
this.getCartList({ load: 'loadmore' }).then(length => {
if(length == 0) {
this.page--;
this.loadStatus = 'nomore';
} else {
this.loadStatus = 'loading';
}
}).catch(() => {
this.loadStatus = "nomore";
this.page--;
})
},
async getCartList({ load = 'reload' } = {}) {
const res = await this.$u.post("message/orderDeliveryList",{ page: this.page })
this.timer = true;
if (res.errCode == 0) {
if(load == 'reload') {
this.actives = res.data.data;
if(res.data.data.length < 12) this.loadStatus = "nomore";
}
else if(load == 'loadmore') this.actives.push(...res.data.data);
}
return res.data.data.length;
},
viewLogistics(item) {
let url;
if(item.takeawayer_phone) {
url = '/pageE/order/Details';
} else {
url = '/pageE/order/Logistics';
}
this.$u.route(url, {
oid: item.order_id,
});
},
makePhone(phone) {
uni.makePhoneCall({
phoneNumber: phone
});
}
getCartList() {
this.$u.post("message/orderDeliveryList",{page: this.page}).then(res => {
if (res.errCode == 0) {
this.actives == res.data;
}
})
}
},
components:{
}
};
</script>
<style lang="scss" >
page{
background-color: #ECECEC;
}
<style lang="scss" scoped>
#actives{
height: 100%;
}
@@ -154,31 +106,25 @@ page{
margin-bottom: 20rpx;
}
// 店铺
.store-name{
.store_name{
overflow: hidden;
zoom: 1;
padding: 0rpx 0 20rpx 0;
display: flex;
align-items: center;
image{
width: 60rpx;
height: 60rpx;
border-radius: 50%;
float: left;
}
.name {
view{
font-size:26rpx;
color:rgba(51,51,51,1);
float: left;
display: table-cell;
line-height: 60rpx;
display: inline-block;
margin-left: 21rpx;
}
.takeawayer {
margin-left: auto;
> text {
margin-left: 10rpx;
}
}
}
}
}

2
pageD/notice/info.vue
View File

@@ -1,6 +1,6 @@
<template>
<view>
<image :src="list.picture" class="picture" mode="aspectFit"></image>
<image :src="list.picture" class="picture" mode=""></image>
<view class="box">
<view class="info">
<text class="title u-line-2">{{ list.title }}</text>

45
pageD/notice/notice.vue
View File

@@ -1,55 +1,42 @@
<template>
<view id="viewes" :style="{height : height + 'px'}">
<view>
<!-- 公告咨询 -->
<notice :list="list"></notice>
<u-loadmore :status="loadStatus" bg-color="#ECECEC" margin-top="20" v-if="loadStatus=='nomore'" />
</view>
</template>
<script>
import notice from "@/components/informations/notice/notice"
import notice from "@/components/informations/notice/notice"
export default {
data() {
return {
list: [],
loadStatus: 'loadmore'
list: [],
};
},
onLoad() {
onLoad(){
this.informationList();
var _that = this
uni.getSystemInfo({
success: function (res) {
console.log(res.windowHeight);
_that.height = res.windowHeight
}
});
},
methods: {
titletext() {},
informationList() {
this.$u.api.informationList({}).then((res) => {
if (res.errCode == 0) {
this.list = res.data;
// 目前没有分页,只无数据提示用
if(!this.list.length) this.loadStatus = 'nomore';
}
titletext(){
},
informationList(){
this.$u.api.informationList({}).then((res)=>{
if (res.errCode == 0) {
this.list = res.data;
}
})
}
},
components: {
components:{
notice,
}
};
</script>
<style lang="scss">
page {
background-color: #ECECEC;
}
#viewes{
background: #ECECEC;
}
<style lang="scss" scoped>
page {
background-color: #ECECEC;
}
.sousuo {
height: 113rpx;
border: 1px #f00 solid;

70
pageD/privateChat/privateChat.vue
View File

@@ -59,7 +59,7 @@
<div :class="[audio.visible ? 'record-icon record-open':'record-icon']" @click="switchAudioKeyboard"></div>
<div class="record-input" @longpress="onRecordStart" @touchend="onRecordEnd" v-if="audio.visible" >{{audio.recording ? '松开发送' : '按住录音'}}</div>
<div class="message-input" v-else>
<input type="text" placeholder="发送消息" v-model="content" @click="bindtapInput">
<input type="text" placeholder="发送消息" v-model="content">
</div>
<div class="file-icon img-video" @click="sendImage"></div>
<div class="file-icon" @click="sendVideo"></div>
@@ -68,7 +68,6 @@
</div>
<div class="record-loading" v-if="audio.recording"></div>
<video style="width:100%;height: 100%" :src="video.url" v-if="video.visible" id="videoPlayer" autoplay="true" @fullscreenchange="onVideoFullScreenChange" @play="onVideoPlayStart"></video>
<u-toast ref="uToast" />
</div>
</template>
@@ -84,7 +83,6 @@
return {
//聊天文本框
content: '',
bottom : '',
friend: null,
currentUser: null,
//已经接收到的消息
@@ -128,12 +126,12 @@
this.friend = JSON.parse(options.id);
this.currentUser = this.imService.currentUser;
let privateMessages = this.imService.getPrivateMessages(this.friend.uuid);
this.imService.uid = this.friend.uuid;
this.messages = privateMessages.sentMessages;
this.pendingMessages = privateMessages.pendingMessages;
console.log(this.friend.name)
this.setTitle(this.friend.name)
uni.setNavigationBarTitle({
title : this.friend.name
});
setTimeout(() => {
uni.setNavigationBarColor({
backgroundColor : '#FF780F',
@@ -153,26 +151,8 @@
this.imService.onPrivateHistoryLoad = (friendId, messages) =>{};
//将未读消息数清零
this.imService.resetFriendUnReadMessage(this.friend);
this.imService.uid = 0;
},
methods: {
setTitle(title){
let that = this
if(title == ""){
title = "这是空的"
}
uni.setNavigationBarTitle({
title : title,
fail(){
that.setTitle(title)
}
});
},
bindtapInput(){
console.log("222")
var _that = this;
_that.bottom = 14
},
initialListeners () {
//传入监听器，收到一条私聊消息总是滚到到页面底部
this.imService.onNewPrivateMessageReceive = (friendId, message)=> {
@@ -211,13 +191,6 @@
})
},
sendMessage() {//发送消息
if(!this.imService.status){
this.$refs.uToast.show({
title: '连接聊天中，请稍候',
type: 'warning'
})
return
}
if (this.content.trim() != '') {
this.imService.sendPrivateTextMessage(this.friend.uuid, this.content);
let that = this
@@ -236,13 +209,6 @@
this.imService.loadPrivateHistoryMessage(this.friend.uuid, lastMessageTimeStamp);
},
onRecordStart () {
if(!this.imService.status){
this.$refs.uToast.show({
title: '连接聊天中，请稍候',
type: 'warning'
})
return
}
try{
recorderManager.start();
}catch(e){
@@ -265,13 +231,6 @@
}
},
sendVideo () {//发送文件
if(!this.imService.status){
this.$refs.uToast.show({
title: '连接聊天中，请稍候',
type: 'warning'
})
return
}
uni.chooseVideo({
success : (res) => {
console.log(res)
@@ -280,13 +239,6 @@
})
},
sendImage() {
if(!this.imService.status){
this.$refs.uToast.show({
title: '连接聊天中，请稍候',
type: 'warning'
})
return
}
uni.chooseImage({
count :1,
success :(res) => {
@@ -296,7 +248,6 @@
})
},
showImageFullScreen (e) {
var imagesUrl = [e.currentTarget.dataset.url];
uni.previewImage({
urls: imagesUrl
@@ -361,7 +312,7 @@
box-sizing: border-box;
}
.chatInterface .top{
font-size: 20rpx;
font-size: 24rpx;
height: 90rpx;
display: flex;
flex-direction: column;
@@ -371,7 +322,7 @@
color: blue;
}
.chatInterface .top .description{
/* text-decoration: underline; */
text-decoration: underline;
}
.chatInterface .message-item{
@@ -449,7 +400,7 @@
}
.chatInterface .action-top .file-icon{
background: url("../images/vedio.png") no-repeat center;
background-size: 50%;
background-size: 70%;
color: #9D9D9D;
position: relative;
width:80rpx;
@@ -464,7 +415,7 @@
}
.chatInterface .action-top .img-video{
background: url("../images/file.png") no-repeat center;
background-size: 50%;
background-size: 74%;
}
.chatInterface .record-input{
width: 480rpx;
@@ -487,10 +438,9 @@
font-size: 28rpx;
}
.chatInterface .send-message-btn{
font-size: 28rpx;
font-size: 32rpx;
width: 80rpx;
line-height: 80rpx;
margin-right: 20rpx;
}
.record-loading{
position: absolute;

9
pageE/mine/ArticleDetails.vue
View File

@@ -8,7 +8,7 @@ import common from '@/static/js/common.js'
export default {
data() {
return {
nodes: "",
nodes: '',
}
},
onLoad(option) {
@@ -18,9 +18,6 @@ export default {
if(option.type == 1) this.certificateInfo();
if(option.type == 2) this.getAboutUsInfo();
},
onNavigationBarButtonTap(e) {
console.log(e);
},
methods: {
setTitle(title){
uni.setNavigationBarTitle({
@@ -57,12 +54,10 @@ export default {
}
</script>
<style lang="scss" scoped>
// page {
// background-color: #ECECEC;
// }
.article-details {
min-height: calc(100vh - var(--window-top));
background: #ECECEC;
padding: 20rpx 35rpx 0;
line-height: 45rpx;
}
</style>

101
pageE/mine/Contact.vue
View File

@@ -1,101 +0,0 @@
<template>
<view class="contact">
<view class="item-view" @click="makePhone">
<view class="title">联系电话</view>
<view class="content">{{ phoneNumber }}</view>
<u-icon name="arrow-right" color="#9A9A9A" size="24"></u-icon>
</view>
<view class="item-view" @click="customerService">
<view class="title">客服服务</view>
<u-icon name="arrow-right" color="#9A9A9A" size="24"></u-icon>
</view>
</view>
</template>
<script>
export default {
data() {
return {
phoneNumber: '',
}
},
created() {
this.getPhone();
},
methods: {
getPhone() {
this.$u.api.getConfigInfo({
code: 'site_tel400'
}).then(res => {
this.phoneNumber = res.data.config.value;
})
},
makePhone() {
uni.makePhoneCall({
phoneNumber: this.phoneNumber,
});
},
customerService(){
if(!this.$store.state.hasLogin){
this.$u.toast('请先登录');
} else {
function Friend(uuid, name, avatar,time = "", text = "",date = "") {
this.uuid = uuid;
this.name = name;
this.avatar = avatar;
this.online = false;
this.unReadMessage = 0;
this.text = text;
this.time = time;
this.date = date
}
const token = uni.getStorageSync('token');
let that = this
uni.request({
url:"https://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
data:{
userId: 1
},
method:"POST",
header:{
"Authorization" : 'Bearer' + " " + token
},
success(res){
res = res.data;
let user = new Friend(res.data.member_id,"官方平台客服",res.data.member_avatar);
that.$u.route({
url:"/pageD/privateChat/privateChat",
params:{
id:JSON.stringify(user)
}
})
}
})
}
},
}
};
</script>
<style lang="scss" scoped>
.contact {
border-top: 1rpx solid #ECECEC;
.item-view {
display: flex;
align-items: center;
justify-content: space-between;
padding: 34rpx 30rpx;
border-bottom: 2rpx solid #ECECEC;
.title {
font-size: 30rpx;
color: #343434;
}
.content {
margin-left: auto;
font-size: 28rpx;
color: #666666;
}
.u-icon {
margin-left: 20rpx;
}
}
}
</style>

6
pageE/mine/EditUserInfo.vue
View File

@@ -117,7 +117,7 @@ export default {
id: 1 // 平台店铺 id
}).then((res)=>{
// console.log(res)
let user = new Friend(res.data.member_id,res.data.store_name,res.data.member_avatar)
let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
this.$u.route({
url:"/pageD/privateChat/privateChat",
params:{
@@ -136,7 +136,7 @@ export default {
sizeType: ['original', 'compressed'],
sourceType: ['album'],
success: (res) => {
// this.avatar = res.tempFilePaths[0];
this.avatar = res.tempFilePaths[0];
common.uploadFile({
url: url,
name: 'avatar',
@@ -144,7 +144,7 @@ export default {
}).then(result => {
// console.log(result);
// this.$set(this, 'avatar', result.file_path);
this.avatar = result.file_path + "?" + new Date().getTime();
// this.avatar = result.file_path;
this.uploadPath = result.file_name;
}, error => {
this.$u.toast(error);

161
pageE/mine/ImageTextCollection.vue
View File

@@ -1,13 +1,11 @@
<template>
<view class="collection">
<view class="container">
<view class="item-box" v-for="(item, index) in articleList" :key="index" @click="toDetailsPage({ id: item.article_id, type: item.type })">
<view class="item-box" v-for="(item, index) in articleList" :key="index" @click="toDetailsPage(item.article_id)">
<view class="video-item" v-if="item">
<image class="head" :src="item.article_pic" mode="aspectFill" v-if="item.type == 1"></image>
<image class="head" :src="item.article_pic" mode="scaleToFill" v-if="item.type == 1"></image>
<view class="header_fist" v-else>
<view class="backs">
<image class="play-icon" src="/static/videoPlay.png"></image>
</view>
<view class="backes"></view>
<image class="head" :src="item.article_pic"></image>
</view>
<view class="title u-line-1">{{ item.article_title }}</view>
@@ -17,14 +15,23 @@
<image :src="item.member_avatar"></image>
<text>{{ item.member_nickname }}</text>
</view>
<view @click.stop="viewAction(item.article_id)">
<u-icon name="more-dot-fill" color="#333" size="36"></u-icon>
<view @click.stop="delArticle(item.article_id)">
<u-icon name="trash" color="#333" size="36"></u-icon>
</view>
<!-- <image src="/static/image/common/4.png" @click.stop="showAction(item)"></image> -->
<!-- <view class="action" v-if="show == item.article_id">
<view class="bubble">
<view @click.stop="delArticle(item.article_id)">
<image src="/static/image/common/8.png"></image>
<text>删除</text>
</view>
</view>
</view> -->
<view class="layer" v-if="show == item.article_id" @click.stop="show=-1"></view>
</view>
</view>
</view>
</view>
<u-action-sheet :list="actionList" v-model="showAction" :cancel-btn="true" @click="delArticle" border-radius="20"></u-action-sheet>
<u-empty mode="list" v-if="!articleList.length" color="#000" img-width="200" font-size="30" margin-top="120"></u-empty>
</view>
</template>
@@ -32,17 +39,8 @@
export default {
data() {
return {
tid: '',
show: -1,
articleList: [],
showAction: false,
actionList: [
{
text: '删除',
color: '#000000',
fontSize: 36
}
]
}
},
onShow() {
@@ -53,6 +51,9 @@ export default {
this.articleCollectList();
},
methods: {
showAction(item) {
this.show = this.show > 0 ? -1 : item.article_id;
},
articleCollectList() {
this.$u.api.articleCollectList().then(res => {
uni.stopPullDownRefresh();
@@ -63,16 +64,8 @@ export default {
}
})
},
viewAction(id) {
this.showAction = true;
this.tid = id;
},
toDetailsPage({ id, type }) {
let src = type == 1 ? 'pageB/photo/index' : 'pageB/video/video';
this.$u.route(src, {　id: id　});
},
delArticle() {
this.$u.api.articleCollect({ article_id: this.tid }).then(res => {
delArticle(id) {
this.$u.api.articleCollect({ article_id: id }).then(res => {
if(res.errCode == 0) {
this.articleCollectList();
} else {
@@ -80,6 +73,11 @@ export default {
}
})
},
toDetailsPage(id) {
uni.navigateTo({
url: '/pageB/photo/index?id=' + id
});
},
}
};
</script>
@@ -90,9 +88,11 @@ export default {
padding: 21rpx 30rpx 0;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.item-box {
.video-item {
&:not(:nth-child(2n)) {
margin-right: 20rpx;
}
.video-item{
width: 330rpx;
height: 510rpx;
margin-top: 20rpx;
@@ -104,28 +104,30 @@ export default {
height: 330rpx !important;
}
.title{
margin: 20rpx auto 0;
margin:0 auto;
margin-top: 20rpx;
font-size: 22rpx;
color: #333;
font-weight: 500;
height: 30rpx;
line-height: 30rpx;
width: 300rpx;
}
.jianjie{
height: 30rpx;
margin: 20rpx auto 0;
// height: 60rpx;
margin:0 auto;
margin-top: 20rpx;
font-size: 22rpx;
color: #666;
line-height: 30rpx;
width: 300rpx;
margin-left: 18rpx;
}
.user {
.user{
display: flex;
justify-content: space-between;
align-items: center;
margin: 20rpx auto 0;
margin:0 auto;
margin-top: 20rpx;
width: 300rpx;
position: relative;
.info {
@@ -147,28 +149,83 @@ export default {
width: 37rpx;
height: 8rpx;
}
}
.header_fist {
width: 330rpx;
height: 330rpx;
position: relative;
.backs {
.action {
z-index: 19;
position: absolute;
right: 0rpx;
bottom: 55rpx;
// width: 234rpx;
background: rgba(255,255,255,1);
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
border-radius: 6rpx;
.bubble {
position: relative;
background-color: #fff;
&::after {
position: absolute;
right: 10rpx;
bottom: 0;
content: '';
width: 60rpx;
height: 40rpx;
background-color: inherit;
transform: rotate(45deg);
margin-top: -10rpx;
z-index: -1;
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
}
> view {
padding: 9rpx 12rpx;
display: flex;
align-items: center;
&:not(:last-child) {
border-bottom: 2rpx #ECECEC solid;
}
@mixin image-class($width, $height, $right) {
width: $width;
height: $height;
margin-right: $right;
}
> image {
&:first-child {
@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
}
&:nth-child(2) {
@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
}
&:last-child {
@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
}
}
> text {
font-size: 20rpx;
color: rgba(51,51,51,1);
}
}
}
}
.layer {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 9;
position: absolute;
background-color: rgba(0, 0, 0, 0.35);
.play-icon {
z-index: 19;
position: absolute;
width: 100rpx;
height: 100rpx;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
background-color: transparent;
}
}
.header_fist{
position: relative;
.backes{
position: absolute;
top: 0;
background: rgba(0,0,0,0.6);
width: 100%;
height: 100%;
color: #fff;
}
}
}
}
}

40
pageE/mine/Integral.vue
View File

@@ -18,23 +18,7 @@
</view>
</view>
<scroll-view scroll-y class="integral-botom" :style="{ height: integralHeight }">
<view class="medal-title">
<!-- <image src="../static/mine/29.png"></image> -->
<view>积分获取规则</view>
<!-- <image src="../static/mine/30.png"></image> -->
</view>
<view class="medal-content">
<rich-text :nodes="nodes"></rich-text>
</view>
<view class="medal-title">
<!-- <image src="../static/mine/29.png"></image> -->
<view>会员等级权益</view>
<!-- <image src="../static/mine/30.png"></image> -->
</view>
<view class="medal-content">
<rich-text :nodes="dengji"></rich-text>
</view>
<rich-text :nodes="nodes"></rich-text>
</scroll-view>
</view>
</template>
@@ -46,7 +30,6 @@ export default {
memberInfo: {},
integralHeight: 0,
nodes: '',
dengji:""
}
},
onShow() {
@@ -64,7 +47,6 @@ export default {
if (res.errCode == 0) {
this.memberInfo = res.data;
this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
this.dengji = common.unescapeHTML(res.data.grade_rule.document_content)
}
})
},
@@ -118,25 +100,5 @@ export default {
top: 251rpx;
z-index: 9;
}
.medal-title {
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 52rpx;
// font-weight: bold;
> image {
width: 22rpx;
height: 22rpx;
}
> view {
font-size: 32rpx;
color: rgba(51,51,51,1);
margin: 0 30rpx;
}
}
.medal-content {
padding-bottom: 20rpx;
}
}
</style>

5
pageE/mine/MedalIntroduction.vue
View File

@@ -27,10 +27,9 @@ export default {
methods: {
getMemberPointsStat() {
this.$u.api.getMemberPointsStat().then((res)=>{
console.log(res)
if (res.errCode == 0) {
this.title = res.data.xunzhang_rule.document_title;
const nodes = res.data.xunzhang_rule.document_content;
this.title = res.data.grade_rule.document_title;
const nodes = res.data.grade_rule.document_content;
this.nodes = common.unescapeHTML(nodes);
}
})

33
pageE/mine/MemberServe.vue
View File

@@ -9,11 +9,11 @@
<view class="integral-top">
<view>
<view class="title">总积分</view>
<view class="value">{{ memberInfo.member_points || 0 }}</view>
<view class="value">{{ memberInfo.member_points }}</view>
</view>
<view>
<view class="title">经验值</view>
<view class="value">{{ memberInfo.member_exppoints || 0 }}</view>
<view class="value">{{ memberInfo.member_exppoints }}</view>
</view>
<view @click="viewProgress">
<view class="title">预计进度</view>
@@ -24,14 +24,7 @@
</view>
</view>
<scroll-view scroll-y class="integral-botom" :style="{ height: richHeight }">
<view class="rich-container">
<view class="title">{{ points_rule.document_title }}</view>
<rich-text :nodes="pointsNodes"></rich-text>
</view>
<view class="rich-container">
<view class="title" >{{ member_rule.document_title }}</view>
<rich-text :nodes="nodes"></rich-text>
</view>
<rich-text :nodes="nodes"></rich-text>
</scroll-view>
</view>
</swiper-item>
@@ -76,10 +69,7 @@ export default {
swiperCurrent: 0,
pointslogList: [],
memberInfo: {},
pointsNodes: '',
nodes: '',
points_rule: {},
member_rule: {}
}
},
components: {
@@ -113,10 +103,7 @@ export default {
this.$u.api.getMemberPointsStat().then((res)=>{
if(res.errCode == 0) {
this.memberInfo = res.data;
this.nodes = common.unescapeHTML(this.memberInfo.grade_rule.document_content);
this.pointsNodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
this.points_rule = this.memberInfo.points_rule;
this.member_rule = this.memberInfo.grade_rule;
this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
}
})
},
@@ -193,18 +180,6 @@ export default {
border-radius: 20rpx 20rpx 0rpx 0rpx;
top: 250rpx;
z-index: 9;
.rich-container {
&:not(:last-child) {
margin-bottom: 56rpx;
}
.title {
text-align: center;
font-size: 32rpx;
color: #333333;
margin-bottom: 26rpx;
// font-weight: bold;
}
}
}
}
.coupon {

13
pageE/mine/MemberServeCoupon.vue
View File

@@ -1,5 +1,8 @@
<template>
<view class="coupon-swiper">
<!-- <scroll-view scroll-x="true" class="classify-coupon">
<view v-for="(classify, index) in couponGroupList" :key="index" class="classify-item" :class="{ 'active': couponCurrent == index }" @click="couponTabsChange(index)">{{ classify.gc_name }}</view>
</scroll-view> -->
<u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="24" inactive-color="#333333"></u-tabs>
<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{ height: swiperHeight }">
<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
@@ -8,10 +11,17 @@
<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
</view>
<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList[i] || !couponList[i].length"></u-empty>
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-bottom="60" v-if="couponList[i] && couponList[i].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-bottom="60" v-if="!couponList[i] || couponList[i].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
</scroll-view>
</swiper-item>
</swiper>
<!-- <scroll-view scroll-y style="height: 100%;" @scrolltolower="onreachBottom" class="coupon-scroll" :style="{ height: swiperHeight }">
<view v-for="(coupon, index) in couponList" :key="index" class="coupon-item">
<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
</view>
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="couponList.length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList.length"></u-empty>
</scroll-view> -->
</view>
</template>
<script>
@@ -39,6 +49,7 @@ export default {
},
watch: {
couponCurrent(index) {
// this.couponList = [];
const id = this.couponGroupList[index].gc_id;
this.getCouponList({ gc_id: id, load: 'reload' });
},

131
pageE/mine/MineConcerns.vue
View File

@@ -1,134 +1,77 @@
<template>
<view class="concerns">
<view class="tabs-top u-border-bottom">
<u-tabs ref="uTabs" :show-bar="false" :list="list" font-size="32" :current="current" @change="tabsChange" :is-scroll="false"
swiperWidth="750" active-color="#FF780F"></u-tabs>
</view>
<scroll-view v-if="current==0" scroll-y style="height: 100%;width: 100%;" class="store" @scrolltolower="onreachBottom">
<storeViwe ref="store"></storeViwe>
</scroll-view>
<scroll-view v-else scroll-y style="height: 100%;width: 100%;" @scrolltolower="onreachBottom">
<view class="concerns-container">
<view v-for="(info, index) in daren" :key="index">
<view class="daren-item">
<image class="head" :src="info.friend_tomavatar" @click="toDetailsPage({ id: info.friend_tomid })"></image>
<text class="name" @click="toDetailsPage({ id: info.friend_tomid })">{{ info.friend_tomname || '' }}</text>
<view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
</view>
<view class="concerns-container">
<view v-for="(info, index) in list" :key="index">
<view class="daren-item">
<image class="head" :src="info.friend_tomavatar" @click="viewDetails(info.friend_tomid)"></image>
<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>
<u-loadmore :status="loadStatus" bg-color="#FFFFFF" v-if="daren.length > 9" @loadmore="loadmore" />
</view>
<u-empty mode="list" v-if="!daren.length" color="#000" img-width="200" font-size="30" margin-top="200"></u-empty>
</scroll-view>
</view>
<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="120"></u-empty>
</view>
</template>
<script>
import storeViwe from './storeConcerns'
export default {
data() {
return {
list: [{ name: "店铺" }, { name: "达人" }],
daren: [],
shangjia:[],
height: 0,
show: false,
current: 0,
page: 1,
loadStatus: 'loadmore',
timer: true,
list: []
}
},
components: {
storeViwe,
},
onShow() {
this.loadStatus = "loadmore"
this.page = 1
this.getPeopleList();
},
onLoad(){
this.setViewHeight();
this.attentionMemberList();
},
// 下拉刷新
onPullDownRefresh() {
this.attentionMemberList();
},
methods: {
setViewHeight() {
const res = uni.getSystemInfoSync();
this.height = res.windowHeight - (res.windowWidth / 750 * 80) + 'px';
},
// tabs通知swiper切换
tabsChange(index) {
this.current = index;
},
// scroll-view到底部加载更多
onreachBottom() {
if(this.current == 0) this.$refs.loadmore();
else if(this.current == 1) this.loadmore();
},
loadmore() {
if(!this.timer) return false;
this.timer = false;
this.loadStatus = "loading";
this.page++;
this.getPeopleList({ load: 'loadmore' }).then(length => {
this.loadStatus = "nomore";
if(length == 0) this.page--;
}).catch(() => {
this.loadStatus = "nomore";
this.page--;
attentionMemberList() {
this.$u.api.attentionMemberList().then(res => {
uni.stopPullDownRefresh();
if(res.errCode == 0) {
this.list = res.data;
} else {
this.list = [];
}
})
},
async getPeopleList({ load = 'reload' } = {}) {
const res = await this.$u.api.attentionMemberList({
role: 3,
page: this.page
})
this.timer = true;
if(res.errCode == 0) {
if(load == 'reload') this.daren = res.data.data;
else if(load == 'loadmore') this.daren.push(...res.data.data);
}
return res.data.data.length;
},
// 取消关注
changeType(id) {
// console.log(id);
this.$u.api.attentionMember({
member_id: id
}).then(res => {
this.$u.toast(res.message);
this.getPeopleList();
})
},
toDetailsPage(id) {
viewDetails(id) {
this.$u.route('pageB/details/index', {
id: id
});
},
changeType(id) {
console.log(id);
this.$u.api.attentionMember({
member_id: id
}).then(res => {
this.$u.toast(res.message);
this.attentionMemberList();
})
},
},
};
</script>
<style lang="scss" scoped>
.concerns {
background-color: #FFFFFF;
.store {
background-color: #FFFFFF;
}
.concerns-container {
padding: 30rpx;
display: flex;
flex-wrap: wrap;
margin-left: -20rpx;
.daren-item {
&:not(:nth-child(3n)) {
margin-right: 20rpx;
}
.daren-item{
width: 215rpx;
height: 270rpx;
height: 282rpx;
display: flex;
flex-direction: column;
align-items: center;
background-color: #fff;
border-radius: 10rpx;
overflow: hidden;
margin-left: 20rpx;
margin-bottom: 20rpx;
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
.head{
width: 80rpx;
height: 80rpx;

6
pageE/mine/MineInfo.vue
View File

@@ -1,7 +1,7 @@
<template>
<view class="information">
<view class="info-avatar">
<u-avatar :src="userInfo.member_avatar + '?' + (new Date().getTime())" :size="120"></u-avatar>
<u-avatar :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="120"></u-avatar>
</view>
<view class="info-item">
<view class="title">昵称</view>
@@ -51,8 +51,8 @@ export default {
getUserInfo() {
this.$u.api.getMemberInfo().then(res => {
if (res.errCode == 0) {
this.userInfo = res.data.MemberArray;
// this.$set(this, 'userInfo', res.data.MemberArray);
// this.userInfo = res.data.MemberArray;
this.$set(this, 'userInfo', res.data.MemberArray);
}
})
},

19
pageE/mine/MineProgress.vue
View File

@@ -2,21 +2,27 @@
<view class="progress" v-if="memberInfo">
<view class="header">
<view class="line-progress">
<view class="rank-value">lv{{ memberInfo.member_level || 0 }}</view>
<view class="rank-value">lv{{ memberInfo.member_level }}</view>
<view class="line-box">
<u-line-progress :percent="percent" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30" :striped="true" :striped-active="true"></u-line-progress>
<text>{{ (memberInfo.member_exppoints || 0) + '/' + (memberInfo.next_member_level_exppoints || 0) }}</text>
<text>{{ memberInfo.member_exppoints + '/' + memberInfo.next_member_level_exppoints }}</text>
</view>
<view class="rank-value">lv{{ memberInfo.next_member_level || 0 }}</view>
<view class="rank-value">lv{{ memberInfo.next_member_level }}</view>
</view>
<view class="exp-value">经验值<span>{{ memberInfo.member_exppoints || 0 }}</span></view>
<view class="distance">距离下一级还需要 {{ memberInfo.next_member_level_exppoints_diff || '--' }} 经验值</view>
<view class="exp-value">经验值<span>{{ memberInfo.member_exppoints }}</span></view>
<view class="distance">距离下一级还需要 {{ memberInfo.next_member_level_exppoints_diff }} 经验值</view>
</view>
<view class="body">
<view class="title" v-if="memberInfo.level_rule">
<image src="/static/image/mine/34.png"></image>
<text>{{ memberInfo.level_rule.document_title || '' }}</text>
<text>{{ memberInfo.level_rule.document_title }}</text>
</view>
<!-- <view class="rank-list">
<view v-for="(rank, index) in rank" :key="index" class="list-item">
<view class="rank-value">lv{{ rank.level }}</view>
<view class="rank-interval"><span>经验值:</span>{{ rank.max == '--' ? rank.min + '及以上' : rank.min + '~' + rank.max }}</view>
</view>
</view> -->
<view class="rich">
<rich-text :nodes="nodes"></rich-text>
</view>
@@ -35,6 +41,7 @@ export default {
},
filters: {
percentExp(value, next) {
// console.log(rank);
let result = '0 / 0';
result = typeof(next) == 'Number'
? value + ' / ' + (value + next)

2
pageE/mine/StoreCollection.vue
View File

@@ -16,7 +16,7 @@
<view class="item-name u-line-1">{{ item.store_name }}</view>
<view class="item-date">
<image src="@/pageE/static/mine/26.png"></image>
<view>{{ item.fav_time }}</view>
<view>{{ item.fav_time | date }}</view>
</view>
</view>
</view>

181
pageE/mine/storeConcerns.vue
View File

@@ -1,181 +0,0 @@
<template>
<view class="collection-item">
<u-swipe-action
v-for="(item, index) in list" :key="index"
:index='index'
:show="item.show"
:options="options"
@click="removeFavorite"
@open="open"
>
<view class="item u-border-bottom" @click="viewStoreDetails(item)">
<image :src="item.friend_tomavatar"></image>
<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
<view class="title-wrap">
<view class="item-top u-line-1">{{ item.friend_tomname }}</view>
<view class="item-bottom">
<view class="item-date">
<image src="@/pageE/static/mine/26.png"></image>
<view>{{ item.friend_addtime }}</view>
</view>
</view>
</view>
</view>
</u-swipe-action>
<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="200"></u-empty>
<u-loadmore :status="loadStatus" bg-color="#FFFFFF" v-if="list.length > pageSize" @loadmore="loadmore" />
</view>
</template>
<script>
export default {
data() {
return {
pageSize: 12,
list: [],
options: [
{
text: '删除',
style: {
backgroundColor: '#FF3131'
}
}
],
page: 1,
timer: true,
loadStatus: 'loadmore',
}
},
mounted() {
this.getStoreList();
},
methods: {
viewStoreDetails(item) {
if(this.closeAction()) return false;
// console.log(this.list);
const list = this.list.filter(item => {
return item.show;
})
if(list.length) return false;
this.$u.route({
url: 'pageC/merchant/index',
params: {
id: item.friend_store_id,
}
})
},
async getStoreList({ load = 'reload' } = {}) {
const res = await this.$u.api.attentionMemberList({
role: 2,
page: this.page
})
this.timer = true;
if(res.errCode == 0) {
if(load == 'reload') this.list = res.data.data;
else if(load == 'loadmore') this.list.push(...res.data.data);
}
this.list.forEach(item => {
Object.assign(item, { show: false });
})
// console.log(this.list);
return res.data.data.length;
},
loadmore() {
if(!this.timer) return false;
this.timer = false;
this.loadStatus = "loading";
this.page++;
let promise;
promise = this.getStoreList({ load: 'loadmore' });
promise.then(length => {
this.loadStatus = "nomore";
if(length == 0) this.page--;
}).catch(() => {
this.loadStatus = "nomore";
this.page--;
})
},
removeFavorite(index) {
const id = this.list[index].friend_tomid;
this.$u.api.attentionMemberRemove({
id: id,
type: 'store'
}).then(res => {
if(res.errCode == 0) {
this.getStoreList();
} else {
this.$u.toast(res.message);
}
})
},
closeAction() {
let status = false;
this.list.map((val, idx) => {
if(val.show) {
status = true;
this.$set(this.list[idx], 'show', false);
};
})
this.$forceUpdate();
return status;
},
open(index) {
console.log(index);
// 先将正在被操作的swipeAction标记为打开状态，否则由于props的特性限制，
// 原本为'false'，再次设置为'false'会无效
this.list[index].show = true;
this.list.map((val, idx) => {
if(index != idx) this.list[idx].show = false;
})
this.$forceUpdate();
}
},
};
</script>
<style lang="scss" scoped>
.collection-item {
width: 100%;
background-color: #ffffff;
.item {
width: 750rpx;
padding: 30rpx;
display: flex;
> image {
width: 180rpx;
height: 160rpx;
border-radius: 10rpx;
margin-right: 30rpx;
flex-shrink: 0;
}
.title-wrap {
overflow: hidden;
flex: 1;
.item-top {
width: 100%;
font-size: 30rpx;
color: rgba(51,51,51,1);
line-height: 44rpx;
margin-bottom: 54rpx;
}
.item-bottom {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.item-price {
font-size: 30rpx;
color: rgba(51,51,51,1);
}
.item-date {
display: flex;
align-items: center;
> image {
margin-right: 25rpx;
width: 24rpx;
height: 24rpx;
}
}
}
}
}
}
</style>

282
pageE/more/ApplyLive.vue
View File

@@ -1,282 +0,0 @@
<template>
<view class="apply-live">
<view class="basic-info">
<view>
<label for="name">姓名:</label>
<input type="text" id="name" @input="names" placeholder="请输入姓名" />
</view>
<view>
<label for="phone">手机号:</label>
<input type="number" id="phone" @input="phones" maxlength="11" placeholder="请输入手机号" />
</view>
<view>
<label for="idCard">身份证号:</label>
<input type="text" id="idCard" placeholder="请输入身份证号" @input="setIdCard" />
</view>
<view @click="show=true">
<label for="address">居住地址:</label>
<input type="text" id="address" v-model="address" disabled placeholder="请选择居住地址" />
<u-icon name="arrow-down" color="#343434" size="26" class="arrow-icon"></u-icon>
</view>
<view>
<label for="details">详细地址:</label>
<input type="text" id="details" @input="detailss" placeholder="请填写详细地址" />
</view>
</view>
<view class="other-info">
<view class="item-box specialty">
<view class="title">特长领域：<text class="brief">(多选）</text></view>
<view class="check-box-container">
<u-checkbox-group @change="specialtyGroupChange" active-color="#fff">
<u-checkbox
v-model="item.checked"
v-for="(item, index) in industryList" :key="index"
:name="item.name"
>{{item.name}}</u-checkbox>
</u-checkbox-group>
</view>
</view>
<view class="item-box hobby">
<view class="title">兴趣爱好：<text class="brief">(多选）</text></view>
<view class="check-box-container">
<u-checkbox-group @change="hobbyGroupChange" active-color="#fff">
<u-checkbox
v-model="item.checked"
v-for="(item, index) in hobbyList" :key="index"
:name="item.name"
>{{item.name}}</u-checkbox>
</u-checkbox-group>
</view>
</view>
</view>
<view class="submit-btn" @click="applyExpert">提交申请</view>
<u-select v-model="show"
mode="mutil-column-auto"
:list="areaList"
value-name="area_id"
label-name="area_name"
child-name="_child"
@confirm="setArea">
</u-select>
<u-toast ref="uToast" />
</view>
</template>
<script>
export default {
data() {
return {
show: false,
areaList: [],
name: '',
phone: '',
idCard: '',
address: '',
details: '',
industryList: [],
hobbyList: [],
checkedIndustryList: [],
checkedHobbyList: [],
isSubmit: true, // 防止多次提交
}
},
onLoad() {
this.getAreaData();
this.getIndustryList();
this.getHobbyList();
},
methods: {
names(a){
console.log(a.detail)
this.name = a.detail.value
},
phones(a){
this.phone = a.detail.value
},
setIdCard(v) {
this.idCard = v.detail.value;
},
detailss(a){
this.details = a.detail.value
},
getAreaData() {
this.$u.api.getArea().then((res)=>{
if (res.errCode == 0) {
this.areaList = res.data;
}
})
},
getIndustryList() {
this.$u.api.getIndustryList().then(res => {
res.data.forEach(element => {
this.industryList.push({
checked: false,
name: element,
});
});
})
},
getHobbyList() {
this.$u.api.getHobbyList().then(res => {
res.data.forEach(element => {
this.hobbyList.push({
checked: false,
name: element,
});
});
})
},
specialtyGroupChange(e) {
// console.log(e);
this.checkedIndustryList = e;
},
hobbyGroupChange(e) {
// console.log(e);
this.checkedHobbyList = e;
},
// 验证
validateData() {
if(this.$u.test.isEmpty(this.name)) {
this.$u.toast('姓名不能为空');
return false;
}
if(this.$u.test.isEmpty(this.phone)) {
this.$u.toast('手机号不能为空');
return false;
}
if(!this.$u.test.mobile(this.phone)) {
this.$u.toast('手机号错误');
return false;
}
if(this.$u.test.isEmpty(this.idCard)) {
this.$u.toast('身份证号不可为空');
return false;
}
// if(!this.$u.test.idCard(this.idCard)) {
// this.$u.toast('请正确填写身份证号');
// return false;
// }
// if(this.$u.test.isEmpty(this.address)) {
// this.$u.toast('地址不能为空');
// return false;
// }
// if(this.$u.test.isEmpty(this.details)) {
// this.$u.toast('详细地址不能为空');
// return false;
// }
if(!this.checkedIndustryList.length) {
this.$u.toast('行业领域不能为空');
return false;
}
if(!this.checkedHobbyList.length) {
this.$u.toast('兴趣爱好不能为空');
return false;
}
return true;
},
applyExpert() {
if(!this.isSubmit) return false;
if(!this.validateData()) return false;
this.isSubmit = false;
this.$u.api.applyExpert({
name: this.name,
mobile: this.phone,
idcard: this.idCard,
address: this.address + this.details,
industry: this.checkedIndustryList,
hobby: this.checkedHobbyList,
}).then(res => {
if(res.errCode == 0) {
this.$refs.uToast.show({
title: res.message,
back: true,
})
} else {
this.isSubmit = true;
this.$u.toast(res.message);
}
})
},
setArea(area) {
// console.log(area);
this.area_id = area[0].value;
this.city_id = area[1].value;
let temp = '';
area.forEach(e => {
temp += e.label;
});
this.address = temp;
},
}
};
</script>
<style lang="scss" scoped>
.apply-live {
min-height: calc(100vh - var(--window-top));
background-color: #ECECEC;
padding-bottom: 60rpx;
.basic-info {
> view {
background-color: #FFFFFF;
padding: 34rpx 30rpx;
display: flex;
align-items: center;
margin-bottom: 2rpx;
> label {
width: 150rpx;
margin-right: 40rpx;
font-size: 30rpx;
color: #343434;
}
> input {
flex: 1;
font-size: 28rpx;
}
.arrow-icon {
margin-left: 20rpx;
}
}
}
.other-info {
margin-bottom: 80rpx;
.item-box {
background-color: #FFFFFF;
padding: 35rpx 30rpx;
margin-bottom: 1rpx;
.title {
font-size: 30rpx;
color: #343434;
margin-bottom: 30rpx;
.brief {
color: #9A9A9A;
}
}
.check-box-container {
/deep/ .u-checkbox {
margin-bottom: 24rpx;
.u-checkbox__icon-wrap {
border-color: #C0C0C0 !important;
}
.u-checkbox__icon-wrap--checked {
.u-icon__icon {
color: #FF780F !important;
}
}
}
}
}
}
.submit-btn {
width: 690rpx;
height: 98rpx;
background: #FF7810;
border-radius: 49rpx;
font-size: 36rpx;
color: #FFFFFF;
margin: 0 auto;
display: flex;
align-items: center;
justify-content: center;
}
}
</style>

11
pageE/more/Complaints.vue
View File

@@ -5,7 +5,7 @@
<view class="suggestions">
<view class="text">{{ item.fb_content }}</view>
<view class="image">
<image v-for="(url, index) in item.fb_images" :key="index" :src="url" mode="aspectFit" @click="previewImage(item.fb_images, index)"></image>
<image v-for="(url, index) in item.fb_images" :key="index" :src="url"></image>
</view>
</view>
<view class="reply" v-if="item.is_reply">
@@ -13,7 +13,7 @@
<view class="reply-content u-line-4">{{ item.reply_content }}</view>
</view>
<view class="date">
<image src="../static/mine/26.png" mode="aspectFit"></image>
<image src="../static/mine/26.png"></image>
<view>{{ item.fb_time }}</view>
</view>
</view>
@@ -45,13 +45,6 @@ export default {
}
})
},
previewImage(urls, index) {
// console.log(urls);
uni.previewImage({
urls: urls,
current: urls[index]
});
},
},
}
</script>

315
pageE/more/EditInvoice.vue
View File

@@ -1,315 +0,0 @@
<template>
<view class="edit-invoice">
<view class="invoice-type">
<view class="title">发票类型</view>
<u-radio-group v-model="type" @change="radioGroupChange" icon-size="0" active-color="#FF780F" size="16">
<u-radio
v-for="(item, index) in list" :key="index"
:name="item.type"
:disabled="action==0"
>
{{item.name}}
</u-radio>
</u-radio-group>
</view>
<view class="info-item">
<view class="title">发票抬头</view>
<input type="text" placeholder="抬头名称或极速开票6位代码" v-model="title" />
</view>
<view class="personal" v-show="type==1">
<view class="info-item">
<view class="title">手机号</view>
<input type="text" placeholder="请输入您的手机号" maxlength="11" v-model="personalPhone" />
</view>
<view class="info-item">
<view class="title">身份证号</view>
<input type="text" placeholder="请输入您的身份证号" v-model="idCard" />
</view>
</view>
<view class="company" v-show="type==2">
<view class="info-item">
<view class="title">税号</view>
<input type="text" placeholder="纳税人识别号或社会统一征信代码" v-model="taxNumber" />
</view>
<view class="info-item">
<view class="title">单位地址</view>
<input type="text" placeholder="请输入公司地址" v-model="address" />
</view>
<view class="info-item">
<view class="title">电话号码</view>
<input type="text" placeholder="请输入公司电话" maxlength="11" v-model="companyPhone" />
</view>
<view class="info-item">
<view class="title">开户银行</view>
<input type="text" placeholder="请输入开户银行" v-model="bankDeposit" />
</view>
<view class="info-item">
<view class="title">银行账户</view>
<input type="text" placeholder="请输入银行账户" v-model="bankAccounts" />
</view>
</view>
<view class="save-btn" @click="submit">保存</view>
<u-toast ref="uToast" />
</view>
</template>
<script>
export default {
data() {
return {
invoice_id: '',
action: '', // 0 编辑 1 添加
type: '', // 发票类型
list: [{
type: 1,
name: '个人或事业单位'
}, {
type: 2,
name: '企业'
}],
title: '',
personalPhone: '',
idCard: '',
taxNumber: '',
address: '',
companyPhone: '',
bankDeposit: '',
bankAccounts: '',
}
},
onLoad(option) {
this.action = option.action;
if(option.invoice_id) {
this.type = 0;
this.invoice_id = option.invoice_id;
this.getInvoiceInfo();
} else {
this.type = 1;
}
},
methods: {
submit() {
this.action == 1 ? this.invoiceAdd() : this.invoiceEdit();
},
verificationParams() {
const phone = /^0\d{2,3}-?\d{7,8}$/;
if(this.type == 1) {
if(this.$u.test.isEmpty(this.title)) {
this.$u.toast('发票抬头不可为空');
return false;
}
if(this.$u.test.isEmpty(this.personalPhone)) {
this.$u.toast('手机号不可为空');
return false;
}
if(!this.$u.test.mobile(this.personalPhone) && !phone.test(this.personalPhone)) {
this.$u.toast('请正确填写手机号');
return false;
}
if(this.$u.test.isEmpty(this.idCard)) {
this.$u.toast('身份证号不可为空');
return false;
}
if(!this.$u.test.idCard(this.idCard)) {
this.$u.toast('请正确填写身份证号');
return false;
}
} else {
if(this.$u.test.isEmpty(this.title)) {
this.$u.toast('发票抬头不可为空');
return false;
}
if(this.$u.test.isEmpty(this.taxNumber)) {
this.$u.toast('税号不可为空');
return false;
}
if(this.$u.test.isEmpty(this.address)) {
this.$u.toast('单位地址不可为空');
return false;
}
if(this.$u.test.isEmpty(this.companyPhone)) {
this.$u.toast('电话号码不可为空');
return false;
}
if(!this.$u.test.mobile(this.companyPhone) && !phone.test(this.companyPhone)) {
this.$u.toast('请正确填写电话号码');
return false;
}
if(this.$u.test.isEmpty(this.bankDeposit)) {
this.$u.toast('开户银行不可为空');
return false;
}
if(this.$u.test.isEmpty(this.bankAccounts)) {
this.$u.toast('银行账户不可为空');
return false;
}
}
return true;
},
invoiceAdd() {
if(!this.verificationParams()) return false;
let params = {};
this.type == 1
? params = {
invoice_type: 1,
invoice_title: this.title,
invoice_code: this.idCard,
invoice_rec_mobphone: this.personalPhone,
}
: params = {
invoice_type: 2,
invoice_title: this.title,
invoice_code: this.taxNumber,
invoice_goto_addr: this.address,
invoice_rec_mobphone: this.companyPhone,
invoice_reg_bname: this.bankDeposit,
invoice_reg_baccount: this.bankAccounts,
}
this.$u.api.invoiceAdd(params).then(res => {
if(res.errCode == 0) {
this.$refs.uToast.show({
title: res.message,
back: true
})
} else {
this.$u.toast(res.message);
}
})
},
invoiceEdit() {
if(!this.verificationParams()) return false;
let params = {};
this.type == 1
? params = {
invoice_id: this.invoice_id,
invoice_type: 1,
invoice_title: this.title,
invoice_code: this.idCard,
invoice_rec_mobphone: this.personalPhone,
}
: params = {
invoice_id: this.invoice_id,
invoice_type: 2,
invoice_title: this.title,
invoice_code: this.taxNumber,
invoice_goto_addr: this.address,
invoice_rec_mobphone: this.companyPhone,
invoice_reg_bname: this.bankDeposit,
invoice_reg_baccount: this.bankAccounts,
}
this.$u.api.invoiceEdit(params).then(res => {
if(res.errCode == 0) {
this.$refs.uToast.show({
title: res.message,
back: true
})
} else {
this.$u.toast(res.message);
}
})
},
getInvoiceInfo() {
this.$u.api.getInvoiceInfo({ invoice_id: this.invoice_id }).then(res => {
if(res.errCode == 0) {
const invoice = res.data;
if(res.data.invoice_type == 1) {
this.title = invoice.invoice_title;
this.personalPhone = invoice.invoice_rec_mobphone;
this.idCard = invoice.invoice_code;
this.type = invoice.invoice_type;
} else if(res.data.invoice_type == 2) {
this.title = invoice.invoice_title;
this.taxNumber = invoice.invoice_code;
this.address = invoice.invoice_goto_addr;
this.companyPhone = invoice.invoice_rec_mobphone;
this.bankDeposit = invoice.invoice_reg_bname;
this.bankAccounts = invoice.invoice_reg_baccount;
this.type = invoice.invoice_type;
}
}
})
},
radioGroupChange(e) {
this.type = e;
}
}
};
</script>
<style lang="scss" scoped>
.edit-invoice {
min-height: calc(100vh - var(--window-top));
background: #ECECEC;
.invoice-type {
height: 98rpx;
background: #FFFFFF;
margin-bottom: 2rpx;
padding: 35rpx 30rpx;
display: flex;
align-items: center;
.title {
font-size: 30rpx;
color: #333333;
width: 120rpx;
margin-right: 50rpx;
}
.u-radio-group {
flex: 1;
/deep/ .u-radio {
.u-radio__icon-wrap {
margin: 0 20rpx;
position: relative;
background-color: #DBDBDB;
&::before {
content: '';
position: absolute;
width: 29rpx;
height: 29rpx;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
border: 1rpx solid #DBDBDB;
border-radius: 50%;
}
}
.u-radio__icon-wrap--checked {
background-color: #FF780F;
&::before {
border-color: #FF780F;
}
}
.u-radio__icon-wrap--disabled {
border: none;
}
}
}
}
.info-item {
height: 98rpx;
background: #FFFFFF;
display: flex;
align-items: center;
margin-bottom: 2rpx;
padding: 35rpx 30rpx;
.title {
font-size: 30rpx;
color: #333333;
width: 120rpx;
margin-right: 50rpx;
}
> input {
flex: 1;
font-size: 28rpx;
}
}
.save-btn {
width: 690rpx;
height: 98rpx;
background: #FF780F;
border-radius: 49rpx;
font-size: 36rpx;
color: #FFFFFF;
margin: 120rpx auto 0;
line-height: 98rpx;
text-align: center;
}
}
</style>

123
pageE/more/MineInvoice.vue
View File

@@ -1,123 +0,0 @@
<template>
<view class="invoice">
<view class="invoice-container">
<view class="invoice-item" v-for="(item, index) in invoiceList" :key="index">
<view class="title">{{ item.invoice_type == 1 ? '个人发票' : '企业发票' }}</view>
<view class="code">{{ item.invoice_title }}</view>
<view class="tool">
<view class="tool-item" @click="edit(0, item.invoice_id)">
<image src="../static/mine/24.png"></image>
<text>编辑</text>
</view>
<view class="tool-item" @click="delInvoice(item.invoice_id)">
<image src="../static/mine/25.png"></image>
<text>删除</text>
</view>
</view>
</view>
</view>
<view class="invoice-btn" @click="edit(1)">添加发票抬头</view>
</view>
</template>
<script>
export default {
data() {
return {
invoiceList: [],
}
},
onShow() {
this.getInvoiceList();
},
methods: {
getInvoiceList() {
this.$u.api.getInvoiceList().then(res => {
this.invoiceList = res.data;
})
},
delInvoice(id) {
this.$u.api.invoiceDel({ invoice_id: id }).then(res => {
if(res.errCode == 0) this.getInvoiceList();
else this.$u.toast(res.message);
})
},
edit(action, invoice_id) {
this.$u.route('/pageE/more/EditInvoice', {
action: action, // 0 编辑 1 添加
invoice_id: invoice_id,
});
}
}
};
</script>
<style lang="scss" scoped>
.invoice {
min-height: calc(100vh - var(--window-top));
background: #ECECEC;
padding-top: 20rpx;
.invoice-container {
width: 690rpx;
margin: 0 auto;
.invoice-item {
margin-bottom: 20rpx;
background-color: #ffffff;
padding: 16rpx 20rpx;
border-radius: 10rpx;
.title {
font-size: 26rpx;
color: #666666;
margin-bottom: 16rpx;
}
.code {
font-size: 28rpx;
color: #333333;
position: relative;
padding: 30rpx 0;
&::after {
position: absolute;
content: '';
width: 100%;
height: 2rpx;
background-color: #ECECEC;
bottom: 0;
left: 0;
}
}
.tool {
padding-top: 18rpx;
display: flex;
align-items: center;
justify-content: flex-end;
.tool-item {
&:not(:last-child) {
margin-right: 30rpx;
}
> image {
width: 23rpx;
height: 23rpx;
margin-right: 14rpx;
}
> text {
font-size: 24rpx;
color: #999999;
}
}
}
}
}
.invoice-btn {
width: 690rpx;
height: 98rpx;
background: #FF780F;
border-radius: 49rpx;
font-size: 36rpx;
color: #FFFFFF;
line-height: 98rpx;
text-align: center;
position: absolute;
bottom: 40rpx;
left: 50%;
transform: translate(-50%, 0);
}
}
</style>

38
pageE/order/Comment.vue
View File

@@ -8,15 +8,14 @@
<view class="order-rate">
<view class="rate">
<view class="title">物流评分</view>
<u-rate :count="5" min-count="1" active-color="#FF780F" inactive-color="#CCCCCC" v-model="logistics" gutter="20" size="32"></u-rate>
<u-rate :count="5" active-color="#FF780F" inactive-color="#CCCCCC" v-model="logistics" gutter="20" size="32"></u-rate>
</view>
<view class="rate">
<view class="title">服务态度</view>
<u-rate :count="5" min-count="1" v-model="service" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
<u-rate :count="5" v-model="service" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
</view>
</view>
<view class="write-btn" @click="submitComment">发表意见</view>
<u-toast ref="uToast" />
</view>
</template>
<script>
@@ -27,14 +26,13 @@ export default {
return {
orderId: '',
count: 3, // 最大图片数量
logistics: 1, // 物流服务
service: 1, // 服务态度
logistics: 0, // 物流服务
service: 0, // 服务态度
describe: [],
content: [],
imageList: [], // 本地图片路径
goodsList: [],
uploadImageList: [], // 线上图片名字
debounce: true, // 防止多次提交
}
},
components: {
@@ -78,7 +76,7 @@ export default {
setModelKey(data) {
data.forEach(() => {
this.content.push('');
this.describe.push(1);
this.describe.push(0);
this.imageList.push([]);
})
},
@@ -125,28 +123,28 @@ export default {
})
},
verifyParams() {
let status = true;
this.goodsList.forEach((_, index) => {
if(this.$u.test.isEmpty(this.content[index])) {
this.$u.toast('内容不可为空');
status = false;
return false;
}
})
return status;
return true;
},
submitComment() {
// console.log(this.content);
// console.log(this.describe);
// console.log(this.imageList);
this.uploadImage();
// this.goodsList.forEach((_, index) => {
// })
},
addOrderEvaluate() {
if(!this.verifyParams()) return false;
if(!this.debounce) return false;
let files = [];
// console.log(this.uploadImageList);
this.uploadImageList.forEach((item, index) => {
// 赋默认值
files[index] = '';
// console.log(item);
item.forEach((img, idx) => {
@@ -163,21 +161,11 @@ export default {
scores_one: this.logistics,
scores_two: this.service,
scores_three: this.describe,
file: files,
};
if(files.length) {
Object.assign(params, { file: files })
}
// console.log(params);
console.log(params);
this.$u.api.updateOrderEvaluate(params).then(res => {
if(res.errCode == 0) {
this.$refs.uToast.show({
title: res.message,
back: true,
})
} else {
this.$u.toast(res.message);
this.debounce = true;
}
this.$u.toast(res.message);
})
},
},

187
pageE/order/Details.vue
View File

@@ -3,7 +3,7 @@
<view class="status" v-if="orderstate">
<view class="text">
<view class="status-text">{{ s_object[orderstate].text }}</view>
<!-- <view class="time" v-if="orderInfo.view_type == 1 || orderInfo.view_type == 9">距离结束：{{ countdown }}</view> -->
<view class="time" v-if="orderInfo.view_type == 1 || orderInfo.view_type == 9">距离结束：{{ countdown }}</view>
</view>
<image :src="s_object[orderstate].image"></image>
</view>
@@ -20,12 +20,12 @@
</view>
<view class="info-goods">
<view class="goods-store">
<view class="stoer-title" @click="viewStoreDetails(orderInfo.extend_store.store_id)">
<view class="stoer-title">
<image :src="orderInfo.extend_store.store_avatar" class="store-image"></image>
<view class="store-name">{{ orderInfo.extend_store.store_name }}</view>
<image src="../static/mine/21.png" class="right-icon"></image>
</view>
<view v-for="goods in orderInfo.extend_order_goods" :key="goods.goods_id" @click="viewGoodsDetails(goods.goods_id)">
<view v-for="goods in orderInfo.extend_order_goods" :key="goods.goods_id">
<view class="store-goods">
<image :src="goods.goods_image"></image>
<view class="goods-info">
@@ -59,35 +59,22 @@
<view class="title">支付方式</view>
<view class="price">{{ orderInfo.payment_name }}</view>
</view>
<view>
<view class="title">配送方式</view>
<view class="price">{{ orderInfo.member_deliver_type | getDeliverType(orderInfo.store_deliver_type) }}</view>
</view>
</view>
</view>
<view class="info-order">
<view v-if="orderInfo.extend_order_common.order_message">订单备注：{{ orderInfo.extend_order_common.order_message }}</view>
<view>订单编号：{{ orderInfo.order_sn }}</view>
<view>支付单号：{{ orderInfo.pay_sn }}</view>
<view>创建时间：{{ orderInfo.add_time | date}}</view>
<view v-if="orderInfo.member_deliver_type == 3" class="address">自提地址：{{ orderInfo.extend_store.store_address }}</view>
</view>
</view>
<!-- '4', '8' -->
<view class="btn" v-if="['1', '2', '4', '6'].indexOf(orderstate) >= 0">
<!-- orderstate == '4' || -->
<view class="cancel" v-if="(orderstate == '1' || orderstate == '4') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.member_deliver_type != 3" @click="toOtherPage('Logistics')">查看物流</view>
<view class="btn" v-if="['1', '2', '4', '6', '8'].indexOf(orderstate) >= 0">
<view class="cancel" v-if="(orderstate == '4' || orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
<view class="cancel" v-if="orderstate == '1'" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>
<view class="cancel" v-if="orderstate == '6'" @click="cancelOrder">取消支付</view>
<view class="phone" v-if="orderstate == '1' && orderInfo.takeawayer_mobile" @click="makePhone(orderInfo.takeawayer_mobile)">
<u-icon name="phone-fill" color="#FF780F" size="28"></u-icon>
<text>联系骑手</text>
</view>
<!-- || orderstate == '8' -->
<view class="payment" v-if="orderstate == '6'" @click="payNow">立即支付</view>
<view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view>
<view class="payment" v-if="orderstate == '6' || orderstate == '8'" @click="payNow">立即支付</view>
<view class="service" v-if="orderstate == '7'">联系官方客服</view>
<view class="submit" v-if="orderstate == '7'">提交官方审核</view>
</view>
@@ -97,6 +84,7 @@
export default {
data() {
return {
orderstate: '',
s_object: {
'1': {
text: '待收货',
@@ -115,7 +103,7 @@ export default {
image: '../static/mine/36.png',
},
'5': {
text: '商家已退款',
text: '已退款',
image: '../static/mine/34.png',
},
'6': {
@@ -130,23 +118,11 @@ export default {
text: '拼团中',
image: '../static/mine/37.png',
},
'9': {
text: '已取消',
image: '../static/mine/33.png',
},
'10': {
text: '商家已拒绝',
image: '../static/mine/34.png',
},
'11': {
text: '平台已退款',
image: '../static/mine/34.png',
},
},
orderInfo: {},
oid: '',
timer: '',
countdown: '00:00:00', // 倒计时
countdown: '', // 倒计时
isSpike: false, // 倒计时是否结束
}
},
@@ -162,45 +138,38 @@ export default {
beforeDestroy() {
clearInterval(this.timer);
},
filters: {
getDeliverType(user, store) {
let deliverType = '';
function setType(type) {
switch (type) {
case 1:
deliverType = '快递'
break;
case 2:
deliverType = '骑手'
break;
case 3:
deliverType = '自提'
break;
default:
deliverType = '-'
break;
}
}
setType(user);
if(store) {
setType(store);
}
return deliverType;
}
},
methods: {
viewStoreDetails(id) {
this.$u.route('pageC/merchant/index', {
id: id
});
},
viewGoodsDetails(id) {
this.$u.route({
url: 'pageB/sdetails/index',
params: {
id: id,
}
})
viewState(value) {
let state;
switch (value) {
case 1:
state = '6';
break;
case 2:
state = '4';
break;
case 3:
state = '1';
break;
case 4:
state = '2';
break;
case 5:
state = '3';
break;
case 6:
state = '7';
break;
case 7:
state = '5';
break;
case 9:
state = '8';
break;
default:
break;
}
this.orderstate = state;
},
setSpikeTime(time) {
// console.log(time);
@@ -236,12 +205,12 @@ export default {
this.$u.api.getOrderInfo({
order_id: id,
}).then(res => {
console.log(res)
if(res.errCode == 0) {
this.orderInfo = res.data;
this.viewState(this.orderInfo.view_type);
this.setTitle(this.orderInfo.view_type);
// if(res.data.view_type == 1) this.setSpikeTime(res.data.end_time);
// else if(res.data.view_type == 9) this.setSpikeTime(res.data.pintuangroup_endtime);
if(res.data.view_type == 1) this.setSpikeTime(res.data.end_time);
else if(res.data.view_type == 9) this.setSpikeTime(res.data.pintuangroup_endtime);
}
uni.stopPullDownRefresh(); // 结束刷新
})
@@ -257,10 +226,9 @@ export default {
},
confirmReceive() {
this.$u.api.confirmReceive({
order_id: this.orderInfo.order_id,
order_id: this.order.order_id,
}).then(res => {
if(res.errCode == 0) {
console.log(res,"确认支付")
this.getOrderInfo(this.oid);
}
this.$u.toast(res.message);
@@ -290,58 +258,9 @@ export default {
toOtherPage(url) {
this.$u.route('/pageE/order/' + url, {
oid: this.orderInfo.order_id,
type:this.orderInfo.view_type
});
},
makePhone(phone) {
uni.makePhoneCall({
phoneNumber: phone
});
}
},
computed:{
orderstate() {
let state;
switch (this.orderInfo.view_type) {
case 1:
state = '6';
break;
case 2:
state = '4';
break;
case 3:
state = '1';
break;
case 4:
state = '2';
break;
case 5:
state = '3';
break;
case 6:
state = '7';
break;
case 7:
state = '5';
break;
case 9:
state = '8';
break;
case 10:
state = '9';
break;
case 11:
state = '10';
break;
case 12:
state = '11';
break;
default:
break;
}
return state;
},
}
};
</script>
<style lang="scss" scoped>
@@ -500,9 +419,6 @@ export default {
> view:not(:last-child) {
margin-bottom: 30rpx;
}
.address {
line-height: 40rpx;
}
}
}
.btn {
@@ -516,7 +432,7 @@ export default {
justify-content: flex-end;
padding: 19rpx 30rpx;
@mixin btn-class($width, $color) {
// width: $width;
width: $width;
height: 60rpx;
border: 2rpx solid $color;
color: $color;
@@ -539,15 +455,6 @@ export default {
.submit {
@include btn-class($width: 216rpx, $color: rgba(255,119,15,1));
}
.phone {
@include btn-class($width: 206rpx, $color: rgba(255,119,15,1));
display: flex;
align-items: center;
justify-content: center;
.u-icon {
margin-right: 10rpx;
}
}
}
}
</style>

57
pageE/order/Index.vue
View File

@@ -1,19 +1,20 @@
<template>
<view class="order">
<view>
<!-- <u-tabs-swiper ref="tabs" :list="list" active-color="#FF780F" :current="current" font-size="26" @change="tabsChange" height="88" :gutter="30"></u-tabs-swiper> -->
<u-tabs :list="list" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="26" :gutter="20" inactive-color="#333333"></u-tabs>
</view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
<swiper-item class="swiper-item" v-for="(item, index) in list" :key="index">
<scroll-view scroll-y style="height: 100%;" @scrolltolower="reachBottom" class="order-scroll">
<view v-if="orderList[index]">
<view class="item-container" v-for="(order,index) in orderList[index]" :key="index">
<view class="item-container" v-for="order in orderList[index]" :key="order.order_id">
<OrderItem :order="order" @refreshOrderList="refreshOrderList" v-if="current != 4"></OrderItem>
<TryOrderItem :order="order" @refreshOrderList="refreshOrderList" v-else></TryOrderItem>
</view>
</view>
<u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList[index] || !orderList[index].length"></u-empty>
<u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" font-size="14" margin-bottom="20" v-if="current != 4 && (orderList[index] && orderList[index].length>3)" class="order-loadmore"></u-loadmore>
<u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" margin-bottom="20" v-if="current != 4 && (!orderList[index] || orderList[index].length>3)" class="order-loadmore"></u-loadmore>
</scroll-view>
</swiper-item>
</swiper>
@@ -37,15 +38,15 @@ export default {
name: '试穿试送'
},{
name: '拼团中'
}, {
name: '待评价'
}, {
name: '售后'
}, {
name: '待评价'
}],
orderList: [],
loadStatus: ['loadmore','loadmore','loadmore','loadmore','loadmore','loadmore','loadmore','loadmore'],
page: 0,
current: 0,
current: Number,
swiperCurrent: 0,
swiperHeight: '',
timer: true,
@@ -78,8 +79,8 @@ export default {
},
// 下拉刷新
onPullDownRefresh() {
this.refreshOrderList();
},
this.refreshOrderList();
},
methods: {
setOrderType() {
let type;
@@ -100,10 +101,10 @@ export default {
type = 9; // 拼团中
break;
case 6:
type = 4; // 待评价
type = 8; // 售后
break;
case 7:
type = 8; // 售后
type = 4; // 待评价
break;
default:
type = -1;
@@ -129,29 +130,13 @@ export default {
page: this.page,
type: type,
})
// res.data.forEach(element => {
// element.extend_order_goods.forEach(i=>{
// // console.log(i)
// })
// });
this.timer = true;
uni.stopPullDownRefresh(); // 结束刷新
if(res.errCode == 0) {
if(load == 'reload'){
this.orderList[this.current] = []
this.orderList[this.current] = res.data;
}else if(load == 'loadmore'){
this.orderList[this.current].push(...res.data);
}
if(load == 'reload') this.orderList[this.current] = res.data;
else if(load == 'loadmore') this.orderList[this.current].push(...res.data);
}
// this.orderList[this.current].forEach(element => {
// element.extend_order_goods.forEach(i=>{
// // console.log(i)
// })
// });
this.$forceUpdate();
// console.log(this.orderList);
return res.data.length;
},
@@ -172,16 +157,11 @@ export default {
const res = await this.$u.api.goodsTryOrderList({
page: this.page,
})
console.log(res)
uni.stopPullDownRefresh(); // 结束刷新
this.timer = true;
if(res.errCode == 0) {
if(load == 'reload') {
this.orderList[this.current] = []
this.orderList[this.current] = res.data.list;
}else if(load == 'loadmore'){
this.orderList[this.current].push(...res.data.list);
}
if(load == 'reload') this.orderList[this.current] = res.data.list;
else if(load == 'loadmore') this.orderList[this.current].push(...res.data.list);
}
this.$forceUpdate();
return res.data.list.length;
@@ -195,8 +175,8 @@ export default {
let promise;
// if(this.current == 6) promise = this.getAfterSaleList();
// else
if(this.current == 4) promise = this.goodsTryOrderList();
else promise = this.getOrderList();
// if(this.current == 4) promise = this.goodsTryOrderList();
promise = this.getOrderList();
promise.then(length => {
this.loadStatus.splice(this.current, 1, "nomore");
if(length == 0) this.page--;
@@ -215,8 +195,8 @@ export default {
this.current = current;
},
setViewHeight() {
const res = uni.getSystemInfoSync();
this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
const sys = uni.getSystemInfoSync();
this.swiperHeight = sys.windowHeight - 88 / 2 + 'px';
},
}
};
@@ -227,7 +207,6 @@ export default {
background-color: #ECECEC;
display: flex;
flex-direction: column;
overflow: hidden;
.swiper-item {
.order-scroll {
.item-container {

Some files were not shown because too many files have changed in this diff Show More