Skip to content

L
lumastoreapp
Commit ea6df2a6 authored by haitao's avatar haitao
Browse files
Options

laopang

parents 25ff905e e41f2694
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 26 deletions
pages/ViewLogistics/ViewLogistics.vue
View file @ ea6df2a6
...@@ -114,6 +114,7 @@ export default { ...@@ -114,6 +114,7 @@ export default {
let params = { let params = {
order_id: options.order_id, order_id: options.order_id,
action: options.action, action: options.action,
vendor_id:options.vendor,
}; };
checkLogistics(params).then(res => { checkLogistics(params).then(res => {
console.log(res); console.log(res);
......
pages/deliveryCost/deliveryCost.vue
View file @ ea6df2a6
...@@ -55,13 +55,13 @@ ...@@ -55,13 +55,13 @@
</view> </view>
</view> </view>
<view class="cell_input jus-b ali-c"> <view class="cell_input jus-b ali-c">
<view class="lablename">餐盒费设置:</view> <view class="lablename">餐盒费分配:</view>
<view class="inputboxs "> <view class="inputboxs ">
<input type="number" class="input" value="" v-model="meals_fee_price" placeholder-class='hahatext' placeholder="请输入餐盒费" /> <input type="number" class="input" value="" v-model="meals_fee_price" placeholder-class='hahatext' placeholder="请输入" />
</view> </view>
</view> </view>
<view class="mints"> <view class="mints">
*注：餐盒费单位为 元 *注：餐盒费分配单位为 元
</view> </view>
......
pages/order/delivery/delivery.vue
View file @ ea6df2a6
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
export default{ export default{
data(){ data(){
return{ return{
vendor:'',
logsitslist:[ logsitslist:[
"圆通速递", "圆通速递",
"百世快递", "百世快递",
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
}, },
onLoad(opdata) { onLoad(opdata) {
this.order_id = opdata.order_id; this.order_id = opdata.order_id;
this.vendor = opdata.vendor;
this.logisticsListfun(); this.logisticsListfun();
}, },
methods:{ methods:{
...@@ -100,6 +102,7 @@ ...@@ -100,6 +102,7 @@
logisticCode:this.logscode,//物流好 快递单号 订单号 logisticCode:this.logscode,//物流好 快递单号 订单号
shipperName:this.chindtext,//名称 快递公司编号 名称 shipperName:this.chindtext,//名称 快递公司编号 名称
order_id:this.order_id,//订单id 订单id order_id:this.order_id,//订单id 订单id
vendor_id:this.vendor,
}); });
if(res.code==0){ if(res.code==0){
......
pages/order/shopOrder.scss
View file @ ea6df2a6
...@@ -137,4 +137,22 @@ ...@@ -137,4 +137,22 @@
font-family:PingFang SC; font-family:PingFang SC;
font-weight:bold; font-weight:bold;
color:rgba(255,105,0,1); color:rgba(255,105,0,1);
}
.btnss{
width:144upx;
height:56upx;
background:rgba(246,79,21,1);
border-radius:10upx;
line-height: 56upx;
text-align: center;
font-size:28upx;
margin-left: 20upx;
font-weight:500;
color:rgba(255,255,255,1);
}
.bodbod{
border-bottom: 1px solid rgba(229,229,234,1);
border-top: 1px solid rgba(229,229,234,1);
padding: 20upx 0;
box-sizing: border-box;
} }
\ No newline at end of file
pages/order/shopOrder.vue
View file @ ea6df2a6
...@@ -29,28 +29,38 @@ ...@@ -29,28 +29,38 @@
</view> </view>
<view> <view>
<!-- 列表 --> <!-- 列表 -->
<view class="order_body flex " v-for="(product,index) in item.products" :key="index" > <view class="order_body " v-for="(productList,index1) in item.products" :key="index1" >
<!-- <image class="imgs" src="" mode=""></image> --> <view class="flex mb-20" v-for="(product,index) in productList" :key="index">
<image class="imgs" :src="staticUrl+product.photo" v-if="product.photo" mode=""></image> <!-- <image class="imgs" src="" mode=""></image> -->
<image class="imgs" :src="staticUrl+item.photo" mode="" v-else ></image> <image class="imgs" :src="staticUrl+product.photo" v-if="product.photo" mode=""></image>
<view class="body_r flex1 "> <image class="imgs" :src="staticUrl+item.photo" mode="" v-else ></image>
<view class="title twoline">{{product.goods_name}}</view> <view class="body_r flex1 ">
<view class="prices"> <view class="title twoline">{{product.goods_name}}</view>
<text class="text isprice">{{product.fprice}}元</text> <view class="prices">
<!-- <text class="text">充值价{{product.recprice}}元</text> --> <text class="text">价格{{product.fprice}}元</text>
</view> <!-- <text class="text">充值价{{product.recprice}}元</text> -->
<view class="specs"> </view>
<text class="text">规格：{{product.sku_name}}</text> <view class="specs">
<!-- <text class="text">包装:2袋装</text> --> <text class="text">规格:{{product.sku_name}}</text>
<view>数量: x {{product.goodsnum}}</view> <!-- <text class="text">包装:2袋装</text> -->
<view>数量: x {{product.goodsnum}}</view>
</view>
</view> </view>
</view>
<view class="order_foot bodbod flex jus-e mb-20 mt-10">
<block v-for="(action,index) in item.order_operation.slice(-1)" :key="index">
<view class='btnss ' :data-vendor="item.products[index1][0].vendor_id" :data-orderid='item.order_id' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view>
</block>
</view> </view>
</view> </view>
</view> </view>
<view class="pricebox flex ali-c jus-b"> <view class="pricebox flex ali-c jus-b">
<!-- 剩余时间 只有待支付的时候有 未付款的时候才有 --> <!-- 剩余时间 只有待支付的时候有 未付款的时候才有 -->
<view class="titme oneline flex1" @tap="totkxq(item.refund_details)" v-if="item.status==4">退款原因:{{item.refund_details}}</view> <view class="titme oneline flex1" v-if="item.status==4">退款原因:{{item.refund_details}}</view>
<view v-else></view> <view v-else></view>
<view class="heji">合计<text class="fuhao">¥</text><text class="shuzi">{{item.total}}</text></view> <view class="heji">合计<text class="fuhao">¥</text><text class="shuzi">{{item.total}}</text></view>
</view> </view>
...@@ -60,9 +70,13 @@ ...@@ -60,9 +70,13 @@
<!-- <view class="btnitem">查看订单</view> <!-- <view class="btnitem">查看订单</view>
<view class="btnitem bg">查看物流</view> --> <view class="btnitem bg">查看物流</view> -->
<block v-for="(action,index) in item.order_operation" :key="index"> <block v-for="(action,index) in item.order_operation.slice(0,-1)" :key="index">
<view class='btnitem ' :class="item.class_name" :data-orderid='item.order_id' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view> <view class='btnss ' :data-orderid='item.order_id' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view>
</block> </block>
<!-- <block v-if="item.products.length<=1" v-for="(action,index) in item.order_operation" :key="index">
<view class='btnitem ' :data-vendor="item.products[index1][0].vendor_id" :data-orderid='item.order_id' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view>
</block> -->
</view> </view>
</view> </view>
...@@ -227,6 +241,7 @@ ...@@ -227,6 +241,7 @@
let that = this; let that = this;
let action = event.currentTarget.dataset.action; let action = event.currentTarget.dataset.action;
let order_id = event.currentTarget.dataset.orderid; let order_id = event.currentTarget.dataset.orderid;
let vendor = event.currentTarget.dataset.vendor;
switch (action) { switch (action) {
case 'oneKeyCancel': //一键核销 OK case 'oneKeyCancel': //一键核销 OK
that.requestOrder(order_id, action); that.requestOrder(order_id, action);
...@@ -235,10 +250,10 @@ ...@@ -235,10 +250,10 @@
break; break;
case 'oneKeyShipments': //一键发货 OK case 'oneKeyShipments': //一键发货 OK
console.info("一键发货"); console.info("一键发货");
that.express(order_id, action); that.express(order_id, action,vendor);
break; break;
case 'checkLogistics': //查看物流 case 'checkLogistics': //查看物流
that.logistics(order_id, action); that.logistics(order_id, action,vendor);
// this.$api.msg("开发中,敬请期待~"); // this.$api.msg("开发中,敬请期待~");
console.info("查看物流"); console.info("查看物流");
break; break;
...@@ -286,9 +301,9 @@ ...@@ -286,9 +301,9 @@
} }
}, },
//查看物流 //查看物流
logistics: function (order_id, action) { logistics: function (order_id, action,vendor) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/ViewLogistics/ViewLogistics?order_id=' + order_id + '&action=' + action url: '/pages/ViewLogistics/ViewLogistics?order_id=' + order_id + '&action=' + action + '&vendor=' + vendor
}) })
}, },
//跳转订单详情 商家查看店铺的订单详情 //跳转订单详情 商家查看店铺的订单详情
...@@ -299,9 +314,9 @@ ...@@ -299,9 +314,9 @@
}) })
}, },
// 跳转发快递订单 ok 发货 // 跳转发快递订单 ok 发货
express (order_id, action) { express (order_id, action,vendor) {
uni.redirectTo({ uni.redirectTo({
url: '/pages/order/delivery/delivery?order_id=' + order_id + '&action=' + action url: '/pages/order/delivery/delivery?order_id=' + order_id + '&action=' + action + '&vendor=' + vendor
}) })
}, },
//请求后台操作订单 一键核销 //请求后台操作订单 一键核销
......
utils/debug.js
View file @ ea6df2a6
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
//环境变量 这个是 鹿马商家助手的 商家助手的~~~~ //环境变量 这个是 鹿马商家助手的 商家助手的~~~~
module.exports = { module.exports = {
//是否为开发调试环境 true为本地环境 false 为正式环境 //是否为开发调试环境 true为本地环境 false 为正式环境
//isdebug:true,//测试 //isdebug:true,//测试
isdebug:false,//正式 isdebug:false,//正式
xqdebug:false,//正式权限 xqdebug:false,//正式权限
//xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios //xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
......
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