Skip to content

M
mallapp
Commit d2b59d07 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents 1486ce1a d45ef3f0
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 85 deletions
App.vue
View file @ d2b59d07
...@@ -24,18 +24,16 @@ export default { ...@@ -24,18 +24,16 @@ export default {
this.basedata = uni.getStorageSync("basedata"); this.basedata = uni.getStorageSync("basedata");
this.formatTabbar(); this.formatTabbar();
} else { } else {
this.request( this.request2(
{ {
url: "", url: '/api/Mall/GetHome',
data: { data: {
r: "api/index/config", },
},
}, },
(res) => { (res) => {
uni.setStorageSync("basedata", res.data); uni.setStorageSync("basedata", res.data);
this.basedata = res.data; this.basedata = res.data;
this.formatTabbar(); this.formatTabbar();
//this.pageTitle = res.data.mall.name;
} }
); );
} }
......
pages/goods/comment-list.vue
View file @ d2b59d07
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
<view class="content" v-for="(x, i) in comments" :key="i"> <view class="content" v-for="(x, i) in comments" :key="i">
<view class="u-box"> <view class="u-box">
<view class="user"> <view class="user">
<u-avatar :src="x.avatar" :size="50"></u-avatar> <u-avatar :src="x.UserPhotoPath" :size="50"></u-avatar>
<text style="margin-left: 10px;">{{ x.nickname }}</text> <text style="margin-left: 10px;">{{ x.UserName }}</text>
</view> </view>
<view class="timer">{{ x.time }}</view> <view class="timer">{{ x.CreateDate }}</view>
</view> </view>
<view class="ucontent">{{ x.content }}</view> <view class="ucontent">{{ x.Content }}</view>
<view class="imagebox" v-for="(y, yi) in x.formatPic" :key="yi"> <view class="imagebox" v-for="(y, yi) in x.formatPic" :key="yi">
<view <view
class="item" class="item"
...@@ -90,6 +90,12 @@ export default { ...@@ -90,6 +90,12 @@ export default {
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多评论了", nomore: "没有更多评论了",
}, },
msg:{
pageIndex:1,
pageSize:20,
GoodsId:0,
CommentGrade:0
}
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -140,28 +146,27 @@ export default { ...@@ -140,28 +146,27 @@ export default {
this.isover = false; this.isover = false;
this.loading = true; this.loading = true;
this.showLoading = this.page != 1; this.showLoading = this.page != 1;
this.request( this.msg.GoodsId=this.id;
this.request2(
{ {
url: "", url: "/api/AppletOrder/GetAppletGoodsCommentPageList",
data: { data: this.msg,
r: "api/goods/comments-list",
goods_id: this.id,
page: this.page,
status: this.commentCount.length>0?this.commentCount[this.current].index:0,
},
}, },
(res) => { (res) => {
this.comments = res.data.comments; this.comments = res.data.pageData;
this.comments.forEach((x) => { this.comments.forEach((x) => {
x.formatPic = this.formatPic(x.pic_url); x.formatPic = this.formatPic(x.CommentImgList);
}); });
//TODO 缺陷待处理 //TODO 缺陷待处理
this.commentCount = res.data.comment_count; // this.commentCount = res.data.comment_count;
this.commentCount = res.data.pageData;
this.pageCount = Math.ceil( this.pageCount = Math.ceil(
parseFloat(this.commentCount[0].count) / 10.0 // parseFloat(this.commentCount[0].count) / 10.0
parseFloat(res.data.count) / 10.0
); );
this.commentCount.forEach((x) => { this.commentCount.forEach((x) => {
x.name = x.name + "(" + x.count + ")"; x.name = x.UserName + "(" + x.Content + ")";
}); });
this.showLoading = true; this.showLoading = true;
if (this.pageCount == 1) { if (this.pageCount == 1) {
......
pages/goods/goods.vue
View file @ d2b59d07
...@@ -139,17 +139,17 @@ ...@@ -139,17 +139,17 @@
<view <view
class="sku-box u-skeleton-rect" class="sku-box u-skeleton-rect"
v-if="comments.comments.length == 0 && setting.is_comment == '1'" v-if="comments.length == 0 && setting.is_comment == '1'"
> >
<view class="label">暂无评论信息</view> <view class="label">暂无评论信息</view>
</view> </view>
<view class="comment" v-if="comments.comments.length > 0"> <view class="comment" v-if="comments.length > 0">
<view class="chead"> <view class="chead">
<u-section <u-section
:bold="false" :bold="false"
:sub-color="secondary" :sub-color="secondary"
:show-split="false" :show-split="false"
:title="`商品评价(${comments.comments.length})`" :title="`商品评价(${comments.length})`"
sub-title="查看更多" sub-title="查看更多"
@click="clickCommentHandler" @click="clickCommentHandler"
font-size="24" font-size="24"
...@@ -159,16 +159,16 @@ ...@@ -159,16 +159,16 @@
<view class="u-box"> <view class="u-box">
<view class="user"> <view class="user">
<u-avatar <u-avatar
:src="comments.comments[0].avatar" :src="comments[0].UserPhotoPath"
:size="50" :size="50"
></u-avatar> ></u-avatar>
<text style="margin-left: 10px;">{{ <text style="margin-left: 10px;">{{
comments.comments[0].nickname comments[0].UserName
}}</text> }}</text>
</view> </view>
<view class="timer">{{ comments.comments[0].time }}</view> <view class="timer">{{ comments[0].CreateDate }}</view>
</view> </view>
<view class="ucontent">{{ comments.comments[0].content }}</view> <view class="ucontent">{{ comments[0].Content }}</view>
</view> </view>
</view> </view>
<u-divider :margin-top="20" :margin-bottom="20" bg-color="transparent" <u-divider :margin-top="20" :margin-bottom="20" bg-color="transparent"
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
v-if="!isExsitGoods" v-if="!isExsitGoods"
></u-empty> ></u-empty>
<share <share
:good-id="id" :id="id"
v-if="showShare" v-if="showShare"
:good-name="g.name" :good-name="g.name"
:images="g.pic_url" :images="g.pic_url"
...@@ -258,7 +258,13 @@ export default { ...@@ -258,7 +258,13 @@ export default {
prevPage: "", prevPage: "",
//自定义接手传递 //自定义接手传递
opTionObj: {}, opTionObj: {},
showShare:false showShare:false,
msg:{
pageIndex:1,
pageSize:20,
GoodsId:0,
CommentGrade:0
}
}; };
}, },
components: { components: {
...@@ -269,7 +275,6 @@ export default { ...@@ -269,7 +275,6 @@ export default {
share, share,
}, },
onLoad(option) { onLoad(option) {
console.log(option, "optionnnn");
this.opTionObj = option; this.opTionObj = option;
this.id = option.GoodsId ? option.GoodsId : 29; //40887 59512 46942 this.id = option.GoodsId ? option.GoodsId : 29; //40887 59512 46942
this.init(); this.init();
...@@ -333,7 +338,6 @@ export default { ...@@ -333,7 +338,6 @@ export default {
this.skuimage.push(x.pic_url); this.skuimage.push(x.pic_url);
} }
}); });
console.log(this.skuimage);
var richtext = this.g.detail; var richtext = this.g.detail;
richtext = richtext.replace( richtext = richtext.replace(
/<img/g, /<img/g,
...@@ -372,18 +376,16 @@ export default { ...@@ -372,18 +376,16 @@ export default {
}); });
}, },
initComments() { initComments() {
this.request( this.msg.GoodsId=this.id;
console.log(this.msg,'msg');
this.request2(
{ {
url: "", url: "/api/AppletOrder/GetAppletGoodsCommentPageList",
data: { data: this.msg,
r: "api/goods/comments-list",
goods_id: this.id,
page: 1,
status: 0,
},
}, },
(res) => { (res) => {
this.comments = res.data; console.log(res,'pinglun');
this.comments = res.data.pageData;
// this.initRecommend(); // this.initRecommend();
} }
); );
...@@ -398,6 +400,7 @@ export default { ...@@ -398,6 +400,7 @@ export default {
}, },
(res) => { (res) => {
this.recommend = res.data.List; this.recommend = res.data.List;
console.log(this.recommend,'recommeds');
} }
); );
}, },
......
pages/order/after-sale/refunds-detail.vue
View file @ d2b59d07
...@@ -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>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
>￥{{ d.OrderInfo.Number }}</text >￥{{ d.OrderInfo.Number }}</text
> >
</view> </view>
</view> </view>
</view> </view>
<view class="customer"> <view class="customer">
<button <button
...@@ -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,17 +420,33 @@ export default { ...@@ -426,17 +420,33 @@ 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;
}
);
},
getExpressInfo(){ getExpressInfo(){
this.request2( this.request2(
{ {
......
pages/order/after-sale/refunds.vue
View file @ d2b59d07
...@@ -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) {
......
pages/share/index/index.vue
View file @ d2b59d07
...@@ -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>
......
pages/share/level/level.vue
View file @ d2b59d07
<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