mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

评论 、生产 、以及供应界面加入小程序修改

Browse Source
This commit is contained in:
jia 2023-10-07 19:16:47 +08:00
parent 3918c3bbbf
commit 574c7caa2e
8 changed files with 130 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
pages/chat/customer_list/chat.vue
View File

@ -53,7 +53,8 @@
</div> </div>
<div class="broadcast_details_picBox noPad"> <div class="broadcast_details_picBox noPad">
<div class="broadcast_details_tit"> <div class="broadcast_details_tit">
{{val.product.cart_info.product.store_name}}</div> {{val.product.cart_info.product.store_name}}
</div>
<div class="broadcast_details_pic"> <div class="broadcast_details_pic">
￥{{ item.refundOrder.refund_price }} ￥{{ item.refundOrder.refund_price }}
</div> </div>
@ -89,7 +90,8 @@
</div> </div>
<div class="broadcast_details_picBox noPad"> <div class="broadcast_details_picBox noPad">
<div class="broadcast_details_tit"> <div class="broadcast_details_tit">
{{val.cart_info.product.store_name}}</div> {{val.cart_info.product.store_name}}
</div>
<div class="broadcast_details_pic"> <div class="broadcast_details_pic">
￥{{ item.orderInfo.pay_price }} ￥{{ item.orderInfo.pay_price }}
</div> </div>
@ -114,7 +116,8 @@
￥{{ item.product.price }} ￥{{ item.product.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.product.store_name}}</div> {{item.product.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -135,7 +138,8 @@
￥{{ item.presell.price }} ￥{{ item.presell.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.presell.store_name}}</div> {{item.presell.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -156,7 +160,8 @@
￥{{ item.productGroup.product.price }} ￥{{ item.productGroup.product.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.productGroup.product.store_name}}</div> {{item.productGroup.product.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -207,7 +212,8 @@
</div> </div>
<div class="broadcast_details_picBox noPad"> <div class="broadcast_details_picBox noPad">
<div class="broadcast_details_tit"> <div class="broadcast_details_tit">
{{val.product.cart_info.product.store_name}}</div> {{val.product.cart_info.product.store_name}}
</div>
<div class="broadcast_details_pic"> <div class="broadcast_details_pic">
￥{{ item.refundOrder.refund_price }} ￥{{ item.refundOrder.refund_price }}
</div> </div>
@ -244,7 +250,8 @@
</div> </div>
<div class="broadcast_details_picBox noPad"> <div class="broadcast_details_picBox noPad">
<div class="broadcast_details_tit"> <div class="broadcast_details_tit">
{{val.cart_info.product.store_name}}</div> {{val.cart_info.product.store_name}}
</div>
<div class="broadcast_details_pic"> <div class="broadcast_details_pic">
￥{{ item.orderInfo.pay_price }} ￥{{ item.orderInfo.pay_price }}
</div> </div>
@ -268,7 +275,8 @@
￥{{ item.product.price }} ￥{{ item.product.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.product.store_name}}</div> {{item.product.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -289,7 +297,8 @@
￥{{ item.presell.price }} ￥{{ item.presell.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.presell.store_name}}</div> {{item.presell.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -310,7 +319,8 @@
￥{{ item.productGroup.product.price }} ￥{{ item.productGroup.product.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.productGroup.product.store_name}}</div> {{item.productGroup.product.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -390,7 +400,8 @@
</div> </div>
<div class="broadcast_details_picBox noPad"> <div class="broadcast_details_picBox noPad">
<div class="broadcast_details_tit"> <div class="broadcast_details_tit">
{{val.product.cart_info.product.store_name}}</div> {{val.product.cart_info.product.store_name}}
</div>
<div class="broadcast_details_pic"> <div class="broadcast_details_pic">
￥{{ val.product.cart_info.productAttr.price }} ￥{{ val.product.cart_info.productAttr.price }}
</div> </div>
@ -427,7 +438,8 @@
</div> </div>
<div class="broadcast_details_picBox noPad"> <div class="broadcast_details_picBox noPad">
<div class="broadcast_details_tit"> <div class="broadcast_details_tit">
{{val.cart_info.product.store_name}}</div> {{val.cart_info.product.store_name}}
</div>
<div class="broadcast_details_pic"> <div class="broadcast_details_pic">
￥{{ item.orderInfo.pay_price }} ￥{{ item.orderInfo.pay_price }}
</div> </div>
@ -452,7 +464,8 @@
￥{{ item.product.price }} ￥{{ item.product.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.product.store_name}}</div> {{item.product.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -473,7 +486,8 @@
￥{{ item.presell.price }} ￥{{ item.presell.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.presell.store_name}}</div> {{item.presell.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -494,7 +508,8 @@
￥{{ item.productGroup.product.price }} ￥{{ item.productGroup.product.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.productGroup.product.store_name}}</div> {{item.productGroup.product.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -536,7 +551,8 @@
</div> </div>
<div class="broadcast_details_picBox noPad"> <div class="broadcast_details_picBox noPad">
<div class="broadcast_details_tit"> <div class="broadcast_details_tit">
{{val.product.cart_info.product.store_name}}</div> {{val.product.cart_info.product.store_name}}
</div>
<div class="broadcast_details_pic"> <div class="broadcast_details_pic">
共{{item.refundOrder.refund_num}}件商品， 共{{item.refundOrder.refund_num}}件商品，
合计 ￥{{ item.refundOrder.refund_price }} 合计 ￥{{ item.refundOrder.refund_price }}
@ -573,7 +589,8 @@
</div> </div>
<div class="broadcast_details_picBox noPad"> <div class="broadcast_details_picBox noPad">
<div class="broadcast_details_tit"> <div class="broadcast_details_tit">
{{val.cart_info.product.store_name}}</div> {{val.cart_info.product.store_name}}
</div>
<div class="broadcast_details_pic"> <div class="broadcast_details_pic">
￥{{ item.orderInfo.pay_price }} ￥{{ item.orderInfo.pay_price }}
</div> </div>
@ -598,7 +615,8 @@
￥{{ item.product.price }} ￥{{ item.product.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.product.store_name}}</div> {{item.product.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -619,7 +637,8 @@
￥{{ item.presell.price }} ￥{{ item.presell.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.presell.store_name}}</div> {{item.presell.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -640,7 +659,8 @@
￥{{ item.productGroup.product.price }} ￥{{ item.productGroup.product.price }}
</div> </div>
<div class="broadcast_details_tit_no line1"> <div class="broadcast_details_tit_no line1">
{{item.productGroup.product.store_name}}</div> {{item.productGroup.product.store_name}}
</div>
</div> </div>
</navigator> </navigator>
</div> </div>
@ -788,8 +808,10 @@
<i class="em" :class="emoji" :style="'background-image:url('+ httpUrl +')'" <i class="em" :class="emoji" :style="'background-image:url('+ httpUrl +')'"
v-for="emoji in emojiList" :key="emoji" @click="addEmoji(emoji)"></i> v-for="emoji in emojiList" :key="emoji" @click="addEmoji(emoji)"></i>
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
</div> </div>
</div> </div>
@ -1214,8 +1236,7 @@
let self = this let self = this
self.$util.uploadImageOne('upload/image', function(res) { self.$util.uploadImageOne('upload/image', function(res) {
if (res.status == 200) { if (res.status == 200) {
self.sendMsg(res.data.path, 3 self.sendMsg(res.data.path, 3)
)
} }
}); });
}, },
@ -1946,19 +1967,23 @@
transition: all 0.005s cubic-bezier(0.25, 0.5, 0.5, 0.9); transition: all 0.005s cubic-bezier(0.25, 0.5, 0.5, 0.9);
background-color: #fff; background-color: #fff;
position: fixed; position: fixed;
bottom: 0; bottom:var(--status-bar-height);
left: 0; left: 0;
padding-bottom: var(--status-bar-height);
} }
.broadcast-details .footerCon.on { .broadcast-details .footerCon.on {
position: relative; position: relative;
top: -250rpx; top: -360rpx;
transform: translate3d(0, 0, 0) !important; transform: translate3d(0, 0, 0) !important;
} }
.broadcast-details .footerCon .banner { .broadcast-details .footerCon .banner {
background: #fff; background: #fff;
padding-top: var(--status-bar-height);
} }
.broadcast-details .footerCon .banner .swiper-slide { .broadcast-details .footerCon .banner .swiper-slide {
@ -1974,7 +1999,7 @@
display: block; display: block;
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
margin: 40rpx 0 0 50rpx; margin: 20rpx 0 0 40rpx;
} }
.broadcast-details .footerCon .banner .swiper-container-horizontal>.swiper-pagination-bullets { .broadcast-details .footerCon .banner .swiper-container-horizontal>.swiper-pagination-bullets {
@ -1985,6 +2010,8 @@
background-color: #999; background-color: #999;
} }
.broadcast-details .recording { .broadcast-details .recording {
@ -2041,6 +2068,8 @@
padding: 0 80rpx 0 30rpx; padding: 0 80rpx 0 30rpx;
height: 76rpx; height: 76rpx;
position: relative; position: relative;
} }
.broadcast-details .footer .placeholder { .broadcast-details .footer .placeholder {
@ -2069,6 +2098,8 @@
display: inline-block; display: inline-block;
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
margin: 20rpx 0 0 40rpx; margin: 20rpx 0 0 40rpx;
} }

16
pages/gather/gather.vue
View File

@ -141,8 +141,8 @@
AllMenuList: [{ AllMenuList: [{
name: '商户平台', name: '商户平台',
icon: '/static/applet/shop_app.png', icon: '/static/applet/shop_app.png',
// data: "__UNI__1EE148C", data: "__UNI__1EE148C",
data: '/pages/moreProject/moreProject',
type: 2, type: 2,
}, },
{ {
@ -359,7 +359,9 @@
break; break;
// case 2: uniMP.loadMPx(data); break; // case 2: uniMP.loadMPx(data); break;
case 2: case 2:
this.navigator(data); // this.navigator(data);
uniMP.loadMPx(data);
break; break;
case 3: case 3:
@ -370,14 +372,14 @@
// #endif // #endif
// #ifdef H5 // #ifdef H5
if (type == 2) { // if (type == 2) {
this.navigator(data); // this.navigator(`/pages/moreProject/moreProject`);
} else { // } else {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: 'H5不支持打开小程序' title: 'H5不支持打开小程序'
}) })
} // }
// #endif // #endif
}, },

6
pages/moreProject/moreProject.vue
View File

@ -39,11 +39,11 @@
<image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image>
<text class="text">在售管理</text> <text class="text">在售管理</text>
</view> </view>
<!-- <view class="examine" <view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)"> @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
<text class="text">财务管理</text> <text class="text">财务管理</text>
</view> --> </view>
<!-- <view class="examine" <!-- <view class="examine"
@click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)"> @click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
@ -874,7 +874,7 @@
} }
}, },
//
logout() { logout() {
uni.switchTab({ uni.switchTab({
url: '/pages/gather/gather' url: '/pages/gather/gather'

6
pages/plantGrass/plant_detail/index.vue
View File

@ -533,9 +533,9 @@
that.followDetail = null that.followDetail = null
that.loadData = false that.loadData = false
uni.hideLoading() uni.hideLoading()
return that.$util.Tips({ // return that.$util.Tips({
title: err // title: err
}); // });
}) })
}, },
/*获取评论*/ /*获取评论*/

16
pages/product/basicSet.vue
View File

@ -7,8 +7,10 @@
<view class="store_bg"> <view class="store_bg">
<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺背景图</view> <view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺背景图</view>
<block v-if="images[0].img"> <block v-if="images[0].img">
<!-- <u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
@click="delImg(0)" mode="aspectFit"></u--image> -->
<u--image :showLoading="true" :src="images[0].img" width="360px" height="210.53rpx" radius="4px" <u--image :showLoading="true" :src="images[0].img" width="360px" height="210.53rpx" radius="4px"
@click="delImg(0)"></u--image> @click="delImg(2)"></u--image>
</block> </block>
<view v-else class="upload" @click="seleckImage(0)"> <view v-else class="upload" @click="seleckImage(0)">
<view class="iconfont icon-tupian1"></view> <view class="iconfont icon-tupian1"></view>
@ -73,8 +75,10 @@
<text class="sub_title">配送方式：</text> <text class="sub_title">配送方式：</text>
<view class="flex"> <view class="flex">
<checkbox-group name="" @change="checkboxChange"> <checkbox-group name="" @change="checkboxChange">
<checkbox disabled='true' :checked="isZiti" :value="check.ziti" /><text class="text ziti">到店自提(加入供应链)</text> <checkbox disabled='true' :checked="isZiti" :value="check.ziti" /><text
<checkbox disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text class="text">快递配送</text> class="text ziti">到店自提(加入供应链)</text>
<checkbox disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text
class="text">快递配送</text>
</checkbox-group> </checkbox-group>
</view> </view>
</view> </view>
@ -108,10 +112,12 @@
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>店铺营业时间:</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>店铺营业时间:</view>
<view class="bus_time flex_a_c"> <view class="bus_time flex_a_c">
<view class="select" @click="beginTimeShow = true"> <view class="select" @click="beginTimeShow = true">
{{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}</view> {{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}
</view>
至 至
<view class="select" @click="overTimeShow = true"> <view class="select" @click="overTimeShow = true">
{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}</view> {{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}
</view>
</view> </view>
</block> </block>
</view> </view>

1
pages/product/list/index.vue
View File

@ -490,7 +490,6 @@
that.loading = false; that.loading = false;
that.loaded = res.data.list.length < that.where.limit; that.loaded = res.data.list.length < that.where.limit;
that.productList.push.apply(that.productList, res.data.list); that.productList.push.apply(that.productList, res.data.list);
that.where.page = that.where.page + 1; that.where.page = that.where.page + 1;
}, },

26
pages/users/user_payment/index.vue
View File

@ -118,19 +118,19 @@
payStatus: true payStatus: true
} }
// #ifdef H5 ||APP-PLUS // #ifdef H5 ||APP-PLUS
, // ,
{ // {
name: '支付宝支付', // name: '支付宝支付',
icon: 'icon-zhifubao', // icon: 'icon-zhifubao',
// #ifdef H5 || APP-PLUS // // #ifdef H5 || APP-PLUS
value: 'alipay', // value: 'alipay',
// #endif // // #endif
// #ifdef MP // // #ifdef MP
value: 'alipayQr', // value: 'alipayQr',
// #endif // // #endif
title: '支付宝支付', // title: '支付宝支付',
payStatus: true // payStatus: true
} // }
// #endif // #endif
], ],
}; };

5
utils/uniMPevent.js
View File

@ -50,5 +50,10 @@ export const initEvent = () => {
console.log('Host sendEvent: ' + JSON.stringify(ret)); console.log('Host sendEvent: ' + JSON.stringify(ret));
}); });
} }
if (ret.event == 'log') {
// console.log('2222222')
console.log('收到小程序事件: ' + JSON.stringify(ret));
}
}); });
} }