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

Compare commits

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

17 Commits
dd5db56bf8 ... 5bca242f28

Author SHA1 Message Date
luyuan
5bca242f28 Merge pull request '修复抖动' (#351) from xbx into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/351
 2020-09-07 15:48:14 +08:00
hansu
b482369760 Merge pull request '增加试穿规格' (#349) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/349
 2020-09-07 14:50:20 +08:00
ghusermoon
dcea9608af 增加试穿规格 2020-09-07 14:47:54 +08:00
hansu
f65e2e9830 Merge pull request '修改配送方式' (#348) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/348
 2020-09-07 11:42:43 +08:00
ghusermoon
2ad46ce2a1 修改配送方式 2020-09-07 11:32:52 +08:00
hansu
e0abb14315 Merge pull request '修改评论的图片显示' (#347) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/347
 2020-09-07 10:13:54 +08:00
ghusermoon
57534ef7fc 修改评论的图片显示 2020-09-07 10:11:52 +08:00
gyh
50c88a9f60 Merge pull request 'gdpaoup' (#346) from gyh into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/346
 2020-09-05 19:54:00 +08:00
hansu
80461f7345 Merge pull request '申请发票验证身份证号' (#345) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/345
 2020-09-05 17:36:26 +08:00
ghusermoon
1a4f1f7edf 申请发票验证身份证号 2020-09-05 17:35:33 +08:00
hansu
ba3717cd73 Merge pull request '送洗切换申请表返回' (#344) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/344
 2020-09-05 17:17:25 +08:00
ghusermoon
aecc65cbc6 送洗切换申请表返回 2020-09-05 17:16:12 +08:00
Gdpao
87f3517729 gdpaoup 2020-09-05 17:11:13 +08:00
hansu
ed3a83c00e Merge pull request '预览店铺执照' (#343) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/343
 2020-09-05 17:09:36 +08:00
ghusermoon
63298679cf 预览店铺执照 2020-09-05 17:07:55 +08:00
gyh
273d984ea6 Merge pull request 'gdpao' (#342) from gyh into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/342
 2020-09-05 16:35:07 +08:00
Gdpao
cf71c2ba66 gdpao 2020-09-05 12:32:58 +08:00
15 changed files with 87 additions and 39 deletions
Show Stats Expand all files Collapse all files

12
common/api/shop.js
View File

@ -139,17 +139,9 @@ export default {
});
},
// 订单步骤2：发起订单，返回订单信息
sendOrder({ ifcart, cart_id, address_id, buy_city_id, pintuan_id, pintuangroup_id, voucher_id, is_selfraising, invoice_id }) {
sendOrder({ ifcart, cart_id, address_id, buy_city_id, pintuan_id, pintuangroup_id, voucher_id, member_deliver_type, invoice_id }) {
return vm.$u.post('buy/buy_step2', {
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, // 优惠券信息
is_selfraising: is_selfraising, // 是否自提
invoice_id: invoice_id,
ifcart, cart_id, address_id, buy_city_id, pintuan_id, pintuangroup_id, voucher_id, member_deliver_type, invoice_id,
});
},
// 订单步骤3：发起支付（第三方统一下单）

2
components/comment/index.vue
View File

@ -9,7 +9,7 @@
<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)"></image>
<image :src="src" v-for="(src, index) in content.geval_image" :key="index" @click="previewImage(content.geval_image, index)" mode="aspectFit"></image>
</view>
<view class="reply" v-if="reply && content.geval_explain">
<view class="title">掌柜回复：</view>

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

@ -25,7 +25,7 @@
<view class="order-btn" v-if="[1, 2, 3, 4, 8, 11].indexOf(order.view_type) >= 0">
<!-- || order.view_type == 2 -->
<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.is_selfraising != 1" @click="toOtherPage('Logistics')">查看物流</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="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>
@ -67,7 +67,6 @@ export default {
}
},
methods: {
cancelOrder() {
this.$u.api.cancelOrder({
order_id: this.order.order_id,

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

@ -12,9 +12,7 @@
<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.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-sku u-line-1" v-if="order.goods_spec">{{ order.goods_spec | concatSpec }}</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>
@ -38,7 +36,18 @@ export default {
created() {
this.viewState();
},
filters: {},
filters: {
concatSpec(value) {
let spec = '';
for (const key in value) {
if (value.hasOwnProperty(key)) {
const element = value[key];
spec = spec + element + ';'
}
}
return spec;
}
},
methods: {
// "goods_try_order_status": 0, 试穿订单状态 0:待处理订单 20:同意 40:拒绝此订单 50:完成
viewState() {
@ -131,6 +140,7 @@ export default {
line-height: 38rpx;
}
.goods-sku {
align-self: baseline;
max-width: 230rpx;
background: rgba(236,236,236,1);
border-radius: 6rpx;

6
manifest.json
View File

@ -108,9 +108,9 @@
"splashscreen" : {
"androidStyle" : "default",
"android" : {
"hdpi" : "static/app/start/480x762.PNG",
"xhdpi" : "static/app/start/720x1242.PNG",
"xxhdpi" : "static/app/start/1080x1882.PNG"
"hdpi" : "static/app/start/480x762.png",
"xhdpi" : "static/app/start/720x1242.png",
"xxhdpi" : "static/app/start/1080x1882.png"
},
"iosStyle" : "storyboard",
"ios" : {

5
pageB/sdetails/index.vue
View File

@ -1202,9 +1202,10 @@ export default {
background-color: #fff;
display: flex;
position: fixed;
height: 98rpx;
width: 100%;
bottom:0;
bottom: 0;
left: 0;
padding-bottom: env(safe-area-inset-bottom);
// border-top: 1rpx solid #ececec;
z-index: 10076;
.navs{

12
pageC/cart/ConfirmOrder.vue
View File

@ -48,7 +48,7 @@
</view>
</view>
</view>
<view class="pick-up" v-if="is_selfraising == 1">
<view class="pick-up" v-if="delivery.type == 3">
<view class="title">自提地址</view>
<view class="content">{{ orderInfo.store_list[index].store_address }}</view>
</view>
@ -120,18 +120,22 @@ export default {
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,
@ -141,7 +145,6 @@ export default {
goodsClass: [],
orderType: '', // 订单类型 1 普通订单 2 拼团订单 3 秒杀订单 4 优惠券 5 购物车订单
debounce: true,
is_selfraising: 0, // 是否自提：0=》否，1=》是
hasInvoice: 0,
}
},
@ -276,7 +279,7 @@ export default {
cart_id: id,
address_id: this.addressInfo.address_id,
buy_city_id: this.addressInfo.city_id,
is_selfraising: this.is_selfraising,
member_deliver_type: this.delivery.type,
invoice_id: this.$store.getters.getInvoiceId, // 发票抬头ID，不开票传0
}
if(coupon.length) Object.assign(params, { voucher_id: coupon });
@ -413,7 +416,6 @@ export default {
this.getFreight();
}
if(index == 2) {
this.is_selfraising = 1;
for (const key in this.freight) {
if (this.freight.hasOwnProperty(key)) {
this.freight[key] = '0.00';
@ -421,8 +423,6 @@ export default {
}
this.setTotalPrice(); // 计算总价
this.delivery = this.deliveryList[index];
} else {
this.is_selfraising = 0;
}
if(index == 0) {
this.delivery = this.deliveryList[index];

11
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"></image>
<image :src="info.business_licence_number_electronic" @click="previewImage(info.business_licence_number_electronic)"></image>
</view>
</view>
</view>
@ -42,6 +42,15 @@ export default {
// console.log(res)
this.info = res.data
})
},
methods: {
previewImage(urls) {
// console.log(urls);
const imageList = [urls];
uni.previewImage({
urls: imageList,
});
},
}
};
</script>

11
pageC/merchant/index.vue
View File

@ -53,7 +53,7 @@
<goods :sid="sid"></goods>
</view>
</view>
<view class="tabbar">
<view class="tabbar" :style="safeareaStyle">
<view @click="switchCurrent(0)">
<image src="/static/image/shop/9.png"></image>
<view>商品分类</view>
@ -94,6 +94,7 @@ export default {
page: 1,
scrollHeiht: '',
paddingTop: 0,
safeareaStyle: "", // 苹果底部
}
},
components:{
@ -125,6 +126,10 @@ export default {
this.getArticlelist();
this.setViewHeight();
// this.getStoreImgVideoList();
// #ifdef APP-PLUS
this.device = uni.getSystemInfoSync(); // 获取信息
console.log(this.device.safeArea);
// #endif
},
onShow() {
this.cur = 0;
@ -398,14 +403,14 @@ body {
.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
pageD/notice/info.vue
View File

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

4
pageE/more/EditInvoice.vue
View File

@ -108,6 +108,10 @@ export default {
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('发票抬头不可为空');

34
pageE/order/Details.vue
View File

@ -59,9 +59,9 @@
<view class="title">支付方式</view>
<view class="price">{{ orderInfo.payment_name }}</view>
</view>
<view v-if="orderInfo.is_selfraising == 1">
<view>
<view class="title">配送方式</view>
<view class="price">自提</view>
<view class="price">{{ orderInfo.member_deliver_type | getDeliverType(orderInfo.store_deliver_type) }}</view>
</view>
</view>
</view>
@ -69,7 +69,7 @@
<view>订单编号：{{ orderInfo.order_sn }}</view>
<view>支付单号：{{ orderInfo.pay_sn }}</view>
<view>创建时间：{{ orderInfo.add_time | date}}</view>
<view v-if="orderInfo.is_selfraising == 1" class="address">自提地址：{{ orderInfo.extend_store.store_address }}</view>
<view v-if="orderInfo.member_deliver_type == 3" class="address">自提地址：{{ orderInfo.extend_store.store_address }}</view>
</view>
</view>
<!-- '4', '8' -->
@ -77,7 +77,7 @@
<!-- orderstate == '4' || -->
<view class="cancel" v-if="(orderstate == '1') && 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.is_selfraising != 1" @click="toOtherPage('Logistics')">查看物流</view>
<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.member_deliver_type != 3" @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>
@ -157,6 +157,32 @@ 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', {

4
pageE/order/Index.vue
View File

@ -132,7 +132,7 @@ export default {
console.log(load)
res.data.forEach(element => {
element.extend_order_goods.forEach(i=>{
console.log(i)
// console.log(i)
})
});
this.timer = true;
@ -148,7 +148,7 @@ export default {
}
this.orderList[this.current].forEach(element => {
element.extend_order_goods.forEach(i=>{
console.log(i)
// console.log(i)
})
});
this.$forceUpdate();

2
pageE/tool/SendWash.vue
View File

@ -117,6 +117,8 @@ export default {
uni.navigateTo({
url: '/pageE/tool/WashOrder'
});
this.current = 0;
this.swiperCurrent = 0;
this.showPopup = false;
}
}

BIN
static/app/start/.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB