Commit 190431d9 authored by zhangjianguo's avatar zhangjianguo

修改样式

parent 83de98fd
...@@ -36,25 +36,25 @@ ...@@ -36,25 +36,25 @@
<view <view
style="margin-top: 40rpx;" style="margin-top: 40rpx;"
class="block" class="block"
v-if="d.ReOrderStatusName=='已换货'" v-if="d.ReOrderStatus=='3'"
> >
<view class="good-title">换货物流</view> <view class="good-title">{{d.Type==1?'退货物流':'换货物流'}} </view>
<view class="filed"> <view class="filed">
<view class="key">快递公司</view> <view class="key">快递公司</view>
<view class="val"> <view class="val">
{{ d.TExpressList[0].ExpressName }} {{d.Type==1? d.TExpressList[0].ExpressName: d.HExpressList[0].ExpressName }}
</view> </view>
</view> </view>
<view class="filed"> <view class="filed">
<view class="key">快递单号</view> <view class="key">快递单号</view>
<view class="val"> <view class="val">
{{ d.TExpressList[0].ExpressNumber }} {{d.Type==1? d.TExpressList[0].ExpressNumber: d.HExpressList[0].ExpressNumber }}
</view> </view>
</view> </view>
<view class="filed"> <view class="filed">
<view class="key">商家留言</view> <view class="key">快递类型</view>
<view class="val" style="color:#c0392b"> <view class="val" style="color:#c0392b">
{{ d.merchant_remark }} {{d.Type==1? (d.TExpressList[0].Type==1?'快递':"其他") : (d.HExpressList[0].Type==1?'快递':"其他") }}
</view> </view>
</view> </view>
</view> </view>
...@@ -140,19 +140,19 @@ ...@@ -140,19 +140,19 @@
</view> </view>
<view class="filed"> <view class="filed">
<view class="key">收件地址</view> <view class="key">收件地址</view>
<view class="val">{{ d.refundAddress.address }}</view> <view class="val">{{RecipientInfo.DistrictAddress }}{{RecipientInfo.Address}}</view>
</view> </view>
<view class="filed"> <view class="filed">
<view class="key">收件人</view> <view class="key">收件人</view>
<view class="val">{{ d.refundAddress.name }}</view> <view class="val">{{ RecipientInfo.Name }}</view>
</view> </view>
<view class="filed"> <view class="filed">
<view class="key">联系电话</view> <view class="key">联系电话</view>
<view class="val">{{ d.refundAddress.mobile }}</view> <view class="val">{{ RecipientInfo.Mobile }}</view>
</view> </view>
<view class="filed"> <view class="filed">
<view class="key">快递备注</view> <view class="key">快递备注</view>
<view class="val">{{ d.refundAddress.remark }}</view> <view class="val">{{ RecipientInfo.Remarks }}</view>
</view> </view>
</template> </template>
</view> </view>
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
v-model="showExpress" v-model="showExpress"
:default-selector="[0]" :default-selector="[0]"
:range="expressList" :range="expressList"
range-key="name" range-key="Name"
:safe-area-inset-bottom="true" :safe-area-inset-bottom="true"
@confirm="chosenExpressHandler" @confirm="chosenExpressHandler"
></u-picker> ></u-picker>
...@@ -283,6 +283,7 @@ export default { ...@@ -283,6 +283,7 @@ export default {
submitStatus: false, submitStatus: false,
expressList: [], expressList: [],
showExpress: false, showExpress: false,
RecipientInfo:{},
forms: { forms: {
ReOrderId:-1, ReOrderId:-1,
ExpressId: -1, ExpressId: -1,
...@@ -333,29 +334,21 @@ export default { ...@@ -333,29 +334,21 @@ export default {
tmplIds: that.d.template_message_list, tmplIds: that.d.template_message_list,
complete(res) { complete(res) {
let msg = ""; let msg = "";
if (that.forms.ExpressId == -1) { if (that.forms.ExpressId == -1) {
msg = "请选择快递公司"; msg = "请选择快递公司";
} else if (that.forms.ExpressNumber == "") { } else if (that.forms.ExpressNumber == "") {
msg = "请输入快递单号"; msg = "请输入快递单号";
} }
if (msg == "") { if (msg == "") {
let h = that.apiheader();
h["content-type"] = "application/x-www-form-urlencoded"; that.request2(
that.request(
{ {
url: "", url: '/api/AppletOrder/SetAppletOrderSendGoods',
header: h, data: that.forms
data: {
r: "api/order/refund-send",
id: that.id,
express: that.forms.expressName,
customer_name: "",
express_no: that.forms.ExpressNumber,
},
method: "POST",
}, },
(res) => { (res) => {
if (res.code == 0) { if (res.resultCode == 1) {
that.$refs.uTips.show({ that.$refs.uTips.show({
title: "已提交快递信息,请等待商家签收", title: "已提交快递信息,请等待商家签收",
type: "success", type: "success",
...@@ -364,7 +357,7 @@ export default { ...@@ -364,7 +357,7 @@ export default {
that.init(); that.init();
} else { } else {
that.$refs.uTips.show({ that.$refs.uTips.show({
title: res.msg, title: res.message,
type: "error", type: "error",
duration: "2300", duration: "2300",
}); });
...@@ -387,8 +380,9 @@ export default { ...@@ -387,8 +380,9 @@ export default {
this.showExpress = true; this.showExpress = true;
}, },
chosenExpressHandler(i) { chosenExpressHandler(i) {
this.forms.ExpressId = this.expressList[i[0]].id;
this.forms.expressName = this.expressList[i[0]].name; this.forms.ExpressId = this.expressList[i].ID;
this.forms.expressName = this.expressList[i].Name;
}, },
previewImage(i, images) { previewImage(i, images) {
uni.previewImage({ uni.previewImage({
...@@ -426,14 +420,30 @@ export default { ...@@ -426,14 +420,30 @@ export default {
this.loading = false; this.loading = false;
this.currentStatus = this.d.ReOrderStatus - 1; this.currentStatus = this.d.ReOrderStatus - 1;
this.getExpressInfo() this.forms.ReOrderId = res.data.ReOrderId
// if (this.d.ReOrderStatusName == 1) {
// this.currentStatus += 1; if(res.data.ReOrderStatus==2){
// } else if (this.d.ReOrderStatusName == "待退款" || this.d.status_text == "已换货") { this.init2()
// this.currentStatus += 2; this.getExpressInfo();
// } else if (this.d.status_text == "已退款") { }
// this.currentStatus += 3;
// }
}
);
},
init2(){
this.request2(
{
url: '/api/AppletOrder/GetAppletOrderBuyerToDeliverInfo',
data: {
ReOrderId:this.id
}
},
(res) => {
this.RecipientInfo = res.data.RecipientInfo;
} }
); );
}, },
......
...@@ -141,8 +141,7 @@ export default { ...@@ -141,8 +141,7 @@ export default {
fontSize: "13px", fontSize: "13px",
width: "100%", width: "100%",
}, },
action: action:this.host2+'/api/File/UploadTencent',
"https://wx.weibaoge.cn/web/index.php?_mall_id=1285&r=api/attachment/upload",
}; };
}, },
onLoad(option) { onLoad(option) {
......
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
</view> </view>
</view> </view>
<view v-if="sharestatus.Status==2" style="width: 100%;display: flex;flex-direction: column;align-items: center;"> <view v-if="sharestatus.Status==2" style="width: 100%;display: flex;flex-direction: column;align-items: center;">
<image :src="bg_img" style="width: 100%;height: 165px;"></image> <image src="../../../static/images/icon/img-share-status.png" style="width: 100%;height: 165px;"></image>
<Text style='margin-top: 70px;'>谢谢您的支持,请等待审核</Text> <Text style='margin-top: 70px;'>谢谢您的支持,请等待审核</Text>
<view style="display: flex;align-items: center;justify-content: center;margin-top: 60rpx;"> <view style="display: flex;align-items: center;justify-content: center;margin-top: 60rpx;">
<u-button shape="circle" type="error" size="medium" @click='goshoping'>去商城逛逛</u-button> <u-button shape="circle" type="error" size="medium" @click='goshoping'>去商城逛逛</u-button>
</view> </view>
</view> </view>
<view v-if="sharestatus.Status==4" style="width: 100%;display: flex;flex-direction: column;align-items: center;"> <view v-if="sharestatus.Status==4" style="width: 100%;display: flex;flex-direction: column;align-items: center;">
<image :src="bg_img" style="width: 100%;height: 165px;"></image> <image src="../../../static/images/icon/img-share-status.png" style="width: 100%;height: 165px;"></image>
<Text style='margin-top: 70px;'>{{sharestatus.Msg}}</Text> <Text style='margin-top: 70px;'>{{sharestatus.Msg}}</Text>
<!-- <view style="display: flex;align-items: center;justify-content: center;margin-top: 60rpx;"> <!-- <view style="display: flex;align-items: center;justify-content: center;margin-top: 60rpx;">
<u-button shape="circle" type="error" size="medium" @click='goshoping'>去商城逛逛</u-button> <u-button shape="circle" type="error" size="medium" @click='goshoping'>去商城逛逛</u-button>
......
<template> <template>
<view :style="{'height':contentHeight}" class="levelStyle"> <view :style="{'height':contentHeight}" class="levelStyle">
<image :src="level_bg" v-if="level=='' " style="width: 100%;height: 100%;"></image> <image src="../../../static/images/icon/no-level-bg.png" v-if="level=='' " style="width: 100%;height: 100%;"></image>
<view :style="{ 'background-image': 'url(' + level_bg2 + ')', backgroundSize: '100%' }" v-if='level_bg2!="" ' class="imgbg"> <view :style="{ 'background-image': 'url(' + level_bg2 + ')', backgroundSize: '100%' }" v-if='level_bg2!="" ' class="imgbg">
<Text class='leveltop'>满足以下条件即可升级</Text> <Text class='leveltop'>满足以下条件即可升级</Text>
<view class='levelc'> <view class='levelc'>
......
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