wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

Browse Source
version/0412
fanfan 1 year ago
parent 9ea410b5dc 308839a66f
commit d2057121e1
14 changed files with 138 additions and 70 deletions
  1. 1
      config.js
  2. 1
      core/config/defaultConfig.js
  3. 6
      manifest.json
  4. 1
      pages.json
  5. 15
      pages/news/recycling/confirm1.vue
  6. 9
      pages/news/recycling/detail.vue
  7. 43
      pages/news/recycling/timer.vue
  8. 3
      pages/news1/setting.vue
  9. 20
      pages/order/detail.vue
  10. 12
      pages/order/refund/index.vue
  11. 9
      pages/order/refund/refund.vue
  12. 66
      pages/refund/detail.vue
  13. 14
      pages/user/index.vue
  14. 8
      pages/user/vip/goods.vue

1
config.js
Unescape View File

@ -15,6 +15,7 @@ export default {
* 可在超管后台-商城列表中查看10025 * 可在超管后台-商城列表中查看10025
*/ */
storeId: 10001, storeId: 10001,
// storeId: 10037,
/** /**

1
core/config/defaultConfig.js
Unescape View File

@ -16,6 +16,7 @@ export default {
* 可在超管后台-商城列表中查看 * 可在超管后台-商城列表中查看
*/ */
storeId: 10001, storeId: 10001,
// storeId: 10037,
/** /**
* 是否启用商城设置缓存 * 是否启用商城设置缓存

6
manifest.json
Unescape View File

@ -1,7 +1,7 @@
{ {
"name" : "惠云商", "name" : "装小易",
"appid" : "__UNI__1D774AF", "appid" : "__UNI__1D774AF",
"description" : "慧云商是一款提供家电，3C数码，家装建材为一体的批发采购平台，一站式解决找货方案，简化采购流程", "description" : "装采要省力，就找装小易！ —— 家装工厂供应链对接平台",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : 1, "versionCode" : 1,
"transformPx" : false, "transformPx" : false,
@ -92,7 +92,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wx68d198de972a9e9d", "appid" : "wxd87b1a7332d974d0",
"libVersion" : "latest", "libVersion" : "latest",
"setting" : { "setting" : {
// 是否检查安全域名和 TLS 版本 // 是否检查安全域名和 TLS 版本

1
pages.json
Unescape View File

@ -723,7 +723,6 @@
"path": "recycling/timer", "path": "recycling/timer",
"style": { "style": {
"navigationBarTitleText": "选择时间", "navigationBarTitleText": "选择时间",
"navigationStyle": "custom",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },

15
pages/news/recycling/confirm1.vue
Unescape View File

@ -66,7 +66,7 @@
<view class="a">服务时间</view> <view class="a">服务时间</view>
<view class="b" @click="openPage(3)"> <view class="b" @click="openPage(3)">
<view class="select" :class="obj.server_time?'select-on':''"> <view class="select" :class="obj.server_time?'select-on':''">
{{obj.server_time?obj.server_time:(tabIndex <= 1?'请选择预约到店时间':'请选择预计寄出商品的时间')}} {{obj.server_time?obj.server_time:(obj.server_time?'请选择预约到店时间':'请选择预计寄出商品的时间')}}
</view> </view>
<u-icon style="margin-left: 10rpx;" color="#8B8B8B" name="arrow-right"></u-icon> <u-icon style="margin-left: 10rpx;" color="#8B8B8B" name="arrow-right"></u-icon>
</view> </view>
@ -235,6 +235,13 @@
this.getOrderDetail(op.order_id) this.getOrderDetail(op.order_id)
} }
}, },
onShow() {
if(uni.getStorageSync("yuyueTime").time){
this.obj.server_time = uni.getStorageSync("yuyueTime").time
}else{
this.obj.server_time = ""
}
},
methods: { methods: {
radioChange(e) { radioChange(e) {
this.sexValue = e this.sexValue = e
@ -344,7 +351,10 @@
}); });
} }
if (i == 3) { //服务事件 if (i == 3) { //服务事件
this.show = true // this.show = true
uni.navigateTo({
url: "/pages/news/recycling/timer?type=1&shop_id="+this.storeInfo.shop_id
})
} }
if (i == 4) { //提交 if (i == 4) { //提交
if (this.source == 2) { if (this.source == 2) {
@ -462,6 +472,7 @@
} }
}, },
onLook() { onLook() {
uni.removeStorageSync("yuyueTime")
uni.redirectTo({ uni.redirectTo({
url: "/pages/news/recycling/recoveryList" url: "/pages/news/recycling/recoveryList"
}) })

9
pages/news/recycling/detail.vue
Unescape View File

@ -138,14 +138,13 @@
console.log(info.content) console.log(info.content)
} }
this.info = info; this.info = info;
this.type = o.type this.type = o.type;
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: o.type == 1 ? "服务详情" : '旧物回收' title: o.type == 1 ? "服务详情" : '旧物回收'
}) })
}, },
onShow() { onShow() {
if (uni.getStorageSync("AccessToken")) { if (uni.getStorageSync("userInfo").user_id) {
this.getList() this.getList()
this.userInfo = uni.getStorageSync("userInfo"); this.userInfo = uni.getStorageSync("userInfo");
this.isToken = true; this.isToken = true;
@ -153,6 +152,7 @@
this.userInfo = {} this.userInfo = {}
this.isToken = false; this.isToken = false;
} }
uni.removeStorageSync("yuyueTime")
}, },
methods: { methods: {
@ -269,6 +269,7 @@
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
padding-bottom: 30rpx;
&-hd { &-hd {
padding: 30rpx 60rpx; padding: 30rpx 60rpx;
position: relative; position: relative;

43
pages/news/recycling/timer.vue
Unescape View File

@ -30,14 +30,16 @@
tabIndex: 0, tabIndex: 0,
dataList: [], dataList: [],
timeList: [], timeList: [],
infor: '', infor: {},
time: '' time: '',
type: 3
} }
}, },
onLoad(op) { onLoad(op) {
if(op.infor){ if(op.infor){
this.infor = op.infor ? JSON.parse(decodeURIComponent(op.infor)) : '' this.infor = op.infor ? JSON.parse(decodeURIComponent(op.infor)) : ''
} }
this.type = op.type?op.type:""
this.getstopTimes(op.shop_id) this.getstopTimes(op.shop_id)
}, },
methods: { methods: {
@ -49,6 +51,13 @@
}) })
return return
} }
if(this.type == 1){
uni.setStorageSync("yuyueTime",this.infor.yuyueTime)
uni.navigateBack({
delta: 1
})
return ;
}
let { let {
status, status,
message, message,
@ -64,6 +73,7 @@
* 时间 * 时间
*/ */
async getstopTimes(shop_id) { async getstopTimes(shop_id) {
const that = this;
let { let {
status, status,
message, message,
@ -72,14 +82,41 @@
shop_id: shop_id shop_id: shop_id
}); });
if (status == 200) { if (status == 200) {
let arr = []
if(data && data.length> 0){
data.map(a=>{
if(a.list && a.list.length > 0){
a.list.map(b=>{
b.date = a.date
})
}
})
}
if(this.type == 1 && uni.getStorageSync("yuyueTime").time){
if(data && data.length> 0){
data.map((a,idx)=>{
if(a.date == uni.getStorageSync("yuyueTime").date){
that.tabIndex = idx
}
if(a.list && a.list.length > 0){
a.list.map((b,idx1)=>{
if(b.value == uni.getStorageSync("yuyueTime").value){
that.tabIndex1 = idx1
}
})
}
})
}
}
this.dataList = data; this.dataList = data;
this.timeList = data[0].list this.timeList = data[this.tabIndex].list
} }
}, },
tabItem1(i, item) { tabItem1(i, item) {
this.tabIndex1 = i this.tabIndex1 = i
this.time = item.value this.time = item.value
this.infor.server_time = item.time this.infor.server_time = item.time
this.infor.yuyueTime = item
}, },
tabItem(index, item) { tabItem(index, item) {
this.tabIndex = index; this.tabIndex = index;

3
pages/news1/setting.vue
Unescape View File

@ -205,8 +205,7 @@ export default {
title: '退出成功', title: '退出成功',
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
uni.clearStorage()
uni.clearStorageSync() uni.clearStorageSync()
setTimeout(function () { setTimeout(function () {
uni.navigateBack({ uni.navigateBack({

20
pages/order/detail.vue
Unescape View File

@ -126,18 +126,18 @@
<view class="goodsNum"> <view class="goodsNum">
x{{ goods.total_num }} x{{ goods.total_num }}
</view> </view>
<view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_goods_id,goods,order)" <!-- <view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_goods_id,goods,order)"
v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"> v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
退款 退款
</view> </view> -->
<view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_goods_id,goods,order)" <view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_goods_id,goods,order)"
v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value && order.delivery_status == DeliveryStatusEnum.DELIVERED.value"> v-if="order.isAllowRefund && order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
退款 售后
</view> </view>
<view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_goods_id,goods,order)" <!-- <view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_goods_id,goods,order)"
v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.receipt_status == ReceiptStatusEnum.RECEIVED.value && order.delivery_status == DeliveryStatusEnum.DELIVERED.value"> v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.receipt_status == ReceiptStatusEnum.RECEIVED.value && order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
换货 换货
</view> </view> -->
</view> </view>
</view> </view>
<view class="fd"> <view class="fd">
@ -558,14 +558,14 @@
// 跳转到门店详情页 // 跳转到门店详情页
handleTargetExtract(shopId) { handleTargetExtract(shopId) {
this.$navTo('/pages/shop/detail', { this.$navTo('pages/shop/detail', {
shopId shopId
}) })
}, },
// 跳转到物流跟踪页面 // 跳转到物流跟踪页面
handleTargetExpress() { handleTargetExpress() {
this.$navTo('/pages/order/express/index', { this.$navTo('pages/order/express/index', {
orderId: this.orderId orderId: this.orderId
}) })
}, },
@ -674,14 +674,14 @@
}, },
// 点击去支付 // 点击去支付
onPay(orderId) { onPay(orderId) {
this.$navTo('/pages/checkout/cashier/index', { this.$navTo('pages/checkout/cashier/index', {
orderId orderId
}) })
}, },
// 跳转到订单评价页 // 跳转到订单评价页
handleTargetComment(orderId) { handleTargetComment(orderId) {
this.$navTo('/pages/order/comment/index', { this.$navTo('pages/order/comment/index', {
orderId orderId
}) })
}, },

12
pages/order/refund/index.vue
Unescape View File

@ -4,7 +4,7 @@
<view class="a"> <view class="a">
<image class="pic" :src="order.goods_image"></image> <image class="pic" :src="order.goods_image"></image>
<view class="n">出柜：已签收，签收人凭取取件码..</view> <view class="n">出柜：已签收，签收人凭取取件码..</view>
<image class="arrow" src="/static/news/icon-arrow.png"></image> <image class="arrow" :src="$picUrl+'/static/news/icon-arrow.png'"></image>
</view> </view>
<view class="b" @click="openPage(4)"> <view class="b" @click="openPage(4)">
退货运费规则 退货运费规则
@ -17,22 +17,22 @@
<view class="info"> <view class="info">
<view class="a">我要退货退款</view>已收到货，需要退还已收到的货物 <view class="a">我要退货退款</view>已收到货，需要退还已收到的货物
</view> </view>
<image class="arrow" src="/static/news/icon-arrow.png"></image> <image class="arrow" :src="$picUrl+'/static/news/icon-arrow.png'"></image>
</view> </view>
<view class="item" @click="openPage(2)"> <view class="item" @click="openPage(2)">
<image class="icon" :src="$picUrl+'/static/news/icon-refund-03.png'"></image> <image class="icon" :src="$picUrl+'/static/news/icon-refund-03.png'"></image>
<view class="info"> <view class="info">
<view class="a">我要退款（无需退货）</view>未收到货，或与商家协商之后申请 <view class="a">我要退款（无需退货）</view>未收到货，或与商家协商之后申请
</view> </view>
<image class="arrow" src="/static/news/icon-arrow.png"></image> <image class="arrow" :src="$picUrl+'/static/news/icon-arrow.png'"></image>
</view> </view>
<view class="item" @click="openPage(3)"> <!-- <view class="item" @click="openPage(3)">
<image class="icon" :src="$picUrl+'/static/news/icon-refund-03.png'"></image> <image class="icon" :src="$picUrl+'/static/news/icon-refund-03.png'"></image>
<view class="info"> <view class="info">
<view class="a">我要换货</view>对收到的商品不满意，可与商家协商换货 <view class="a">我要换货</view>对收到的商品不满意，可与商家协商换货
</view> </view>
<image class="arrow" src="/static/news/icon-arrow.png"></image> <image class="arrow" src="/static/news/icon-arrow.png"></image>
</view> </view> -->
</view> </view>
</view> </view>
</template> </template>
@ -64,7 +64,7 @@
}) })
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '/pages/order/refund/refund?orderId=' + this.orderId + '&order=' + JSON.stringify(this url: '/pages/order/refund/refund?type='+index+'&orderId=' + this.orderId + '&order=' + JSON.stringify(this
.order) + .order) +
"&deliveryStatus=" + this.deliveryStatus + '&receiptStatus=' + this.deliveryStatus "&deliveryStatus=" + this.deliveryStatus + '&receiptStatus=' + this.deliveryStatus
}) })

9
pages/order/refund/refund.vue
Unescape View File

@ -14,7 +14,7 @@
<view class="item"> <view class="item">
<view class="l">申请类型</view> <view class="l">申请类型</view>
<view class="r"> <view class="r">
{{((deliveryStatus == DeliveryStatusEnum.DELIVERED.value) && (receiptStatus == ReceiptStatusEnum.RECEIVED.value))?'我要退款（需退货)':'我要退款（无需退货)'}} {{type==1?'我要退货退款':'我要退款（无需退货)'}}
</view> </view>
</view> </view>
@ -138,7 +138,8 @@
maxImageLength: 6, maxImageLength: 6,
imagesId: '', imagesId: '',
action: '', action: '',
header: '', header: '',
type: 1,
} }
}, },
onReady() { onReady() {
@ -151,6 +152,7 @@
}, },
onLoad(op) { onLoad(op) {
this.deliveryStatus = op.deliveryStatus; this.deliveryStatus = op.deliveryStatus;
this.type = op.type;
this.receiptStatus = op.receiptStatus; this.receiptStatus = op.receiptStatus;
this.orderId = op.orderId this.orderId = op.orderId
this.order = op.order ? JSON.parse(op.order) : ''; this.order = op.order ? JSON.parse(op.order) : '';
@ -233,8 +235,7 @@
} }
app.isLoading = true; app.isLoading = true;
let obj = { let obj = {
type: (app.deliveryStatus == DeliveryStatusEnum.DELIVERED.value) && (app.receiptStatus == type: app.type == 1? 10 : 30,
ReceiptStatusEnum.RECEIVED.value) ? 20 : 10,
content: app.contentNotes, content: app.contentNotes,
images: app.imagesId, images: app.imagesId,
phone: app.phone, phone: app.phone,

66
pages/refund/detail.vue
Unescape View File

@ -57,7 +57,7 @@
<text>售后类型：</text> <text>售后类型：</text>
</view> </view>
<view class="flex-box"> <view class="flex-box">
<text>{{ RefundTypeEnum[detail.type].name }}</text> <text>{{ detail.type == 30?'退款':'退货' }}</text>
</view> </view>
</view> </view>
<view class="detail-refund__row dis-flex"> <view class="detail-refund__row dis-flex">
@ -116,37 +116,39 @@
</view> </view>
<!-- 商家收货地址 --> <!-- 商家收货地址 -->
<view v-if="detail.audit_status == AuditStatusEnum.REVIEWED.value" class="detail-address b-f m-top20"> <template v-if="detail.address && detail.address.name">
<view class="detail-address__row address-title"> <view v-if="detail.audit_status == AuditStatusEnum.REVIEWED.value" class="detail-address b-f m-top20">
<text class="col-m">商家退货地址</text> <view class="detail-address__row address-title">
</view> <text class="col-m">商家退货地址</text>
<view class="detail-address__row address-details"> </view>
<view class="address-details__row"> <view class="detail-address__row address-details">
<text>收货人：{{ detail.address.name }}</text> <view class="address-details__row">
</view> <text>收货人：{{ detail.address.name }}</text>
<view class="address-details__row"> </view>
<text>联系电话：{{ detail.address.phone }}</text> <view class="address-details__row">
</view> <text>联系电话：{{ detail.address.phone }}</text>
<view class="address-details__row dis-flex"> </view>
<view class="text"> <view class="address-details__row dis-flex">
<text>详细地址：</text> <view class="text">
</view> <text>详细地址：</text>
<view class="address flex-box"> </view>
<text class="region" v-for="(region, idx) in detail.address.region" <view class="address flex-box">
:key="idx">{{ region }}</text> <text class="region" v-for="(region, idx) in detail.address.region"
<text class="detail">{{ detail.address.detail }}</text> :key="idx">{{ region }}</text>
</view> <text class="detail">{{ detail.address.detail }}</text>
</view> </view>
</view> </view>
<view class="detail-address__row address-tips"> </view>
<view class="f-26 col-9"> <view class="detail-address__row address-tips">
<text>· 未与卖家协商一致情况下，请勿寄到付或平邮</text> <view class="f-26 col-9">
</view> <text>· 未与卖家协商一致情况下，请勿寄到付或平邮</text>
<view class="f-26 col-9"> </view>
<text>· 请填写真实有效物流信息</text> <view class="f-26 col-9">
</view> <text>· 请填写真实有效物流信息</text>
</view> </view>
</view> </view>
</view>
</template>
<!-- 填写物流信息 --> <!-- 填写物流信息 -->
<form <form

14
pages/user/index.vue
Unescape View File

@ -599,7 +599,19 @@
} }
}, },
onShow(options) { onShow(options) {
this.onRefreshPage() if(uni.getStorageSync("userInfo").user_id){
this.onRefreshPage()
}else{
this.userInfo = {}
this.isLogin = false
this.actionCountsInfo={}
this.orderTodoInfo={
distribution_order: {},
goods_order: {},
service_order: {},
recovery_order: {}
}
}
this.getSuggest(); this.getSuggest();
}, },
onPageScroll(e) { onPageScroll(e) {

8
pages/user/vip/goods.vue
Unescape View File

@ -367,9 +367,13 @@
.title { .title {
padding: 10rpx 0; padding: 10rpx 0;
line-height: 40rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: PingFang SC, PingFang SC; display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
-webkit-line-clamp: 2;
height: 90rpx;
line-height: 45rpx;
font-weight: 400; font-weight: 400;
color: #1E1E1E; color: #1E1E1E;

Write Preview
Loading…
Cancel
Save