Skip to content

M
mallapp
Commit dd86fe67 authored by Mac's avatar Mac
Browse files
Options

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

parents ecbc760c 0c5fb1cf
Expand all Show whitespace changes
Inline Side-by-side
Showing with 9018 additions and 10193 deletions
pages/guidecar/guidecarGoodsdetails.vue
View file @ dd86fe67
This diff is collapsed.
pages/guidecar/guidecarList.vue
View file @ dd86fe67
This diff is collapsed.
pages/guidecar/guidedetails.vue
View file @ dd86fe67
<template>
<view class="guidedetails" >
<view class="guidedetails">
<view class="guide" :style="{'height':(windowHeight-30)+'px'}" v-if='type==1&& loading==true'>
<view class="guide-top">
<u-avatar :src="guideModel.GuidePhoto" :size="120"></u-avatar>
<view class="column" style="height: 36px;justify-content: space-between;margin-left: 10px;">
<view class="row">
<span>{{guideModel.Name}}</span>
</view>
<view class="row" style="display: flex;flex-direction: row;align-items: center;">
<u-rate
:current="guideModel.Score"
active-color="#FF8C10"
inactive-color="#D5D5D5"
active-icon="star"
inactive-icon="star-o"
size="34"
:disabled="true"
></u-rate>
<u-rate :current="guideModel.Score" active-color="#FF8C10" inactive-color="#D5D5D5" active-icon="star"
inactive-icon="star-o" size="34" :disabled="true"></u-rate>
<span style='font-size: 14px;color: #A8A8A8;margin-left: 10px;'>{{guideModel.Score.toFixed(1)}}</span>
</view>
</view>
</view>
<view class="guide-info">
......@@ -29,10 +19,6 @@
<span class='info-text'>工龄：</span>
<span>{{guideModel.WorkYears}}年</span>
</view>
<!-- <view class="guide-info-item">
<span class='info-text'>电话：</span>
<span>{{guideModel.Telephone}}</span>
</view> -->
<view class="guide-info-item">
<span class='info-text'>服务人数：</span>
<span>{{guideModel.OrderGuestNum}}人</span>
......@@ -46,8 +32,6 @@
<view class="guide-info-item">
<span class='info-text'>个人简介：</span>
</view>
</view>
<view style='padding: 10px;'>
<h-parse :content="detailContent" @navigate="clickDescription"></h-parse>
......@@ -55,41 +39,28 @@
</view>
<view class="guide" v-if='type==2&& loading==true' :style="{'height':(windowHeight-30)+'px'}">
<view class="u-skeleton-rect">
<swiper
indicator-dots
:autoplay="false"
:interval="1000"
style="height:170px;width: 300px;"
>
<swiper indicator-dots :autoplay="false" :interval="1000" style="height:170px;width: 300px;">
<block v-for="(item, index) in guidecar.PicList" :key="index">
<swiper-item>
<video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo" v-if="item.type==1" :src="item"
:autoplay="false" loop muted show-play-btn :enable-progress-gesture="true"
:controls="true" :show-progress="true" :show-mute-btn="true" objectFit="cover"></video>
:autoplay="false" loop muted show-play-btn :enable-progress-gesture="true" :controls="true" :show-progress="true"
:show-mute-btn="true" objectFit="cover"></video>
<image @click="previewImage(index)" style="width:100%;height:100%;" v-else :src="item" mode=""></image>
</swiper-item>
</block>
</swiper>
</view>
<view style="margin-top: 15px ;font-size: 16px;display: flex;flex-direction: row;align-items: center" >
<view style="margin-top: 15px ;font-size: 16px;display: flex;flex-direction: row;align-items: center">
<image :src="carModel.CarLogo" mode="aspectFill" style="width: 25px;height: 25px;margin-right: 10px;"></image>
{{carModel.CarBrand!=''?carModel.CarBrand:'无'}}
</view>
<view class="row" >
<u-rate
:current="carModel.Score"
active-color="#FF8C10"
inactive-color="#D5D5D5"
active-icon="star"
inactive-icon="star-o"
size="34"
:disabled="true"
></u-rate>
<view class="row">
<u-rate :current="carModel.Score" active-color="#FF8C10" inactive-color="#D5D5D5" active-icon="star" inactive-icon="star-o"
size="34" :disabled="true"></u-rate>
<span style='font-size: 14px;color: #A8A8A8;margin-left: 10px;'>{{carModel.Score.toFixed(1)}}</span>
</view>
<view style="width: 98%;height: 1px;background: #E2E2E2;margin-top: 10px;"></view>
<view class="guide-info">
<view class="guide-info-item">
<span class='info-text'>颜色：</span>
<span>{{guidecar.ColorName}}</span>
......@@ -106,7 +77,6 @@
<span class='info-text'>型号：</span>
<span>{{carModel.CarType}}</span>
</view>
<view class="guide-info-item" style="width: 100%;">
<span class='info-text'>购买年限：</span>
<span>{{g.car_buyyear}}年</span>
......@@ -117,43 +87,40 @@
</template>
<script>
import hParse from "@/components/u-parse/parse.vue";
export default {
import hParse from "@/components/u-parse/parse.vue";
export default {
components: {
hParse,
// share
},
data() {
return {
loading:false,
loading: false,
mainColor: "",
activeStyle: "",
pageTitle: "导游详情",
type:0,//1为
g:{},
detailContent:'',
imgs:[],
carModel:{},
guideModel:{},
guidecar:{},
windowHeight:0,
type: 0, //1为
g: {},
detailContent: '',
imgs: [],
carModel: {},
guideModel: {},
guidecar: {},
windowHeight: 0,
};
},
onLoad(options) {
if(options && options.g){
if (options && options.g) {
this.g = JSON.parse(decodeURIComponent(options.g))
}
if(options && options.type){
if (options && options.type) {
this.type = options.type;
if(this.type==1){
if (this.type == 1) {
uni.setNavigationBarTitle({
title: '导游详情',
});
this.getGuideCarGuideModel()
}else{
} else {
uni.setNavigationBarTitle({
title: '车辆详情',
});
......@@ -164,14 +131,9 @@ export default {
this.imgs.push(x.pic_url);
});
let richtext = this.g.guide_introduction;
setTimeout(()=>{
setTimeout(() => {
this.detailContent = richtext;
},10)
}, 10)
},
created() {
this.mainColor = this.$uiConfig.mainColor;
......@@ -180,61 +142,55 @@ export default {
title: this.pageTitle,
});
this.windowHeight = this.$utils.SystemInfo().windowHeight
},
methods: {
getGuideCarGuideModel(){//根据导游id获取导游信息
getGuideCarGuideModel() { //根据导游id获取导游信息
uni.showLoading({
title: "加载中",
});
this.request2(
{
this.request2({
url: '/api/AppletGuideCar/GetGuideCarGuideModel',
data: {
ID:this.g.guide_id,
ID: this.g.guide_id,
}
},
(res) => {
this.guideModel = res.data;
uni.hideLoading();
this.loading=true
this.loading = true
}
);
},
getGuideCarModel(){
},
getGuideCarModel() {
uni.showLoading({
title: "加载中",
});
this.request2(
{
this.request2({
url: '/api/AppletGuideCar/GetGuideCarModel',
data: {
ID:this.g.car_id,
ID: this.g.car_id,
}
},
(res) => {
this.carModel = res.data;
this.carModel.ColorList.forEach(x=>{
if(x.ID==this.g.carcolor_id){
this.carModel.ColorList.forEach(x => {
if (x.ID == this.g.carcolor_id) {
this.guidecar = x
}
})
uni.hideLoading();
this.loading=true
this.loading = true
}
);
},
},
clickDescription(e) {
console.log(e);
},
//点击跳转
startPlay(item){
uni.navigateTo({ url: '/pages/video/index?GoodsId='+this.id+'&VideoUrl='+item.pic_url })
startPlay(item) {
uni.navigateTo({
url: '/pages/video/index?GoodsId=' + this.id + '&VideoUrl=' + item.pic_url
})
},
previewImage(i) {
uni.previewImage({
......@@ -242,7 +198,7 @@ getGuideCarModel(){
current: i,
longPressActions: {
itemList: ["发送给朋友", "保存图片", "收藏"],
success: function (data) {
success: function(data) {
console.log(
"选中了第" +
(data.tapIndex + 1) +
......@@ -251,28 +207,27 @@ getGuideCarModel(){
"张图片"
);
},
fail: function (err) {
fail: function(err) {
console.log(err.errMsg);
},
},
});
},
},
};
};
</script>
<style>
.guidedetails {
.guidedetails {
height: 100%;
height: 100%;
background: #FAF8F9;
padding: 15px;
font-family: aa;
}
.guidedetails .guide{
}
.guidedetails .guide {
width: 100%;
/* height: 96%; */
border-radius: 10px;
background: #FFF;
display: flex;
......@@ -280,45 +235,48 @@ getGuideCarModel(){
align-items: center;
padding: 15px;
overflow-y: auto;
box-shadow:0 2px 2px 2px #E9E7E8;
box-shadow: 0 2px 2px 2px #E9E7E8;
}
}
.guidedetails .guide-top{
.guidedetails .guide-top {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
.guidedetails .row{
}
.guidedetails .row {
display: flex;
flex-direction: row;
align-items: center;
/* justify-content: center; */
}
.guidedetails .column{
}
.guidedetails .column {
display: flex;
flex-direction: column;
}
.guidedetails .guide-info{
}
.guidedetails .guide-info {
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: center;
margin-top: 20px;
width: 100%;
}
.guidedetails .guide-info-item{
}
.guidedetails .guide-info-item {
width: 50%;
display: flex;
flex-direction: row;
align-items: center;
}
.guidedetails .info-text{
}
.guidedetails .info-text {
font-size: 14px;
color: #727272;
/* margin-right: 10px; */
padding: 10px 0;
width: 75px;
text-align: right;
}
}
</style>
pages/guidecar/guidercarCommentList.vue
View file @ dd86fe67
<template>
<view class="guidercarCommentList" :style="{ height: contentHeight }">
<u-tabs
name="name"
:list="list"
:is-scroll="false"
:current="current"
@change="change"
:active-color="mainColor"
></u-tabs>
<u-tabs name="name" :list="list" :is-scroll="false" :current="current" @change="change" :active-color="mainColor"></u-tabs>
<u-empty v-if="g.length == 0" text="暂无评论" mode="list"></u-empty>
<view
v-if="g.length > 0"
style="
<view v-if="g.length > 0" style="
height: calc(100vh - 50px);
width: calc(100vw);
overflow: hidden;
"
>
<scroll-view
:scroll-y="true"
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
:style="{ height: '100%' }"
>
overflow: hidden;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<view class="interDList" v-for="(x, i) in g" :key="i">
<view class="comment-dao" style="justify-content: space-between;">
<view style="display: flex;flex-direction: row;align-items: center;">
......@@ -42,67 +21,34 @@
</view>
<span style='font-size: 12px;color: #AAAAAA;'>{{x.CommentList[0].CreateDate}}</span>
</view>
<view class="comment-dao" >
<u-rate
:current="x.CommentList[0].CommentScore"
active-color="#FF4442"
inactive-color="#b2b2b2"
active-icon="star"
inactive-icon="star-o"
size="20"
:disabled="true"
></u-rate>
<view class="comment-dao">
<u-rate :current="x.CommentList[0].CommentScore" active-color="#FF4442" inactive-color="#b2b2b2" active-icon="star"
inactive-icon="star-o" size="20" :disabled="true"></u-rate>
<span style='font-size: 11px;color: #565656;margin-left: 15px;'>导游:{{x.CommentList[1].GuideName}}</span>
</view>
<view class="comment-dao" style="padding: 10px 0;">
<span>{{x.CommentList[1].Content}}</span>
</view>
<view class="comment-dao" style="flex-wrap: wrap;">
<image
v-for="(item, index) in x.CommentList[1].CommentImgList" :key="index"
mode="aspectFill"
:src="item"
@click="previewImage(index,x.CommentList[1].CommentImgList)"
:style="{'width':san,'height':san}"
/>
<image v-for="(item, index) in x.CommentList[1].CommentImgList" :key="index" mode="aspectFill" :src="item" @click="previewImage(index,x.CommentList[1].CommentImgList)"
:style="{'width':san,'height':san}" />
</view>
<view style="width: 100%;height: 1px;background: rgba(0, 0, 0, 0.1);margin: 10px 0;"></view>
<view class="comment-dao" >
<u-rate
:current="x.CommentList[0].CommentScore"
active-color="#FF4442"
inactive-color="#b2b2b2"
active-icon="star"
inactive-icon="star-o"
size="20"
:disabled="true"
></u-rate>
<view class="comment-dao">
<u-rate :current="x.CommentList[0].CommentScore" active-color="#FF4442" inactive-color="#b2b2b2" active-icon="star"
inactive-icon="star-o" size="20" :disabled="true"></u-rate>
<span style='font-size: 11px;color: #565656;margin-left: 15px;'>{{x.CommentList[0].CarBrandName}},{{x.CommentList[0].CarColorName}}</span>
</view>
<view class="comment-dao" style="padding: 10px 0;">
<span>{{x.CommentList[0].Content}}</span>
</view>
<view class="comment-dao" style="flex-wrap: wrap;">
<image
v-for="(item, index) in x.CommentList[0].CommentImgList" :key="index"
mode="aspectFill"
:src="item"
@click="previewImage(index,x.CommentList[0].CommentImgList)"
:style="{'width':san,'height':san}"
/>
<image v-for="(item, index) in x.CommentList[0].CommentImgList" :key="index" mode="aspectFill" :src="item" @click="previewImage(index,x.CommentList[0].CommentImgList)"
:style="{'width':san,'height':san}" />
</view>
</view>
<u-loadmore
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#f3f4f6"
/>
<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#f3f4f6" />
</scroll-view>
</view>
<!-- 加载中 -->
<view class="loading" v-if="loading">
......@@ -110,39 +56,32 @@
<Text style="color: #fff; margin-top: 10rpx;">加载中...</Text>
</view>
<!-- 取消提示 -->
<u-toast ref="uToast" />
</view>
</template>
<script>
export default {
export default {
data() {
return {
pageTitle: "评论",
current: 0,
list: [
],
msg:{
GoodsId:0,
pageIndex:1,
pageSize:10,
CommentGrade:0,
msg: {
GoodsId: 0,
pageIndex: 1,
pageSize: 10,
CommentGrade: 0,
},
mainColor: "",
secondary:'',
secondary: '',
contentHeight: 0,
page: 1,
page_count: 1,
g: [],
loading: false,
san:'100px',
san: '100px',
status: "loadmore",
loadText: {
loadmore: "轻轻上拉，加载更多",
......@@ -157,30 +96,24 @@ export default {
this.secondary = this.$uiConfig.secondary;
},
mounted() {
uni.setNavigationBarTitle({
title: this.pageTitle,
});
let that = this
uni.getSystemInfo({
success(res) {
that.san = (res.windowWidth-30)/3+'px'
that.san = (res.windowWidth - 30) / 3 + 'px'
}
})
},
onLoad(options){
if(options && options.GoodsId){
onLoad(options) {
if (options && options.GoodsId) {
this.msg.GoodsId = options.GoodsId;
// this.init();
this.getAppletGoodsCommentStatistics();//获取商品评论数
this.getAppletGoodsCommentStatistics(); //获取商品评论数
}
},
methods: {
change(index) {
this.current = index;
this.msg.CommentGrade = this.list[index].Id
this.msg.pageIndex = 1;
......@@ -196,15 +129,12 @@ export default {
},
init() {
this.loading = true;
this.request2(
{
this.request2({
url: '/api/AppletGuideCar/GetAppletGoodsCommentPageList',
data: this.msg
},
res => {
if(res.resultCode==1){
if (res.resultCode == 1) {
this.loading = false;
this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount;
......@@ -215,21 +145,22 @@ export default {
}
);
},
getAppletGoodsCommentStatistics(){
this.request2(
{
getAppletGoodsCommentStatistics() {
this.request2({
url: "/api/AppletGuideCar/GetAppletGoodsCommentStatistics",
data: {
GoodsId:this.msg.GoodsId
GoodsId: this.msg.GoodsId
},
},
(res) => {
let data = res.data.List
data.forEach(x=>{
x.name = x.Name+'(' + x.Count + ')'
data.forEach(x => {
x.name = x.Name + '(' + x.Count + ')'
})
data.unshift({
name: '全部',
Id: 0
})
data.unshift({name:'全部',Id:0})
this.list = data
this.msg.CommentGrade = data[0].Id
this.init();
......@@ -242,23 +173,20 @@ export default {
this.status = "loading";
this.init();
} else {
this.status = "nomore";
}
},
},
};
};
</script>
<style>
.guidercarCommentList {
.guidercarCommentList {
width: 100%;
height: 100%;
background: #f3f4f6;
}
}
.guidercarCommentList .loading {
.guidercarCommentList .loading {
width: 200rpx;
height: 200rpx;
background: #000000;
......@@ -273,20 +201,21 @@ export default {
top: 30%;
margin-left: -100rpx;
z-index: 999;
}
.guidercarCommentList .interDList{
width:100% ;
}
.guidercarCommentList .interDList {
width: 100%;
padding: 20px 15px;
display: flex;
flex-direction: column;
background: #fff;
margin-top: 10px;
}
.guidercarCommentList .comment-dao{
}
.guidercarCommentList .comment-dao {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
}
</style>
\ No newline at end of file
pages/guidecar/index.vue
View file @ dd86fe67
This diff is collapsed.
pages/guidecar/order-commit-detail.vue
View file @ dd86fe67
......@@ -56,8 +56,8 @@
</view>
<view class="editor">
<textarea placeholder="写入评价" v-model="msg[1].Content" maxlength="200"></textarea>
<u-upload :action="action" :file-list="fileList2" style="display:none;" @on-remove="onRemove2" max-count="9" :custom-btn="true"
@on-success="uploadSuccessHandler2">
<u-upload :action="action" :file-list="fileList2" style="display:none;" @on-remove="onRemove2" max-count="9"
:custom-btn="true" @on-success="uploadSuccessHandler2">
<view slot="addBtn" class="slot-btn">
<u-icon name="photograph" size="40" color="#888"></u-icon>
<view class="mian-title">上传图片</view>
......@@ -82,7 +82,6 @@
</template>
<script>
export default {
data() {
return {
......@@ -113,7 +112,7 @@
action: this.host2 + "/api/File/UploadTencent",
fileList: [], //商品上传图
fileList2: [], //导游上传图
dataList: {} ,//商品详情数据
dataList: {}, //商品详情数据
};
},
onLoad(option) {
......@@ -135,8 +134,8 @@
});
this.mc = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
let MallBaseId = uni.getStorageSync("mall_UserInfo").MallBaseId ? uni.getStorageSync("mall_UserInfo").MallBaseId: 1;
this.action = this.host2+'/api/File/UploadTencent?MallBaseId='+MallBaseId
let MallBaseId = uni.getStorageSync("mall_UserInfo").MallBaseId ? uni.getStorageSync("mall_UserInfo").MallBaseId : 1;
this.action = this.host2 + '/api/File/UploadTencent?MallBaseId=' + MallBaseId
},
methods: {
uploadSuccessHandler(data, index, lists) {
......@@ -217,8 +216,8 @@
uni.navigateBack({
delta: 1,
success: function() {
if(res.msgType==2 && res.couponResultCode==1 ){
beforePage.$vm.getReceive(res.couponMessage,res.msgType); // 执行前一个页面的方法
if (res.msgType == 2 && res.couponResultCode == 1) {
beforePage.$vm.getReceive(res.couponMessage, res.msgType); // 执行前一个页面的方法
}
}
});
......@@ -238,7 +237,6 @@
}
);
},
}
};
</script>
......
pages/guidecar/order-commit.vue
View file @ dd86fe67
<template>
<view class="commit-box">
<u-empty text="没有找到未评价的商品信息" font-size="36" mode="list" v-if="g.length == 0 && !loading"></u-empty>
<view
v-if="g.length > 0&& !loading"
style="height: 100vh;width: 100vw;overflow: hidden;padding:0 0 10px 0;"
>
<scroll-view
:scroll-y="true"
@scrolltolower="lower"
:enable-back-to-top="true"
:enable-flex="true"
:scroll-top="scrollTop"
@scroll="scroll"
style="height: 100%; padding-bottom: 0px;"
>
<view v-if="g.length > 0&& !loading" style="height: 100vh;width: 100vw;overflow: hidden;padding:0 0 10px 0;">
<scroll-view :scroll-y="true" @scrolltolower="lower" :enable-back-to-top="true" :enable-flex="true" :scroll-top="scrollTop"
@scroll="scroll" style="height: 100%; padding-bottom: 0px;">
<view class="good-list">
<view class="good-item" v-for="(x, i) in g" :key="i">
<image class="good-pic" :src="x.CoverImage" mode="aspectFill" />
......@@ -23,11 +13,7 @@
<view style="display: flex;align-items: center;font-size:12px;margin-top:5px;">
<text style="margin-right:5px;" v-if="x.CarName">车辆：<text>{{x.CarName}}</text></text>
<text v-if="x.CarColorName">
<u-tag v-if="x.CarColorName"
size="mini"
:text="x.CarColorName"
type="warning"
/>
<u-tag v-if="x.CarColorName" size="mini" :text="x.CarColorName" type="warning" />
</text>
<text style="margin-right:5px;" v-if="x.CarBrandName">品牌：<text>{{x.CarBrandName}}</text></text>
</view>
......@@ -37,42 +23,23 @@
</view>
</view>
<view class="op-box">
<u-button
size="mini"
ripple
plain
shape="circle"
:custom-style="{color:mc,borderColor:mc,width:60+'px'}"
@click="goCommit(x)"
>评价</u-button>
<u-button size="mini" ripple plain shape="circle" :custom-style="{color:mc,borderColor:mc,width:60+'px'}"
@click="goCommit(x)">评价</u-button>
</view>
</view>
</view>
</view>
<u-loadmore
v-if="showLoading"
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#F5F5F5"
/>
<u-loadmore v-if="showLoading" :status="status" :load-text="loadText" :font-size="24" :margin-top="20"
:margin-bottom="20" bg-color="#F5F5F5" />
</scroll-view>
</view>
<coupon
v-if="showCoupons"
:coupon-message="couponMessage"
:msgtype="msgType"
@goLook="goLook"
@closeBtn="closeBtn"
></coupon>
<coupon v-if="showCoupons" :coupon-message="couponMessage" :msgtype="msgType" @goLook="goLook" @closeBtn="closeBtn"></coupon>
</view>
</template>
<script>
import coupon from "@/components/coupons/coupons";
export default {
export default {
components: {
coupon
},
......@@ -100,20 +67,19 @@ export default {
IsComment: 2,
GoodsName: "",
OrderNo: "",
OrderClassify:1
OrderClassify: 1
},
page_count: 0,
isover: false,
couponMessage: "",//弹出优惠券的内容
couponMessage: "", //弹出优惠券的内容
showCoupons: false,
msgType:1,//类型
msgType: 1, //类型
};
},
onShow() {
this.msg.pageIndex = 1;
this.g = [];
this.init();
},
mounted() {
uni.setNavigationBarTitle({
......@@ -135,17 +101,16 @@ export default {
OrderId: x.OrderId
};
uni.navigateTo({
url:
"/pages/guidecar/order-commit-detail?param=" +
url: "/pages/guidecar/order-commit-detail?param=" +
encodeURIComponent(JSON.stringify(msg)),
fail: function (e) {
fail: function(e) {
console.log(e);
},
});
},
goTop(e) {
this.scrollTop = this.old.scrollTop;
this.$nextTick(function () {
this.$nextTick(function() {
this.scrollTop = 0;
});
},
......@@ -153,8 +118,7 @@ export default {
this.isover = false;
this.loading = true;
this.showLoading = this.msg.pageIndex != 1;
this.request2(
{
this.request2({
url: "/api/AppletOrder/GetAppletGoodsWaitCommentPageList",
data: this.msg,
},
......@@ -185,14 +149,12 @@ export default {
this.status = "nomore";
}
},
getReceive(couponMessage,msgType){
console.log(couponMessage,msgType)
setTimeout(()=>{
this.couponMessage = '获取'+couponMessage+'积分';
getReceive(couponMessage, msgType) {
setTimeout(() => {
this.couponMessage = '获取' + couponMessage + '积分';
this.msgType = msgType;
this.showCoupons = true;
},500)
}, 500)
},
goLook() {
this.showCoupons = true;
......@@ -204,22 +166,23 @@ export default {
this.showCoupons = false;
},
},
};
};
</script>
<style>
.commit-box {
.commit-box {
background: #faf8f9;
height: 100vh;
position: relative;
}
.commit-box .quick {
}
.commit-box .quick {
right: 50rpx;
bottom: 50rpx;
position: absolute;
}
}
.commit-box .quick .item {
.commit-box .quick .item {
background: #fff;
border: 1px solid #aaa;
height: 90rpx;
......@@ -230,39 +193,45 @@ export default {
display: flex;
align-items: center;
justify-content: center;
}
.commit-box .good-list {
}
.commit-box .good-list .good-item {
}
.commit-box .good-list {}
.commit-box .good-list .good-item {
margin-top: 10px;
background: #fff;
padding: 10px;
border-radius: 10px;
display: flex;
}
.commit-box .good-list .good-item .good-pic {
}
.commit-box .good-list .good-item .good-pic {
width: 200rpx;
height: 200rpx;
margin-right: 15px;
border-radius: 5px;
}
.commit-box .good-list .good-item .right-box {
}
.commit-box .good-list .good-item .right-box {
width: 1px;
flex: 1;
display: flex;
flex-direction: column;
height: 200rpx;
}
.commit-box .good-list .good-item .right-box .good-info {
}
.commit-box .good-list .good-item .right-box .good-info {
flex: 1;
width: 100%;
height: 1px;
}
.commit-box .good-list .good-item .right-box .op-box {
}
.commit-box .good-list .good-item .right-box .op-box {
text-align: right;
height: 25px;
}
.commit-box .good-list .good-item .right-box .good-info .good-name {
}
.commit-box .good-list .good-item .right-box .good-info .good-name {
font-size: 28rpx;
color: #333;
text-overflow: -o-ellipsis-lastline;
......@@ -272,8 +241,9 @@ export default {
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
}
.commit-box .good-list .good-item .right-box .good-info .good-attr {
}
.commit-box .good-list .good-item .right-box .good-info .good-attr {
text-align: left;
}
}
</style>
\ No newline at end of file
pages/guidecar/orderList.vue
View file @ dd86fe67
......@@ -232,8 +232,8 @@
OrderPayType: 1,
GoodsName: ''
},
payBtn:false,
payExit:false,
payBtn: false,
payExit: false,
};
},
created() {
......@@ -259,7 +259,7 @@
onLoad(option) {
this.current = option.status || -1;
this.getHeadList();
this.payInfo.OpenId=uni.getStorageSync('mall_UserInfo').OpenId;
this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
this.u = uni.getStorageSync("mall_UserInfo");
},
methods: {
......@@ -287,7 +287,7 @@
Name: '全部'
}
this.headData.unshift(obj)
this.msg.OrderStatus=this.headData[this.current].Id;
this.msg.OrderStatus = this.headData[this.current].Id;
this.getContent();
}
}
......@@ -416,12 +416,12 @@
'&IsFormShoppingCart=2&ShoppingCartIdList=' + JSON.stringify(ShoppingCartIdList)
});
},
payment(e){
payment(e) {
this.payInfo.OrderId = e.OrderId;
this.payInfo.GoodsName = e.DetailList[0].GoodsName.slice(0,10);
this.payInfo.GoodsName = e.DetailList[0].GoodsName.slice(0, 10);
this.payInfo.PaymentWay = e.PaymentWay;
this.payInfo.total_price = e.Income;
this.payBtn=true
this.payBtn = true
},
exitPay() {
this.payExit = false;
......@@ -431,8 +431,10 @@
this.payExit = true;
},
//跳转到详情
goDetail(item){
uni.navigateTo({ url: '/pages/guidecar/orderDetail?OrderId='+item.OrderId})
goDetail(item) {
uni.navigateTo({
url: '/pages/guidecar/orderDetail?OrderId=' + item.OrderId
})
}
},
};
......
pages/index/index.vue
View file @ dd86fe67
This diff is collapsed.
pages/live/index.vue
View file @ dd86fe67
This diff is collapsed.
pages/live/share.vue
View file @ dd86fe67
This diff is collapsed.
pages/member/index/index.vue
View file @ dd86fe67
This diff is collapsed.
pages/member/privilege.vue
View file @ dd86fe67
<template>
<view class="privilegeStyle" :style="{'height':contentHeight}">
<view class="privilege_t">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/privilegebg.jpeg" mode='aspectFit' style="width: 100%;height: 250px;" ></image>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/privilegebg.jpeg" mode='aspectFit' style="width: 100%;height: 250px;"></image>
</view>
</view>
</template>
......@@ -10,12 +10,12 @@
export default {
data() {
return {
contentHeight:0,
mainColor:'',
contentHeight: 0,
mainColor: '',
}
},
created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + 'px';
this.mainColor = this.$uiConfig.mainColor;
uni.setNavigationBarTitle({
title: '会员特权说明',
......@@ -28,13 +28,12 @@
</script>
<style>
.privilegeStyle{
.privilegeStyle {
background: #fff;
}
.privilegeStyle .privilege_t{
.privilegeStyle .privilege_t {
width: 100%;
height: 250px;
}
</style>
pages/microShop/index/index.vue
View file @ dd86fe67
This diff is collapsed.
pages/microShop/myClients/myClients.vue
View file @ dd86fe67
This diff is collapsed.
pages/microShop/shopSettings.vue
View file @ dd86fe67
This diff is collapsed.
pages/microShop/storeManagement/index.vue
View file @ dd86fe67
This diff is collapsed.
pages/microShop/wdCase.vue
View file @ dd86fe67
This diff is collapsed.
pages/microShop/wdOrder.vue
View file @ dd86fe67
This diff is collapsed.
pages/microShop/wdWithdrawal.vue
View file @ dd86fe67
This diff is collapsed.
pages/mySupplier/billDetails.vue
View file @ dd86fe67
This diff is collapsed.
pages/mySupplier/index/index.vue
View file @ dd86fe67
This diff is collapsed.
pages/order-submit/order-submit.vue
View file @ dd86fe67
This diff is collapsed.
pages/order-submit/pay-success.vue
View file @ dd86fe67
This diff is collapsed.
pages/order/express.vue
View file @ dd86fe67
This diff is collapsed.
pages/order/index.vue
View file @ dd86fe67
......@@ -3,11 +3,10 @@
订单首页
</view>
</template>
<script>
export default {
export default {
}
}
</script>
<style>
......
pages/order/index/index.vue
View file @ dd86fe67
This diff is collapsed.
pages/order/order-commit-details.vue
View file @ dd86fe67
This diff is collapsed.
pages/order/order-commit.vue
View file @ dd86fe67
This diff is collapsed.
pages/order/order-detail.vue
View file @ dd86fe67
This diff is collapsed.
pages/order/payment-order.vue
View file @ dd86fe67
This diff is collapsed.
pages/quick_share/index.vue
View file @ dd86fe67
This diff is collapsed.
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