Skip to content

L
lumastoreapp
Commit 1b6b1e32 authored by srf's avatar srf
Browse files
Options

Merge branch 'dev' of http://rungit.jxdsy.cn:10000/xys/lumastoreapp into dev

parents 01dd335e d3baad4a
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 89 deletions
manifest.json
View file @ 1b6b1e32
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
//"appid" : "__UNI__FC9419E", //"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的 "appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "", "description" : "",
"versionName" : "1.0.81",
"versionName" : "1.0.78", "versionCode" : 181,
"versionCode" : 178,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
......
pages/CardSend/CardSend.vue
View file @ 1b6b1e32
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
//coupons 商户发放卡券 提交发放卡券的方法 submit //coupons 商户发放卡券 提交发放卡券的方法 submit
async coupons(){ async coupons(){
let can = this.parameter; let can = this.parameter;
can.goods_id = can.goods_id.join(";"); can.goods_id = can.goods_id.join(",");
let res = await addEditCoupons(can); let res = await addEditCoupons(can);
if(res.code==0){ if(res.code==0){
...@@ -559,7 +559,8 @@ ...@@ -559,7 +559,8 @@
console.log(e); console.log(e);
this.parameter.goods_id = e.detail.value; this.parameter.goods_id = e.detail.value;
console.log(this.parameter.goods_id);
console.log(this.shoplist);
this.shoplist = this.shoplist.map((item1,index)=>{//参与的商品默认选中的 this.shoplist = this.shoplist.map((item1,index)=>{//参与的商品默认选中的
if(this.parameter.goods_id.indexOf(item1.product_id)!=-1){ if(this.parameter.goods_id.indexOf(item1.product_id)!=-1){
item1.checked = true; item1.checked = true;
......
pages/deliveryCost/deliveryCost.vue
View file @ 1b6b1e32
...@@ -63,105 +63,175 @@ ...@@ -63,105 +63,175 @@
<view class="mints"> <view class="mints">
*注：餐盒费分配单位为 元 *注：餐盒费分配单位为 元
</view> </view>
<view class="cell_input jus-b ali-c">
<view class="submitbtns" @tap="setShop" >确认</view> <view class="lablename">起步配送费:</view>
<view class="inputboxs ">
<input type="number" class="input" value="" v-model="nitial_delivery_fee" placeholder-class='hahatext' placeholder="请输入" />
</view>
</view>
<view class="mints">
*注：起步配送费单位为 元
</view>
<view class="submitbtns" @tap="setShop">确认</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import {setShopDeliveryPrice} from "@/utils/api/api.js" import {
setShopDeliveryPrice,
getShopDeliveryPrice
} from "@/utils/api/api.js"
export default { export default {
data() { data() {
return { return {
distance:'',//基础距离 distance: '', //基础距离
basics_price:'',//基础距离起步费用 basics_price: '', //基础距离起步费用
single_price:'',//每公里增加费用 single_price: '', //每公里增加费用
dawn:2,// 是否设置凌晨参数 dawn: 2, // 是否设置凌晨参数
dawn_distance:0,//凌晨基础距离 dawn_distance: 0, //凌晨基础距离
dawn_basics_priceP:0,//凌晨基础距离起步费用 dawn_basics_priceP: 0, //凌晨基础距离起步费用
dawn_single_price:0,//凌晨每公里增加费用 dawn_single_price: 0, //凌晨每公里增加费用
meals_fee_price:'',//凌晨每公里增加费用 meals_fee_price: '', //餐盒费分配
nitial_delivery_fee: '', //起步配送费
} }
}, },
onLoad() {
this.getShopDeliveryPriceFun();
},
methods: { methods: {
setShop(){ setShop() {
setShopDeliveryPrice({ this.setShopDeliveryPriceFun();
distance:this.distance,
basics_price:this.basics_price, },
single_price:this.single_price, async setShopDeliveryPriceFun() {
dawn:this.dawn, // if(this.distance==''){
dawn_distance:this.dawn_distance, // this.$api.msg('基础距离不能为空')
dawn_basics_priceP:this.dawn_basics_priceP, // return false
dawn_single_price:this.dawn_single_price, // }
meals_fee_price:this.meals_fee_price, // if(this.basics_price==''){
// this.$api.msg('基础距离起步费用不能为空')
// return false
// }
// if(this.single_price==''){
// this.$api.msg('每公里增加费用不能为空')
// return false
// }
// if(this.meals_fee_price==''){
// this.$api.msg('餐盒费分配不能为空')
// return false
// }
// if(this.nitial_delivery_fee==''){
// this.$api.msg('起步配送费不能为空')
// return false
// }
let res = await setShopDeliveryPrice({
distance: this.distance,
basics_price: this.basics_price,
single_price: this.single_price,
dawn: this.dawn,
dawn_distance: this.dawn_distance,
dawn_basics_priceP: this.dawn_basics_priceP,
dawn_single_price: this.dawn_single_price,
meals_fee_price: this.meals_fee_price,
nitial_delivery_fee: this.nitial_delivery_fee,
}) })
.then( res =>{ if (res.code == 0) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: res.msg, content: res.msg,
}) })
setTimeout(() => {
}) uni.switchTab({
uni.switchTab({ url: '/pages/index/index',
url:'/pages/index/index', });
success: res => {}, }, 600)
fail: () => {},
complete: () => {} }
});
},
// 获取
async getShopDeliveryPriceFun() {
let res = await getShopDeliveryPrice({})
if (res.code == 0) {
this.distance = res.data.distance,
this.basics_price = res.data.basics_price,
this.single_price = res.data.single_price,
this.dawn = res.data.dawn,
this.dawn_distance = res.data.dawn_distance,
this.dawn_basics_priceP = res.data.dawn_basics_priceP,
this.dawn_single_price = res.data.dawn_single_price,
this.meals_fee_price = res.data.meals_fee_price,
this.nitial_delivery_fee = res.data.nitial_delivery_fee
}
} }
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.addcategory{ .addcategory {
margin: 20upx 24upx; margin: 20upx 24upx;
padding: 20upx; padding: 20upx;
padding-top: 70upx; padding-top: 70upx;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 14upx; border-radius: 14upx;
.mints{
margin-left: 40%; .mints {
margin-bottom: 30upx; margin-left: 40%;
color: #ff6900; margin-bottom: 30upx;
font-size: 20upx; color: #ff6900;
font-weight: 500; font-size: 20upx;
} font-weight: 500;
.hahatext{
font-size: 28upx;
}
.cell_input{
margin-bottom: 10upx;
height: 80upx;
line-height: 80upx;
.lablename{
height: 80upx;
line-height: 80upx;
margin-right: 20upx;
} }
.inputboxs{
width: 60%; .hahatext {
border: 1px solid rgb(241, 241, 241); font-size: 28upx;
} }
.inputboxs .input{
padding: 20upx; .cell_input {
margin-bottom: 10upx;
height: 80upx; height: 80upx;
line-height: 80upx; line-height: 80upx;
.lablename {
height: 80upx;
line-height: 80upx;
margin-right: 20upx;
}
.inputboxs {
width: 60%;
border: 1px solid rgb(241, 241, 241);
}
.inputboxs .input {
padding: 20upx;
height: 80upx;
line-height: 80upx;
}
}
.submitbtns {
margin-top: 60upx;
background: $base_color;
color: #FFFFFF;
font-size: 32upx;
border-radius: 12upx;
height: 88upx;
line-height: 88upx;
text-align: center;
} }
} }
.submitbtns{
margin-top: 60upx;
background: $base_color;
color:#FFFFFF;
font-size: 32upx;
border-radius: 12upx;
height: 88upx;
line-height: 88upx;
text-align: center;
}
}
</style> </style>
pages/order/delivery/delivery.vue
View file @ 1b6b1e32
...@@ -4,15 +4,17 @@ ...@@ -4,15 +4,17 @@
<!-- 发货 --> <!-- 发货 -->
<view class="delivery fahuo yocode"> <view class="delivery fahuo yocode">
<view class="fahuobox"> <view class="fahuobox">
<picker @change="bindPickerChange" :value="index" :range="logsitslist"> <!-- <picker @change="bindPickerChange" :value="index" :range="logsitslist"> -->
<view class="selectcell flex ali-c jus-b"> <view class="selectcell flex ali-c jus-b" @tap='pickerone'>
<view class="flex ali-c"> <view class="flex ali-c">
<image class="icons1" src="/static/news/fahuo.png" mode=""></image> <image class="icons1" src="/static/news/fahuo.png" mode=""></image>
<view class="names">{{chindtext==''?'选择快递公司':chindtext}}</view> <view class="names">{{chindtext==''?'选择快递公司':chindtext}}</view>
</view> </view>
<image class="icons2" src="/static/news/xiala.png" mode=""></image> <image class="icons2" src="/static/news/xiala.png" mode=""></image>
</view> </view>
</picker> <lb-picker ref="picker" :list="logsitslist" :value='chindtext' range-key="label" :props="myProps" @confirm='confirm'></lb-picker>
<!-- </picker> -->
<view class="selectcell flex ali-c jus-b"> <view class="selectcell flex ali-c jus-b">
<view class="flex ali-c"> <view class="flex ali-c">
<image class="icons3" src="/static/news/dindhao.png" mode=""></image> <image class="icons3" src="/static/news/dindhao.png" mode=""></image>
...@@ -36,6 +38,10 @@ ...@@ -36,6 +38,10 @@
export default{ export default{
data(){ data(){
return{ return{
myProps: {
label: 'value',
value: 'cate_id',
},
vendor:'', vendor:'',
logsitslist:[ logsitslist:[
"圆通速递", "圆通速递",
...@@ -69,6 +75,13 @@ ...@@ -69,6 +75,13 @@
this.logisticsListfun(); this.logisticsListfun();
}, },
methods:{ methods:{
confirm(e){
console.log(e)
this.chindtext=e.value;
},
pickerone(){
this.$refs.picker.show() // 显示
},
async logisticsListfun(){ async logisticsListfun(){
let res = await logisticsList({ let res = await logisticsList({
...@@ -126,7 +139,7 @@ ...@@ -126,7 +139,7 @@
}, },
//请求end //请求end
bindPickerChange(e){ bindPickerChange(e){
console.log(e.detail.value); console.log(e.detail.value,'哈哈哈');
this.chindtext = this.logsitslist[e.detail.value]; this.chindtext = this.logsitslist[e.detail.value];
}, },
//扫码方法 //扫码方法
......
pages/order/shopOrder.scss
View file @ 1b6b1e32
...@@ -45,7 +45,12 @@ ...@@ -45,7 +45,12 @@
//订单列表 //订单列表
.listorder{ .listorder{
margin: 20upx 24upx; margin: 20upx 24upx;
.cretime{
color: #888888;
font-size: 22upx;
font-weight: 500;
margin-bottom: 20upx;
}
//单个订单 //单个订单
.orderItemss{ .orderItemss{
background: #FFFFFF; background: #FFFFFF;
...@@ -155,4 +160,7 @@ ...@@ -155,4 +160,7 @@
border-top: 1px solid rgba(229,229,234,1); border-top: 1px solid rgba(229,229,234,1);
padding: 20upx 0; padding: 20upx 0;
box-sizing: border-box; box-sizing: border-box;
}
.mt-20{
margin-top: 20upx;
} }
\ No newline at end of file
pages/order/shopOrder.vue
View file @ 1b6b1e32
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
</view> </view>
</view> </view>
<view class="cretime mt-10">
下单时间：{{item.create_time}}
</view>
<view> <view>
<!-- 列表 --> <!-- 列表 -->
<view class="order_body " v-for="(productList,index1) in item.products" :key="index1" > <view class="order_body " v-for="(productList,index1) in item.products" :key="index1" >
...@@ -49,7 +52,7 @@ ...@@ -49,7 +52,7 @@
</view> </view>
<view class="order_foot bodbod flex jus-e mb-20 mt-10"> <view v-if="productList.operation!=''" class="order_foot bodbod flex jus-e mb-20 mt-20">
<block v-for="(action,index) in productList.operation" :key="index"> <block v-for="(action,index) in productList.operation" :key="index">
<view class='btnss ' :data-orderid='item.order_id' :data-vendor='index1' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view> <view class='btnss ' :data-orderid='item.order_id' :data-vendor='index1' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view>
</block> </block>
......
pages/order/shoporderdetail/shoporderdetail.vue
View file @ 1b6b1e32
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</view> </view>
<view class="cellitems flex ali-c jus-b"> <view class="cellitems flex ali-c jus-b">
<view class="name">创建时间</view> <view class="name">创建时间</view>
<view class="vlas">¥{{logs.createtime}}</view> <view class="vlas">{{logs.createtime}}</view>
</view> </view>
<view class="cellitems flex ali-c jus-b" v-if="detail.status==4"> <view class="cellitems flex ali-c jus-b" v-if="detail.status==4">
<view class="name">退款原因</view> <view class="name">退款原因</view>
......
utils/api/api.js
View file @ 1b6b1e32
...@@ -482,3 +482,10 @@ export function geTPublicadvices(data) ...@@ -482,3 +482,10 @@ export function geTPublicadvices(data)
return request.post("store/geTPublicadvices",data,{ noAuth : true}); return request.post("store/geTPublicadvices",data,{ noAuth : true});
} }
//获取配送费(外卖)
export function getShopDeliveryPrice(data)
{
return request.post("user/getShopDeliveryPrice",data,{ noAuth : true});
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment