mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new' of https://gitea.lihaink.cn/mkm/shop-applet into new

This commit is contained in:
weipengfei 2024-03-21 11:23:03 +08:00
parent 6b11dd932c 0a4bfff2df
commit b832389a2c
12 changed files with 1047 additions and 680 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/product.js
View File

@ -9,6 +9,17 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import request from "@/utils/request.js"; import request from "@/utils/request.js";
/**
* 商户类型列表
*/
export const intentionList = (data) => request.get('intention/detail', data)
/**
* 商户类型申请
*/
export const shopTypeChange = (data) => request.post('intention/change', data)
/** /**
* 获取商品详情 * 获取商品详情
*/ */
@ -328,5 +339,4 @@ export function intention(data) {
*/ */
export function intentionbus(data) { export function intentionbus(data) {
return request.post(`intention/business`, data); return request.post(`intention/business`, data);
} }

10
pages.json
View File

@ -1459,8 +1459,14 @@
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, }, {
{ "path": "shop_type_change/list",
"style": {
"navigationBarTitleText": "申请记录",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, {
"path": "addGood/addGood", "path": "addGood/addGood",
"style": { "style": {
"navigationBarTitleText": "商品设置", "navigationBarTitleText": "商品设置",

211
pages/admin/orderList/index.vue
View File

@ -50,7 +50,8 @@
<view v-if="val.product" class="goods acea-row row-between-wrapper"> <view v-if="val.product" class="goods acea-row row-between-wrapper">
<view class="picTxt acea-row row-between-wrapper"> <view class="picTxt acea-row row-between-wrapper">
<view class="pictrue"> <view class="pictrue">
<image :src="val.product.cart_info.productAttr.image||val.product.cart_info.product.image" /> <image
:src="val.product.cart_info.productAttr.image||val.product.cart_info.product.image" />
</view> </view>
<view class="text acea-row row-between row-column"> <view class="text acea-row row-between row-column">
<view class="info line1 refund-info"> <view class="info line1 refund-info">
@ -96,12 +97,12 @@
<view v-else class="list"> <view v-else class="list">
<view class="item" v-for="(item, index) in list" :key="index"> <view class="item" v-for="(item, index) in list" :key="index">
<view class="order-num acea-row row-middle"> <view class="order-num acea-row row-middle">
<text class="cloud-tag" v-if="item.source==103">云商品</text> <text class="cloud-tag" v-if="item.source==103">云商品</text>
<text v-else-if="item.activity_type != 0" class="activity_type"> <text v-else-if="item.activity_type != 0" class="activity_type">
{{ item.activity_type == 1 ? '秒杀' : item.activity_type == 2 ? '预售' : item.activity_type == 3 ? '助力' : item.activity_type == 4 ? '拼团' : item.activity_type == 10 ? '套餐' :'' }} {{ item.activity_type == 1 ? '秒杀' : item.activity_type == 2 ? '预售' : item.activity_type == 3 ? '助力' : item.activity_type == 4 ? '拼团' : item.activity_type == 10 ? '套餐' :'' }}
</text> </text>
订单号：{{ item.order_sn }} 订单号：{{ item.order_sn }}
<text class="time">下单时间：{{ item.create_time }}</text> <text class="time">下单时间：{{ item.create_time }}</text>
<text class="order-status" <text class="order-status"
v-if="item.refunding != 0 && where.status != 1">{{item.refunding==1 ? '退款中' : item.refunding==2 ? '部分退款' : '全部退款'}}</text> v-if="item.refunding != 0 && where.status != 1">{{item.refunding==1 ? '退款中' : item.refunding==2 ? '部分退款' : '全部退款'}}</text>
</view> </view>
@ -120,9 +121,10 @@
<view class="attr" v-if="val.cart_info.productAttr.sku"> <view class="attr" v-if="val.cart_info.productAttr.sku">
{{ val.cart_info.productAttr.sku }} {{ val.cart_info.productAttr.sku }}
</view> </view>
<view class="attr" @click.stop="showBarCode(val.cart_info.productAttr.product)" v-if="val.cart_info.productAttr.product&&val.cart_info.productAttr.product.bar_code"> <view class="attr" @click.stop="showBarCode(val.cart_info.productAttr.product)"
商品条码: {{ val.cart_info.productAttr.product.bar_code }} v-if="val.cart_info.productAttr.product&&val.cart_info.productAttr.product.bar_code">
</view> 商品条码: {{ val.cart_info.productAttr.product.bar_code }}
</view>
</view> </view>
</view> </view>
<view class="money"> <view class="money">
@ -174,10 +176,12 @@
一键改价 一键改价
</view> </view>
<view class="bnt" @click="modify(item, 1)">订单备注</view> <view class="bnt" @click="modify(item, 1)">订单备注</view>
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&&(item.activity_type==98||item.activity_type==99)" <view class="bnt bnt_color"
v-if="where.status == 2 && item.order_type == 0&&(item.activity_type==98||item.activity_type==99)"
@click="toPostage(item)">去发货 @click="toPostage(item)">去发货
</view> </view>
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&& item.order_type !=1 &&item.activity_type==0" <view class="bnt bnt_color"
v-if="where.status == 2 && item.order_type == 0&& item.order_type !=1 &&item.activity_type==0"
@click="toPostagequ(item)">去发货 @click="toPostagequ(item)">去发货
</view> </view>
<view class="bnt bnt_color" <view class="bnt bnt_color"
@ -209,18 +213,48 @@
</view> </view>
<view class="mask" @touchmove.prevent v-show="refundMark === true"></view> <view class="mask" @touchmove.prevent v-show="refundMark === true"></view>
</view> </view>
<u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpClose"> <u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpClose">
<view style="text-align: center;margin-top: 30rpx;"> <!-- <view style="text-align: center;margin-top: 30rpx;">
请把二维码展示给取货人员 请把二维码展示给取货人员
</view> </view>
<view style="padding: 28.07rpx;"> <view style="padding: 28.07rpx;">
<image :src="payCodeUrl" style="width:400rpx;height: 400rpx;"></image> <image :src="payCodeUrl" style="width:400rpx;height: 400rpx;"></image>
</view> -->
<view class="form">
<view class="form-item">
<view class="form-item-label">送货人姓名</view>
<view class="form-item-val">
<u-input placeholder="请输入送货人姓名" placeholderStyle="color:#999;font-size:26rpx;"
border="surround"></u-input>
</view>
</view>
<view class="form-item">
<view class="form-item-label">送货人电话</view>
<view class="form-item-val">
<u-input placeholder="请输入送货人电话" placeholderStyle="color:#999;font-size:26rpx;"
border="surround"></u-input>
</view>
</view>
<view class="form-item">
<view class="form-item-label">备注</view>
<view class="form-item-val">
<u-input placeholder="请输入备注" placeholderStyle="color:#999;font-size:26rpx;"></u-input>
</view>
</view>
<view class="form-btn">
<view class="form-btn-cancel" @click="popUpShow = false">取消</view>
<view class="form-btn-confirm">确认</view>
</view>
</view> </view>
</u-popup> </u-popup>
<view class="bar-code" v-show="showBar" @click="showBar=false"> <view class="bar-code" v-show="showBar" @click="showBar=false">
<barcode ref="code"></barcode> <barcode ref="code"></barcode>
</view> </view>
</view> </view>
</template> </template>
@ -260,7 +294,7 @@
}, },
data() { data() {
return { return {
showBar: false, showBar: false,
current: "", current: "",
change: false, change: false,
refundMark: false, refundMark: false,
@ -271,7 +305,7 @@
status: 1, status: 1,
search_info: '', search_info: '',
product_type: '', product_type: '',
pay_time: null, pay_time: null,
}, },
list: [], list: [],
loaded: false, loaded: false,
@ -293,17 +327,17 @@
that.init(); that.init();
} }
}, },
}, },
onLoad(option) { onLoad(option) {
this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? "" this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? ""
this.where.status = option.types this.where.status = option.types
this.current = ""; this.current = "";
this.merId = option.merId; this.merId = option.merId;
if(option.pay_time){ if (option.pay_time) {
this.where.pay_time = option.pay_time; this.where.pay_time = option.pay_time;
} }
this.getIndex(); this.getIndex();
}, },
methods: { methods: {
@ -312,13 +346,13 @@
this.popUpShow = false this.popUpShow = false
}, },
showBarCode(val){ showBarCode(val) {
this.showBar = true this.showBar = true
this.$refs['code'].init({ this.$refs['code'].init({
name: val.store_name, name: val.store_name,
code: val.bar_code code: val.bar_code
}); });
}, },
//同意先货后款订单 //同意先货后款订单
tongyi(id, number) { tongyi(id, number) {
let data = { let data = {
@ -342,14 +376,14 @@
}, },
handleSearch() { handleSearch() {
this.loaded = false; this.loaded = false;
this.where.page = 1; this.where.page = 1;
this.list = []; this.list = [];
this.getIndex(); this.getIndex();
}, },
// 获取数据 // 获取数据
getIndex() { getIndex() {
let that = this; let that = this;
// console.log(that.merId) // console.log(that.merId)
if (that.loading || that.loaded) return; if (that.loading || that.loaded) return;
@ -402,12 +436,12 @@
if (val != 'verify') { if (val != 'verify') {
if (this.where.status != val) { if (this.where.status != val) {
this.where.status = val; this.where.status = val;
this.where.search_info='' this.where.search_info = ''
delete this.where.is_verify; delete this.where.is_verify;
this.init(); this.init();
} }
} else { } else {
this.where.search_info='' this.where.search_info = ''
this.where.is_verify = 1; this.where.is_verify = 1;
delete this.where.status; delete this.where.status;
this.init(); this.init();
@ -477,6 +511,7 @@
} }
}) })
}, },
//收件码 //收件码
toPostagequ(item) { toPostagequ(item) {
this.popUpShow = true this.popUpShow = true
@ -486,7 +521,12 @@
this.payCodeUrl = res.data.qrcode this.payCodeUrl = res.data.qrcode
} }
}) })
}, },
toPostage(item) { toPostage(item) {
let that = this; let that = this;
if (item.refunding != 0) { if (item.refunding != 0) {
@ -575,7 +615,7 @@
uni.navigateTo({ uni.navigateTo({
url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}` url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}`
}) })
}, },
toRefundDetail(item) { toRefundDetail(item) {
uni.navigateTo({ uni.navigateTo({
@ -590,6 +630,63 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.form {
padding: 40rpx 60rpx;
.form-item {
display: flex;
align-items: center;
.form-item-label {
width: 140rpx;
font-size: 28rpx;
color: #333;
font-weight: bold;
margin-right: 20rpx;
}
.form-item-val {
flex: 1;
}
}
.form-btn {
display: flex;
justify-content: center;
margin-top: 50rpx;
.form-btn-cancel {
width: 83px;
height: 60rpx;
line-height: 60rpx;
border-radius: 30rpx;
text-align: center;
color: #2291F8;
border: 2rpx solid #2291F8;
margin-right: 40rpx;
}
.form-btn-confirm {
width: 83px;
height: 60rpx;
line-height: 60rpx;
background: linear-gradient(90deg, #2291F8 0%, #1CD1DC 100%);
border-radius: 30rpx;
text-align: center;
color: #fff;
font-size: 28rpx;
}
.form-btn-cancel:active {
background: rgba(209, 220, 255, .3);
}
.form-btn-confirm:active {
opacity: .8;
}
}
}
.pos-order-list .top-header { .pos-order-list .top-header {
position: fixed; position: fixed;
top: 0; top: 0;
@ -1017,25 +1114,27 @@
flex: 1; flex: 1;
} }
} }
.bar-code{
position: fixed; .bar-code {
top: 0; position: fixed;
left: 0; top: 0;
z-index: 999999; left: 0;
width: 100vw; z-index: 999999;
height: 100vh; width: 100vw;
background-color: rgba(0,0,0,0.2); height: 100vh;
display: flex; background-color: rgba(0, 0, 0, 0.2);
align-items: center; display: flex;
justify-content: center; align-items: center;
} justify-content: center;
.cloud-tag{ }
font-size: 20rpx;
padding: 2rpx 5rpx; .cloud-tag {
font-weight: 400; font-size: 20rpx;
background-color: #ff4c3c; padding: 2rpx 5rpx;
border-radius: 8rpx; font-weight: 400;
margin-right: 6rpx; background-color: #ff4c3c;
color: #fff; border-radius: 8rpx;
} margin-right: 6rpx;
color: #fff;
}
</style> </style>

20
pages/index/index.vue
View File

@ -617,6 +617,10 @@
name: '收付明细', name: '收付明细',
type: 22, type: 22,
image: require('@/static/images/index14.png') image: require('@/static/images/index14.png')
}, {
name: '商户类型',
type: 23,
image: require('@/static/images/index14.png')
}, },
@ -695,6 +699,10 @@
name: '收付明细', name: '收付明细',
type: 22, type: 22,
image: require('@/static/images/index14.png') image: require('@/static/images/index14.png')
}, {
name: '商户类型',
type: 23,
image: require('@/static/images/index14.png')
}, },
// { // {
// name: '全部', // name: '全部',
@ -741,6 +749,10 @@
name: '收付明细', name: '收付明细',
type: 22, type: 22,
image: require('@/static/images/index14.png') image: require('@/static/images/index14.png')
}, {
name: '商户类型',
type: 23,
image: require('@/static/images/index14.png')
}, },
{ {
name: '扫码付款', name: '扫码付款',
@ -1534,6 +1546,14 @@
url: '/pages/payment/payment_detail?mer_id=' + this.userInfoData.service.mer_id url: '/pages/payment/payment_detail?mer_id=' + this.userInfoData.service.mer_id
}) })
break; break;
case 23:
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
else uni.navigateTo({
url: '/pages/product/shop_type_change/index?mer_id=' + this.userInfoData
.service.mer_id
})
break;
case 17: case 17:
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限'); if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
else uni.navigateTo({ else uni.navigateTo({

24
pages/payment/qrcode.vue
View File

@ -44,7 +44,17 @@
qrcode({ qrcode({
mer_id: merid mer_id: merid
}).then(res => { }).then(res => {
this.img = res.data.url; if (!res.data.count || res.data.count == 0) {
this.$util.Tips({
title: "您还没有添加商品,请添加!"
}, () => {
uni.redirectTo({
url: "/pages/product/addGood/addGood?mer_id=" + merid
})
})
} else {
this.img = res.data.url;
}
}) })
}, },
@ -112,12 +122,10 @@
} }
.v-qrcode { .v-qrcode {
position: absolute;
top: 400rpx;
left: 50%;
transform: translateX(-50%);
width: 650rpx; width: 650rpx;
height: 650rpx; height: 650rpx;
margin-top: 100rpx;
margin: 100rpx auto 0;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -131,16 +139,12 @@
} }
.v-btn { .v-btn {
position: absolute;
top: 1080rpx;
left: 50%;
transform: translateX(-50%);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 690rpx; width: 690rpx;
height: 100rpx; height: 100rpx;
margin: 0 auto; margin: 70rpx auto 0;
text { text {
font-weight: 400; font-weight: 400;

20
pages/product/basicSet.vue
View File

@ -80,13 +80,6 @@
<view>建议尺寸:710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</view> <view>建议尺寸:710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</view>
</view> </view>
</view> </view>
<view class="street_bg">
<view class="text flex_a_c"> <i class="iconfont icon-xinghao"></i> 商户类型变更</view>
<view class="street_img flex_a_c" @click="changeType">
类型变更
</view>
</view>
</view> </view>
<view class="basice_item"> <view class="basice_item">
@ -100,8 +93,7 @@
<checkbox-group name="" @change="checkboxChange"> <checkbox-group name="" @change="checkboxChange">
<checkbox disabled :checked="isZiti" :value="check.ziti" /><text <checkbox disabled :checked="isZiti" :value="check.ziti" /><text
class="text ziti">到店自提</text> class="text ziti">到店自提</text>
<checkbox :checked="isKuaidi" :value="check.kuaidi" /><text <checkbox :checked="isKuaidi" :value="check.kuaidi" /><text class="text">商家配送</text>
class="text">商家配送</text>
</checkbox-group> </checkbox-group>
</view> </view>
</view> </view>
@ -482,16 +474,6 @@
}); });
}, },
// 商户类型变更
changeType() {
uni.navigateTo({
url: "/pages/product/shop_type_change/index",
fail(err) {
console.log(err);
}
})
},
seleckImage(i) { seleckImage(i) {
let that = this; let that = this;
that.$util.uploadImageOne('upload/image', function(res) { that.$util.uploadImageOne('upload/image', function(res) {

89
pages/product/shop_type_change/index.vue
View File

@ -10,17 +10,22 @@
</view> </view>
</view> </view>
<view class="apply-record" @click="handleToRecord">
<text>申请记录</text>
<u-icon name="arrow-right" size="12" color="#fff" style="margin-top: 4rpx;" />
</view>
<view class="shop-type-con"> <view class="shop-type-con">
<view class="shop-type-con-title">点击选择变更的商户类型</view> <view class="shop-type-con-title">点击选择变更的商户类型</view>
<view class="pifa" @click="handleChoose(1)"> <view class="pifa" @click="handleChoose(1)">
<image v-if="selected == '' ||selected == 2" <image v-if="selected == '' || selected == 2"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/b0811202403191613185951.webp" mode=""> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/b0811202403191613185951.webp" mode="">
</image> </image>
<image v-if="selected == 1" <image v-if="selected == 1"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d7d97202403191611433157.webp" mode=""></image> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d7d97202403191611433157.webp" mode=""></image>
</view> </view>
<view class="pifalingshou" @click="handleChoose(2)"> <view class="pifalingshou" @click="handleChoose(2)">
<image v-if="selected == '' ||selected == 1" <image v-if="selected == '' || selected == 1"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/39776202403191612456811.webp" mode=""> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/39776202403191612456811.webp" mode="">
</image> </image>
<image v-if="selected == 2" <image v-if="selected == 2"
@ -35,28 +40,74 @@
</template> </template>
<script> <script>
import {
shopTypeChange
} from "@/api/product.js";
export default { export default {
data() { data() {
return { return {
selected: '' selected: '',
mer_id: ''
} }
}, },
onLoad(opt) {
if (opt.mer_id)
this.mer_id = opt.mer_id;
},
methods: { methods: {
handleToRecord() {
uni.navigateTo({
url: "/pages/product/shop_type_change/list",
fail(err) {
console.log(err);
}
})
},
handleChoose(e) { handleChoose(e) {
this.selected = e; this.selected = e;
}, },
handleJump() { handleJump() {
if (!this.selected) return this.$util.Tips({ if (!this.selected) return this.$util.Tips({
title: "请选择一种类型" title: "请选择一种类型"
}) })
uni.navigateTo({
url: "/pages/product/shop_type_change/progress", if (!this.mer_id) return this.$util.Tips({
fail(err) { title: "申请商户不能为空!"
console.log(err); })
shopTypeChange({
type: 3,
mer_id: this.mer_id
}).then(res => {
if (res.status == 200) {
this.$util.Tips({
title: res.message
}, () => {
uni.navigateTo({
url: "/pages/product/shop_type_change/list",
fail(err) {
console.log(err);
},
success(res) {
}
})
})
} else {
return this.$util.Tips({
title: res.message
})
} }
}).catch((err) => {
this.$util.Tips({
title: err
})
}) })
}, },
@ -90,9 +141,26 @@
} }
} }
.apply-record {
position: absolute;
top: calc(128rpx + var(--status-bar-height));
right: 0;
display: flex;
justify-content: center;
align-items: center;
width: 154rpx;
height: 50rpx;
background: #A1A1A1;
border-radius: 40rpx 0rpx 0rpx 40rpx;
text {
font-weight: 400;
font-size: 26rpx;
color: #FFFFFF;
}
}
.shop-type-con { .shop-type-con {
.shop-type-con-title { .shop-type-con-title {
margin-bottom: 74rpx; margin-bottom: 74rpx;
font-weight: 400; font-weight: 400;
@ -110,7 +178,6 @@
width: 690rpx; width: 690rpx;
height: 178rpx; height: 178rpx;
} }
} }
.pifalingshou { .pifalingshou {

154
pages/product/shop_type_change/list.vue Normal file
View File

@ -0,0 +1,154 @@
<template>
<view class="shopTypeList">
<view class="shop_type-head">
<view style="height: var(--status-bar-height);"></view>
<view class="shop-type-navbar">
<u-icon name="arrow-left" size="18" color="#fff" @click="handleBack" />
<text class="shop-type-navbar-title">申请记录</text>
<text></text>
</view>
</view>
<view class="shop-type-list">
<block v-for="item in 4">
<view class="shop-type-list-item">
<view class="shop-type-list-item-title" @click='hanldeTo'>
<!-- #40AE36 审核通过 #F55726 审核未通过 #666666 审核中-->
<view class="shop-type-list-item-title-status">审核通过</view>
<view class="shop-type-list-item-title-detail">
查看详情
<u-icon name="arrow-right" size="13" color="#666"></u-icon>
</view>
</view>
<view class="shop-type-list-item-con">
<view class="shop-type-list-item-con-item">
<view class="shop-type-list-item-con-key">变更商户：</view>
<view class="shop-type-list-item-con-val">这是一段店铺名称</view>
</view>
<view class="shop-type-list-item-con-item">
<view class="shop-type-list-item-con-key">变更类型：</view>
<view class="shop-type-list-item-con-val">批发零售商户</view>
</view>
<view class="shop-type-list-item-con-item">
<view class="shop-type-list-item-con-key">申请时间：</view>
<view class="shop-type-list-item-con-val">2024-3-14 14:00</view>
</view>
<view class="shop-type-list-item-con-item">
<view class="shop-type-list-item-con-key">审核人：</view>
<view class="shop-type-list-item-con-val">2024-</view>
</view>
</view>
</view>
</block>
</view>
</view>
</template>
<script>
import {
intentionList
} from "@/api/product.js";
export default {
data() {
return {
list: []
}
},
onLoad() {
this.getData();
},
methods: {
hanldeTo() {
uni.navigateTo({
url: "/pages/product/shop_type_change/progress"
})
},
getData() {
intentionList().then(res => {
this.list = res.data;
})
}
}
}
</script>
<style lang="scss">
page {
background-color: #F8F9FA;
}
.shopTypeList {
.shop_type-head {
background-color: #40AE36;
margin-bottom: 40rpx;
.shop-type-navbar {
display: flex;
align-items: center;
justify-content: space-between;
padding: 30rpx;
height: 88rpx;
.shop-type-navbar-title {
font-size: 32rpx;
color: #FFFFFF;
}
}
}
.shop-type-list {
height: calc(100vh - 130rpx - var(--status-bar-height));
overflow: auto;
.shop-type-list-item {
margin: 0 30rpx 30rpx;
padding: 0rpx 30rpx 30rpx 30rpx;
background: #FFFFFF;
box-shadow: 0rpx 4rpx 6rpx 2rpx rgba(0, 0, 0, 0.16);
border-radius: 20rpx;
.shop-type-list-item-title {
display: flex;
justify-content: space-between;
align-items: center;
height: 90rpx;
padding: 0 10rpx;
border-bottom: 2rpx solid #F8F9FA;
margin-bottom: 20rpx;
.shop-type-list-item-title-status {
font-size: 28rpx;
color: #666666;
}
.shop-type-list-item-title-detail {
display: flex;
align-items: center;
font-size: 28rpx;
color: #666666;
}
}
.shop-type-list-item-con {
.shop-type-list-item-con-item {
display: flex;
margin-bottom: 20rpx;
.shop-type-list-item-con-key {
min-width: 130rpx;
font-size: 26rpx;
color: #666666;
text-align: left;
}
.shop-type-list-item-con-val {
font-size: 26rpx;
color: #333333;
}
}
}
}
}
}
</style>

2
pages/product/shop_type_change/progress.vue
View File

@ -124,7 +124,7 @@
.shop_type { .shop_type {
.shop_type-head { .shop_type-head {
background-color: #40AE36; background-color: #40AE36;
margin-bottom: 70rpx; margin-bottom: 40rpx;
.shop-type-navbar { .shop-type-navbar {
display: flex; display: flex;

4
pages/store/home/index.vue
View File

@ -1,11 +1,9 @@
<template> <template>
<view> <view>
<view class="content-top"> <view class="content-top">
<view <view
:style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }" :style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }"
class="store-home"> class="store-home">
</view> </view>
<!-- 搜索 --> <!-- 搜索 -->
<!-- #ifdef MP || APP-PLUS --> <!-- #ifdef MP || APP-PLUS -->
@ -1081,7 +1079,7 @@
this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3 this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
} else { } else {
this.tabs = this.tabs5 this.tabs = this.tabs5
this.type=7 this.type = 7
} }
this.tab(this.type) this.tab(this.type)
// #ifdef H5 // #ifdef H5

49
pages/users/order_confirm/index.vue
View File

@ -8,10 +8,10 @@
<text class='phone'>{{addressInfo.phone}}</text> <text class='phone'>{{addressInfo.phone}}</text>
</view> </view>
<view> <view>
<text class='default t-color' <text class='default t-color'
v-if="addressInfo.is_default">[默认]</text>{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}} v-if="addressInfo.is_default">[默认]</text>{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}
<text v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text> <text
v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text>
</view> </view>
</view> </view>
<navigator v-else :url="'/pages/users/user_address/index?cartId='+cartId" hover-class="none" <navigator v-else :url="'/pages/users/user_address/index?cartId='+cartId" hover-class="none"
@ -121,7 +121,7 @@
<view class="boxs"> <view class="boxs">
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view>配送方式</view> <view>配送方式</view>
<view <view
v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)" v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)"
class='discount' @tap="openShowBox(item,index)"> class='discount' @tap="openShowBox(item,index)">
@ -429,7 +429,7 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com> // | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
let app = getApp(); let app = getApp();
import { import {
@ -1028,10 +1028,10 @@
takes: that.take, takes: that.take,
use_coupon: that.subCoupon, use_coupon: that.subCoupon,
use_integral: that.use_integral, use_integral: that.use_integral,
// source: 0 // source: 0
}).then(res => { }).then(res => {
// 默认选中 // 默认选中
that.product_type=res.data.order_type that.product_type = res.data.order_type
that.is_take = false that.is_take = false
res.data.order.forEach(el => { res.data.order.forEach(el => {
if (el.order.isTake == 1) that.is_take = true if (el.order.isTake == 1) that.is_take = true
@ -1084,9 +1084,10 @@
that.order_key = res.data.key that.order_key = res.data.key
that.cartArr[4].title = that.cartArr[4].title =
`结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%` `结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
// console.log(res.data); // console.log(res.data);
if (res.data.order[0].credit_buy == 1 && (this.type_id == 12||this.type_id == 10||this.type_id == 17) && (res.data.order_type==99||res.data.order_type==98)) { if (res.data.order[0].credit_buy == 1 && (this.type_id == 12 || this.type_id == 10 || this
.type_id == 17) && (res.data.order_type == 99 || res.data.order_type == 98)) {
this.cartArr[4].payStatus = 1 this.cartArr[4].payStatus = 1
} else { } else {
this.cartArr[4].payStatus = 0 this.cartArr[4].payStatus = 0
@ -1104,7 +1105,7 @@
}) })
uni.hideLoading(); uni.hideLoading();
}).catch(err => { }).catch(err => {
console.log('err', err); console.log('err', err);
return this.$util.Tips({ return this.$util.Tips({
title: err title: err
}, { }, {
@ -1121,7 +1122,7 @@
if (that.addressId) { if (that.addressId) {
getAddressDetail(that.addressId).then(res => { getAddressDetail(that.addressId).then(res => {
res.data.is_default = parseInt(res.data.is_default); res.data.is_default = parseInt(res.data.is_default);
that.addressInfo = res.data || {}; that.addressInfo = res.data || {};
that.addressId = res.data.address_id || 0; that.addressId = res.data.address_id || 0;
that.address.addressId = res.data.address_id || 0; that.address.addressId = res.data.address_id || 0;
@ -1129,12 +1130,12 @@
real_name: res.data.real_name, real_name: res.data.real_name,
phone: res.data.phone phone: res.data.phone
} }
this.$nextTick(() => { this.$nextTick(() => {
this.getConfirm(that.addressId); this.getConfirm(that.addressId);
}) })
}) })
} else { } else {
getAddressList().then(res => { getAddressList().then(res => {
that.addressInfo = res.data.list.length > 0 ? res.data.list[0] : {}; that.addressInfo = res.data.list.length > 0 ? res.data.list[0] : {};
@ -1155,7 +1156,7 @@
let that = this; let that = this;
let active = e; let active = e;
that.active = active; that.active = active;
// console.log(this.active); // console.log(this.active);
that.animated = true; that.animated = true;
that.payType = that.cartArr[active].value; that.payType = that.cartArr[active].value;
if (that.payType == 'weixin') { if (that.payType == 'weixin') {
@ -1191,14 +1192,14 @@
that.address.address = true; that.address.address = true;
// that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this // that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this
// .pinkId + '&couponId=' + this.couponId; // .pinkId + '&couponId=' + this.couponId;
that.pagesUrl = '/pages/users/user_address_list/index' that.pagesUrl = '/pages/users/user_address_list/index'
} else { } else {
// uni.navigateTo({ // uni.navigateTo({
// url: `/pages/users/user_address/index?cartId=${this.cartId}`, // url: `/pages/users/user_address/index?cartId=${this.cartId}`,
// }); // });
uni.navigateTo({ uni.navigateTo({
url: `pages/users/user_address_list/index`, url: `pages/users/user_address_list/index`,
}); });
} }
}, },
/** /**
@ -1308,7 +1309,7 @@
}); });
}, },
fail: (e) => { fail: (e) => {
console.log(e,'111111111') console.log(e, '111111111')
// 暂不跳转 // 暂不跳转
let url = '/pages/order_pay_status/index?order_id=' + orderId + let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=取消支付' + '&product_type=' + that.product_type; '&msg=取消支付' + '&product_type=' + that.product_type;
@ -1320,7 +1321,7 @@
}); });
}, },
complete: (res) => { complete: (res) => {
uni.hideLoading(); uni.hideLoading();
// 暂不跳转 // 暂不跳转
// let url = '/pages/order_pay_status/index?order_id=' + orderId + // let url = '/pages/order_pay_status/index?order_id=' + orderId +
// '&msg=取消支付' + '&product_type=' + that.product_type; // '&msg=取消支付' + '&product_type=' + that.product_type;
@ -1634,6 +1635,10 @@
// return // return
// } // }
//支付密码 balance 余额支付
uni.showLoading({ uni.showLoading({
title: '订单支付中', title: '订单支付中',
mask: true mask: true
@ -2124,7 +2129,7 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 30; z-index: 30;
.footer_count { .footer_count {
font-size: 28rpx; font-size: 28rpx;
@ -2161,7 +2166,7 @@
border-radius: 50rpx; border-radius: 50rpx;
text-align: center; text-align: center;
line-height: 70rpx; line-height: 70rpx;
flex-shrink: 0; flex-shrink: 0;
&.disabled { &.disabled {
background-color: #cccccc; background-color: #cccccc;

1130
pages/users/user_info/index.vue
View File

File diff suppressed because it is too large Load Diff