czg_team/cashier_weapp
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x

Browse Source
This commit is contained in:
魏啾
2024-05-15 16:56:50 +08:00
parent 618daced35 9c25679656
commit ca6380a9c0
85 changed files with 9534 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/group_order/components/groupMerchants.vue
View File

@@ -100,4 +100,4 @@
justify-content: @start;
align-items: @position;
}
</style>
</style>

2
pages/group_order/components/groupOrderInfo.vue
View File

@@ -85,7 +85,7 @@
.content {
.df(flex-start, stretch);
margin-top: 16rpx;
margin-left: 20rpx;
margin-left: 40rpx;
>view {
>text {

3
pages/group_order/components/groupPay.vue
View File

@@ -80,8 +80,7 @@
.content {
.df(flex-start, stretch);
margin-top: 16rpx;
margin-left: 20rpx;
margin-left: 40rpx;
>view {
>text {
font-weight: 400;

4
pages/group_order/components/groupStore.vue
View File

@@ -5,13 +5,13 @@
style="width: 40rpx;height: 36.44rpx;" mode=""></image>
<text>到店吃套餐</text>
</view>
<view v-for="(item ,i ) in info.tagVos" :key="i">
<view style="margin-left: 52rpx;" v-for="(item ,i ) in info.tagVos" :key="i">
<view class="content">
{{item.title}} {{item.goods.length}} 选 {{item.number}}
</view>
<view class="rightStyle" v-for="(ele,index) in item.goods" :key="index">
<view>
{{ele.name}} <text>({{ele.unitName}})</text>
{{ele.name}} <text>({{ele.groupNum}}{{ele.unitName}})</text>
</view>
<text>￥{{ele.lowPrice}}</text>
</view>

30
pages/group_order/order_groupdetail.vue
View File

@@ -28,8 +28,12 @@
style="width: 40rpx;height: 43.21rpx;" mode=""></image>
联系客服
</view>
<view style="height: 100rpx;" v-if="listinfo.status == 'unpaid'"> </view>
<!-- 待支付按钮 -->
<button v-if="listinfo.status == 'unpaid'" @click="payEvent" class="payStyle">立即支付</button>
<view class="payBox" v-if="listinfo.status == 'unpaid'">
<button @click="payEvent" class="payStyle">立即支付</button>
</view>
<!-- 二维码展示 -->
<view class="qrimg" v-if="isQrimg" @click="clickEvent">
<tki-qrcode ref="qrcode" size="400" :val="qrValue" :loadMake="true" @result="qrR" />
@@ -79,12 +83,11 @@
methods: {
async payEvent() {
let res = await this.api.payOrderPay({
payType:'wechatPay',
orderId:this.listinfo.id,
orderType:'group'
payType: 'wechatPay',
orderId: this.listinfo.id,
orderType: 'group'
})
if (res) {
return
uni.requestPayment({
provider: 'wxpay', //支付类型-固定值
partnerid: res.data.payAppId, // 微信支付商户号
@@ -171,15 +174,22 @@
left: 0%;
}
.payStyle {
background-color: #fe7620;
.payBox {
width: 100vw;
height: 140rpx;
background-color: #fff;
position: fixed;
bottom: 0%;
left: 50%;
transform: translate(-50%);
color: #fff;
width: 90%;
border: 10rpx solid #fff;
.payStyle {
background-color: #fe7620;
color: #fff;
width: 90%;
border: 10rpx solid #fff;
}
}
.customerService {

110
pages/group_order/refund.vue
View File

@@ -34,7 +34,12 @@
<view style="width: 100%;height: 2rpx;background-color: #E6E6E6;margin-top: 32rpx;"> </view>
<view class="refundBoxD">
<view>退款原因 <text style="color: #FF4C11;">*</text> </view>
<view>请至少选择一项 <u-icon name="arrow-right" color="#000" size="28"></u-icon></view>
<view class="as-input" @click="openFood">
<view class="placeholder" v-if="fruitName==undefined||fruitName==''">请至少选择一项</view>
<view class="as-content" v-else>{{fruitName}}</view>
<!-- <uni-icons type="forward" size="16" color="#c0c4cc" class="customer-icon"></uni-icons> -->
<u-icon name="arrow-right" color="#666666" size="16"></u-icon>
</view>
</view>
<view style="width: 100%;height: 2rpx;background-color: #E6E6E6;margin-top: 32rpx;"> </view>
<view class="refundBoxE">
@@ -50,16 +55,46 @@
提交订单
</button>
</view>
<niceui-popup-select ref="showFruit" :columns="foods" :selectValue="fruitId" :is-search="false"
:option="{label:'name', value:'id'}" @confirm="confirmFruit"></niceui-popup-select>
</view>
</template>
<script>
import '../../uni_modules/uni-icons/components/uni-icons/uni-icons.vue'
export default {
data() {
return {
Unumbervalue: 1,
tareaValue: '',
fontNum: 0
fontNum: 0,
foods: [{
id: '1',
name: '计划有变没时间消费'
},
{
id: '2',
name: '买多了/买错了'
},
{
id: '3',
name: '担心安全问题（天气等）'
}, {
id: '3',
name: '担心安全问题（天气等）'
}, {
id: '3',
name: '担心安全问题（天气等）'
}, {
id: '3',
name: '担心安全问题（天气等）'
}, {
id: '3',
name: '担心安全问题（天气等）'
},
],
fruitId: [],
fruitName:''
}
},
methods: {
@@ -67,7 +102,16 @@
sumfontnum(e) {
console.log(e)
this.fontNum = e.detail.value.length
}
},
confirmFruit(value, data) {
this.fruitId = value
this.fruitName = data.map(it => it.name)
this.$refs.showFruit.closePopup()
},
openFood() {
this.$refs.showFruit.showPopup()
},
}
}
</script>
@@ -143,12 +187,14 @@
padding-top: 32rpx;
>view:first-child {
.df;
width: 160rpx;
font-weight: 500;
font-size: 28rpx;
}
>view:last-child {
.df();
// .df();
font-weight: 400;
font-size: 24rpx;
color: #333333;
@@ -218,4 +264,60 @@
right: 0;
top: 30%;
}
radio-group,
checkbox-group {
width: 92%;
}
</style>
<style lang="scss" scoped>
.content {
background-color: #f7f7f7;
width: 100vw;
height: 100vh;
}
.uni-title {
font-size: 33rpx;
font-weight: bold;
padding: 20rpx 20rpx;
}
.uni-list-cell {
background-color: #fff;
display: flex;
justify-content: space-between;
align-items: center;
padding: 20rpx 20rpx;
.uni-list-cell-left {
font-size: 35rpx;
}
}
.uni-list-cell-db {
flex: 1
}
.as-input {
width: 100%;
display: flex;
align-items: center;
justify-content: flex-end;
.customer-icon {
padding: 0 0 0 5rpx;
}
.placeholder {
font-size: 33rpx;
color: #999;
}
.as-content {
color: #333;
font-size: 33rpx;
}
}
</style>

2
pages/index/components/advertisement.vue
View File

@@ -1,7 +1,7 @@
<template>
<view class="onecontent flex-between">
<view class="onecontentleft">
现有{{bannervo.coupons}}人以免单
现有{{bannervo.coupons==null?116:bannervo.coupons}}人已免单
</view>
<view class="onecontentright flex-start">

2
pages/index/components/diamond.vue
View File

@@ -38,7 +38,7 @@
});
break;
case 'relative':
uni.pro.navigateTo(item.absUrl, item);
uni.pro.navigateTo(item.absUrl, JSON.stringify(item));
break;
case 'scan':
if (!uni.utils.pluschooseImage()) {

32
pages/index/freedaily.vue
View File

@@ -14,7 +14,8 @@
src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/mrmd2.png" mode="aspectFill">
</image>
<view class="towcontentoneboxswiper">
<swiper class="swiper" circular :autoplay='true' :vertical='true' display-multiple-items="4" :interval="'3000'">
<swiper class="swiper" circular :autoplay='true' :vertical='true' display-multiple-items="4"
:interval="'3000'">
<swiper-item class="swiperitem" v-for="(item,index) in orderfindWiningUserlist"
:key="index">
<view class="swiper-item">{{item.userName}}* 免单{{item.orderAmount}}元订单号：{{item.orderNo}}
@@ -42,8 +43,25 @@
免单状态
</view>
</view>
<swiper class="swiper" circular :autoplay='true' :vertical='true' interval="3000" display-multiple-items="4">
<swiper-item class="swiperitem" v-for="(item,index) in orderfindWiningUserlist" :key="index">
<view class="swiperitem" v-for="(item,index) in orderfindWiningUserlist"
:key="index">
<view class="swiper-item" style="margin-top: 32rpx;">
<view class="swiper_itemone">
{{item.orderAmount}}元
</view>
<view class="swiper_itemtow">
{{item.orderNo}}
</view>
<view class="swiper_itemthere">
{{item.isRefund == true ? '已免单':'待免单'}}
</view>
</view>
</view
>
<!-- <swiper class="swiper" circular :autoplay='true' :vertical='true' interval="3000"
display-multiple-items="4">
<swiper-item class="swiperitem" v-for="(item,index) in orderfindWiningUserlist"
:key="index">
<view class="swiper-item">
<view class="swiper_itemone">
{{item.orderAmount}}元
@@ -57,7 +75,7 @@
</view>
</swiper-item>
</swiper>
</swiper> -->
</view>
</view>
</view>
@@ -91,9 +109,9 @@
};
},
onLoad(e) {
console.log(e)
this.orderfindWiningUser()
this.titlename = e.name
let data = JSON.parse(e)
this.titlename = data.name
},
onPageScroll(e) {
if (e.scrollTop <= 44) { //搜索导航栏
@@ -268,7 +286,7 @@
.towcontentoneboxswiper {
width: 100%;
height: 242rpx;
// height: 242rpx;
padding-top: 24rpx;
overflow: hidden;

3
pages/index/index.vue
View File

@@ -60,7 +60,8 @@
</view>
</view>
<view class="fivecontent" :style="{'height':seighT + 'px'}">
<view class="fivecontent" >
<!-- <view class="fivecontent" :style="{'height':seighT + 'px'}"> -->
<!-- <scroll-view :style="{'height':seighT + 'px'}" scroll-y @scrolltolower="loadMore"
scroll-with-animation> -->
<view class="fivecontent_item" v-for="(item,index) in homelist" :key="index"

16
pages/index/tothestore.vue
View File

@@ -20,11 +20,11 @@
{{item.shopName}}
</view>
</view>
<view class="fivecontent_itemoneboxtow flex-start">
<view class="fivecontent_itemoneboxtow flex-start" @click="goMap">
<image class="fivecontent_itemoneboxtowimage"
src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/dw.png" mode="widthFix"></image>
<view class="fivecontent_itemoneboxtow_o">
{{item.address}}
{{item.address.length>7?item.address.substring(0,7)+'...':item.address}}
</view>
<view class="fivecontent_itemoneboxtow_t">
{{item.distances}}km
@@ -81,6 +81,12 @@
this.distiricttopCommon()
},
methods: {
goMap() {
uni.openLocation({
longitude: uni.cache.get('getLocationstorage').lng,
latitude: uni.cache.get('getLocationstorage').lat
})
},
init_fn(e) {
this.list = []
this.form.page = 1 //页数
@@ -98,13 +104,13 @@
type: 'subShop', //团购卷品类Id/subShop-预约到店
orderBy: ''
})
if (res.code == 0) {
if (res.code == 0) {
this.toplist = res.data.carousel[0]
}
},
async distirictsubShopList() {
let res = await this.api.distirictsubShopList({
address:uni.cache.get('getLocationstorage').address, //地址
address: uni.cache.get('getLocationstorage').address, //地址
lng: uni.cache.get('getLocationstorage').lng,
lat: uni.cache.get('getLocationstorage').lat,
distanceInKm: '10', //默认10 以经纬度为中心 多大范围以内 单位km
@@ -119,7 +125,7 @@
this.form.status = 'loading';
this.form.page = ++this.form.page;
setTimeout(() => {
this.list = [...this.list,...res.data.list]
this.list = [...this.list, ...res.data.list]
this.form.status = 'loading';
if (res.data.pageNum == res.data.pages) {
this.form.status = 'nomore';

2
pages/order/order.vue
View File

@@ -224,12 +224,12 @@
statusFirter(e) {
// 状态: unpaid-待付款;unused-待使用;closed-已完成;refunding-退款中;refund-已退款;cancelled-已取消;
if (e == 'closed') return '已完成'
else if (e == 'paying') return '支付中'
else if (e == 'unpaid') return '待付款'
else if (e == 'unused') return '待使用'
else if (e == 'refunding') return '退款中'
else if (e == 'refund') return '已退款'
else if (e == 'cancelled') return '已取消'
else return "1"
}
},
methods: {

11
pages/product/index.vue
View File

@@ -64,7 +64,7 @@
<view class="theretherecontent">
营业时间：{{listdata.businessTime}}
</view>
<view class="fourtherecontent flex-start">
<view class="fourtherecontent flex-start" @click="goMap">
<image class="fourtherecontentimage"
src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/product/d.png" mode="aspectFill"></image>
<view class="fourtherecontent_o">
@@ -95,7 +95,7 @@
</view>
<view class="fourcontent_th_tow flex-start">
<view class="fourcontent_th_towo">
（{{item1.unitName}}）
（{{item1.groupNum}}{{item1.unitName}}）
</view>
<view class="fourcontent_th_towt">
￥{{item1.lowPrice}}
@@ -403,6 +403,13 @@
name
})
},
goMap(){
uni.openLocation({
longitude: uni.cache.get('getLocationstorage').lng,
latitude: uni.cache.get('getLocationstorage').lat
})
},
// 跳转
async onLoadInfo() { //详情接口
let res = await this.api.productproductInfo({
productId: this.indexform,

1
pages/product/placeOrder.vue
View File

@@ -94,7 +94,6 @@
orderType:'group'
})
if (res) {
return
uni.requestPayment({
provider: 'wxpay', //支付类型-固定值
partnerid: res.data.payAppId, // 微信支付商户号