修改细节

version/0412
fanfan 9 months ago
parent b588cc0b71
commit 31bfc9a177
  1. 2
      core/app.js
  2. 176
      pages/cart/index.vue
  3. 234
      pages/goods/components/setPrice.vue
  4. 75
      pages/goods/detail.vue
  5. 2
      pages/index/index.vue
  6. 23
      pages/member/index.vue
  7. 2
      pages/news/consult/index.vue
  8. 18
      pages/news1/help.vue
  9. 2
      pages/news3/components/afterSales.vue
  10. 7
      pages/news3/components/category.vue
  11. 2
      pages/news3/components/setRange.vue
  12. 6
      pages/news3/shopOrder.vue
  13. 25
      pages/news3/shopOrderDetails.vue
  14. 47
      pages/order/detail.vue
  15. 6
      pages/order/index.vue
  16. 36
      pages/user/index.vue

@ -165,7 +165,7 @@ export const setCartTotalNum = (value) => {
* 该方法只能在tabbar页面中调用, 其他页面调用会报错
*/
export const setCartTabBadge = () => {
const cartTabbarIndex = 2
const cartTabbarIndex = 3
const cartTotal = getCartTotalNum()
if (cartTotal > 0) {
uni.setTabBarBadge({

@ -43,8 +43,8 @@
<text class="value">{{ item.goods.skuInfo.goods_price }}</text>
</view>
<view class="stepper">
<u-number-box :min="1" class='countNumber' :modelValue="item.goods_num" :step="1" @change="onChangeStepper($event, item)" />
<u-number-box :min="1" class='countNumber' :modelValue="item.goods_num" :step="1"
@change="onChangeStepper($event, item)" />
</view>
</view>
</view>
@ -61,35 +61,7 @@
</empty>
<!-- 商品推荐 -->
<view class="goodsRecommend-title">
<image :src="$picUrl+'/static/user/left.png'"></image>为您推荐<image :src="$picUrl+'/static/user/right.png'"></image>
</view>
<view class="goodsRecommend">
<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="onTargetGoods(item.goods_id)" :key="index">
<view class="pic">
<image :src="item.goods_image" mode=""></image>
</view>
<view class="goodsInfo">
<view class="title">
<text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text>
<text class="name">{{item.goods_name}}</text>
</view>
<view class="isExpress">
<text>包邮</text>
</view>
<view class="price">
<text style="font-size: 20rpx;"></text>
<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_min}}</text>
<text style="font-size: 20rpx;margin-left:10rpx;">到手价</text>
<text style="color: #949494;font-size: 22rpx;text-decoration: line-through;">{{item.line_price_min}}</text>
</view>
<!-- <view class="comment">
<text>{{item.goods_sales}}条评论</text>
<text style="margin-left:20rpx;">{{item.remaizhishu}}%好评率</text>
</view> -->
</view>
</view>
</view>
<recommended />
<!-- 底部操作栏 -->
<view v-if="list.length" class="footer-fixed">
@ -124,7 +96,7 @@
<script>
import Empty from '@/components/empty'
// import Recommended from '@/components/recommended'
import Recommended from '@/components/recommended'
import {
inArray,
arrayIntersect,
@ -136,16 +108,16 @@
setCartTabBadge
} from '@/core/app'
import * as CartApi from '@/api/cart'
import * as Api from '@/api/goods'
const CartIdsIndex = 'CartIds'
export default {
components: {
Empty
Empty,
Recommended
},
data() {
return {
goodsRecommend:[],
inArray,
//
isLoading: true,
@ -180,9 +152,7 @@
setCartTabBadge()
}
},
onReady() {
this.getSuggest();
},
/**
* 生命周期函数--监听页面显示
*/
@ -194,22 +164,7 @@
},
methods: {
getSuggest() {
//
Api.recommended().then(res => {
let arr = res.data.goodsList
if(arr && arr.length > 0){
arr.map(a=>{
a.goods_price_min = Number(a.goods_price_min)
a.goods_price_max = Number(a.goods_price_max)
a.line_price_min = Number(a.line_price_min)
a.line_price_max = Number(a.line_price_max)
})
}
this.goodsRecommend = arr
})
},
// ()
onCalcTotalPrice() {
const app = this
@ -322,11 +277,7 @@
const app = this
if (app.checkedIds.length) {
const cartIds = app.checkedIds.join()
// app.$navTo('pages/checkout/index', {
// mode: 'cart',
// cartIds
// })
app.$navTo('pages/sureOrder/index', {
app.$navTo('pages/checkout/index', {
mode: 'cart',
cartIds
})
@ -375,107 +326,7 @@
.container {
padding-bottom: 120rpx;
}
.goodsRecommend-title{
padding: 20rpx 25rpx;
display: flex;
align-items: center;
font-size: 32rpx;
font-weight: 600;
color: #3B3B3B;
justify-content: center;
image{
width: 30rpx;
height: 30rpx;
margin: 0 10rpx;
}
}
.goodsRecommend{
display: flex;
align-items: center;
justify-content: space-between;
flex-wrap: wrap;
padding:10rpx 25rpx 25rpx;
.goodsItem{
width: 340rpx;
border-radius: 8rpx;
overflow: hidden;
background-color: #ffffff;
margin-bottom:24rpx;
padding: 20rpx;
box-sizing: border-box;
.pic{
width: 100%;
text-align: center;
image{
// width:100%;
width:256rpx;
height:256rpx;
}
}
.goodsInfo{
.title{
display: flex;
align-items: center;
margin-top:14rpx;
.ziying{
padding:4rpx 10rpx;
background: #FF4438;
border-radius: 2px 2px 2px 2px;
opacity: 1;
font-size: 24rpx;
font-weight: 400;
color: #FFFFFF;
}
.name{
margin-left:6rpx;
font-size: 24rpx;
font-weight: 400;
color: #1E1E1E;
flex:1;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.isExpress{
height: 30rpx;
display: flex;
align-items: center;
margin:10rpx 0;
text{
display:inline-block;
width: 44rpx;
height:30rpx;
line-height: 28rpx;
border: 1px solid #F21A1C;
border-radius: 2px 2px 2px 2px;
background: #FFFFFF;
text-align: center;
font-size: 16rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
color: #F21A1C;
}
}
.price{
color: #F21A1C;
display: flex;
align-items: baseline;
}
.comment{
margin-top: 6rpx;
font-size: 22rpx;
font-weight: 400;
color: #949494;
}
}
}
}
//
.head-info {
display: flex;
@ -579,7 +430,7 @@
.goods-price {
vertical-align: bottom;
color: $main-bg;
flex: 1;
.unit {
font-size: 24rpx;
}
@ -594,14 +445,12 @@
}
.stepper {
flex: 1;
display: flex;
// width: 154rpx;
height: 56rpx;
background: #FFFFFF;
border-radius: 76rpx 76rpx 76rpx 76rpx;
opacity: 1;
margin-right: 20rpx;
// border: 2rpx solid #E6E6E6;
.del {
@ -686,7 +535,6 @@
padding-right: 30rpx;
.goods-price {
flex: 1;
vertical-align: bottom;
color: $main-bg;

@ -0,0 +1,234 @@
<template>
<view>
<u-popup v-model="afterSale" width="80%" border-radius="10" @close="onClose" :closeable="true" mode="center">
<view class="afterSales">
<view class="filterTitle">
请设置秒杀价
</view>
<view class="priceContainer">
<view class="priceCon">
<text>秒杀价</text><input type="text" v-model="secondPrice" class="input" value="" placeholder="秒杀价格可低于成本价" />
</view>
<view class="priceTime">
<view class="text">秒杀区间</view>
<view class="priceDate">
<view class="selectTime" @click="timeShow=true">
{{startTime?startTime:'起始时间'}}
</view>
<text>-</text>
<view class="selectTime" @click="timeShow=true">
{{endTime?endTime:'终止时间'}}
</view>
</view>
</view>
<view class="priceCon" style="justify-content: space-between;">
<text>秒杀限购</text>
<u-switch v-model="secondQuota" @change="change" activeColor='#55BD6A' inactiveColor='#F1F1F1'>
</u-switch>
</view>
<view class="priceCon">
<text>每人限购</text>
<input type="number" style="width: 130rpx;margin-right: 15rpx;" class="input" v-model="quotaNum" placeholder="请输入" />
</view>
</view>
<view class="btnGroup">
<view class="reset" @click="reset">
重置
</view>
<view class="submit" @click="submit" style="margin-left:24upx;">
确定
</view>
</view>
</view>
</u-popup>
</view>
<u-calendar v-model="timeShow" mode="range" @change="getTime" range-color='#FF6257' range-bg-color='#FFBDBA'
active-bg-color='#FF6257'></u-calendar>
</template>
<script>
export default {
data() {
return {
afterSale: false,
timeShow: false,
startTime: '',
endTime: '',
secondPrice:'',
secondQuota: '1',
quotaNum:''
}
},
methods: {
reset() {
this.startTime = null;
this.endTime = null
this.secondPrice = null;
this.quotaNum = null
},
getTime(e) {
this.startTime = e.startDate;
this.endTime = e.endDate;
},
submit() {
if (!this.secondPrice) {
return this.$toast('请输入最低价格')
}
if (!this.startTime) {
return this.$toast('请选择开始时间')
}
if (!this.endTime) {
return this.$toast('请选择结束时间')
}
if (!this.quotaNum) {
return this.$toast('请输入限购次数')
}
this.$emit('getprice', {
startTime: this.startTime,
endTime: this.endTime,
secondPrice: this.secondPrice,
quotaNum: this.quotaNum,
secondQuota: this.secondQuota
})
}
}
}
</script>
<style lang="scss" scoped>
.afterSales {
padding: 32upx;
.filterTitle {
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
font-weight: 700;
color: #303030;
text-align: center;
}
.priceContainer {
overflow: hidden;
padding-top: 40upx;
margin-top: 30upx;
border-top: 1rpx solid #EAEAEA;
.priceCon {
display: flex;
align-items: center;
font-size: 28rpx;
color: #262626;
margin-bottom: 20rpx;
text {
width: 150rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
line-height: 72rpx;
text-align: left;
font-style: normal;
text-transform: none;
}
.input {
width: 350rpx;
height: 72rpx;
background: #FFFFFF;
border-radius: 4rpx;
border: 1rpx solid #EBEBEB;
padding: 0 20rpx;
font-size: 28rpx;
}
}
.priceTime {
margin-bottom: 20rpx;
.text {
width: 150rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #262626;
line-height: 72rpx;
text-align: left;
font-style: normal;
text-transform: none;
}
.priceDate {
display: flex;
align-items: center;
.selectTime {
width: 238rpx;
height: 70rpx;
background: #F3F3F3;
border-radius: 44rpx;
text-align: center;
line-height: 70rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-size: 28rpx;
color: #A1A1A1;
font-style: normal;
text-transform: none;
}
text {
margin: 0 15rpx;
}
}
}
// ::v-deep .u-input {
// height: 70upx;
// background: #F3F3F3;
// border-radius: 22px 22px 22px 22px;
// opacity: 1;
// text-align: center;
// }
// ::v-deep .u-input__input {
// text-align: center;
// }
}
.btnGroup {
margin: 40upx 0;
display: flex;
justify-content: center;
align-items: center;
.reset {
width: 216upx;
height: 70upx;
background: #E9E9E9;
border-radius: 22px 22px 22px 22px;
opacity: 1;
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #585858;
line-height: 70upx;
text-align: center;
}
.submit {
width: 216upx;
height: 70upx;
background: linear-gradient(180deg, #FD5D06 0%, #F3211A 100%);
border-radius: 50px 50px 50px 50px;
opacity: 1;
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #FFFFFF;
line-height: 70upx;
text-align: center;
}
}
}
</style>

@ -125,7 +125,7 @@
<view class="chosed">
<view class="serve">
<view class="serveInfo">
服务
商家
</view>
</view>
<view class="box" @click="toFuwu()">
@ -201,7 +201,10 @@
</view>
<button open-type="contact"></button>
</view>
<view class="footerCus " @click="shoppingCart()">
<view class="footerCus " style="position: relative;" @click="shoppingCart()">
<view v-if="cartTotal > 0" class="uni-tabbar__badge">
{{ cartTotal > 99 ? '99+' : cartTotal }}
</view>
<view class="cusIcon">
<image src="/static/detail/car.png" mode=""></image>
</view>
@ -218,13 +221,16 @@
</view>
</template>
<template v-else>
<view class="btn-bg" v-if="goods.spec_type == 20" style="background-color: #FF1D1D;wi"
<view class="btn-bg" v-if="goods.spec_type == 20" style="background-color: #FF1D1D;"
@click="choseSku(3)">
修改价格
</view>
<view class="btn-bg" v-else style="background-color: #FF1D1D;" @click="openPirce(1)">
修改价格
</view>
<view class="btn-bg" style="background-color: #FF1D1D;margin-left:40rpx;" @click="setPirce()">
设置秒杀价
</view>
</template>
</view>
@ -443,6 +449,7 @@
<view v-if="isTodo">
<SkuPopup v-model="showSkuPopup" :skuMode="skuMode" :goods="goods" @addCart="onAddCart" />
</view>
<setPrice ref="setRange" @getprice="getprice" />
<!-- 海报图弹层 -->
<goods-poster-popup v-model="showGoodsPosterPopup" :apiCall="posterApiCall" :apiParam="{goodsId}" />
</view>
@ -452,11 +459,14 @@
import * as GoodsApi from '@/api/goods'
import * as goodsCar from '@/api/cart.js'
import SkuPopup from './components/SkuPopup'
import setPrice from './components/setPrice'
import * as address from '@/api/address.js'
import * as CartApi from '@/api/cart'
export default {
components: {
SkuPopup,
GoodsPosterPopup
GoodsPosterPopup,
setPrice
},
data() {
return {
@ -497,6 +507,8 @@
selectShop: {},
// api
posterApiCall: GoodsApi.poster,
//
cartTotal: 0,
}
},
onLoad(options) {
@ -513,6 +525,7 @@
this.getServeList()
this.getGoodsDetail()
this.cityInfo = uni.getStorageSync("cityInfo");
this.getCartTotal()
uni.$on("onenPrice", function(selectShop) {
that.openPirce();
that.isTodo = false;
@ -538,6 +551,40 @@
}
},
methods: {
getprice(e) {
console.log(e)
GoodsApi.editGoodsPrice(params).then(res => {
if (res.status == 200) {
that.$toast("设置成功");
this.$refs.setRange.afterSale = false;
setTimeout(() => {
// that.getGoodsDetail(1);
}, 500)
}
})
.catch()
},
setPirce() {
console.log(this.$refs.setRange)
this.$refs.setRange.afterSale = true;
},
//
getCartTotal() {
const app = this
return new Promise((resolve, reject) => {
CartApi.total()
.then(result => {
app.cartTotal = result.data.cartTotal
resolve(result)
})
.catch(reject)
})
},
//
onAddCart(total) {
this.getCartTotal()
},
//
async toUnpdatePrice() {
const that = this;
@ -741,7 +788,7 @@
},
copyNum(msg) {
uni.setClipboardData({
data: (typeof msg=='number')?msg.toString():msg, // value
data: (typeof msg == 'number') ? msg.toString() : msg, // value
success: function() {
//
uni.showToast({
@ -1934,4 +1981,22 @@
}
}
}
.uni-tabbar__badge {
width: auto;
height: 16px;
line-height: 16px;
border-radius: 16px;
min-width: 16px;
padding: 0 2px;
font-size: 12px;
text-align: center;
white-space: nowrap;
position: absolute;
top: -5px;
right: 1px;
background-color: #f43530;
color: #ffffff;
transform: translate(40%, -20%);
}
</style>

@ -1021,7 +1021,7 @@
.logo {
height: 50rpx;
width: auto;
width: 200rpx;
position: absolute;
left: 36rpx;
top: 25rpx;

@ -32,13 +32,13 @@
</view>
<view class="vipList">
<view class="vipItem">
<image :src="$picUrl+'/static/member/my.png'" mode="" class="itemImg"></image>
<image :src="$picUrl+'/static/member/my.png'" mode="" class="itemImg"></image>
<view class="vipInfo">
天天免邮
</view>
</view>
<view class="vipItem">
<image :src="$picUrl+'/static/member/lp.png'" mode="" class="itemImg"></image>
<image :src="$picUrl+'/static/member/lp.png'" mode="" class="itemImg"></image>
<view class="vipInfo">
超低会员价
</view>
@ -50,19 +50,19 @@
</view>
</view>
<view class="vipItem">
<image :src="$picUrl+'/static/member/th.png'" mode="" class="itemImg"></image>
<image :src="$picUrl+'/static/member/th.png'" mode="" class="itemImg"></image>
<view class="vipInfo">
退换免运费
</view>
</view>
<view class="vipItem">
<image :src="$picUrl+'/static/member/cx.png'" mode="" class="itemImg"></image>
<image :src="$picUrl+'/static/member/cx.png'" mode="" class="itemImg"></image>
<view class="vipInfo">
促销福利
</view>
</view>
<view class="vipItem">
<image :src="$picUrl+'/static/member/tq.png'" mode="" class="itemImg"></image>
<image :src="$picUrl+'/static/member/tq.png'" mode="" class="itemImg"></image>
<view class="vipInfo">
极速售后
</view>
@ -86,7 +86,7 @@
</view>
</view>
<view class="vipItem">
<image :src="$picUrl+'/static/member/jf.png'" mode="" class="itemImg"></image>
<image :src="$picUrl+'/static/member/jf.png'" mode="" class="itemImg"></image>
<view class="vipInfo">
双倍积分
</view>
@ -103,7 +103,7 @@
限时活动价
</view>
<!-- :style="{'marginTop':isChose!=index?'62rpx':0}" -->
<view class="timeLong" >
<view class="timeLong">
{{item.month}}个月
</view>
<view class="firPrice">
@ -145,7 +145,10 @@
原价 {{choseItem.price}}
</view>
</view>
<view class="btn" @click="gotoPay">
<view class="btn" style="opacity:0.6" v-if="user.user_type == 40">
<text>{{choseItem.price}}</text>开卡{{choseItem.month}}个月
</view>
<view class="btn" @click="gotoPay" v-else>
<text>{{choseItem.price}}</text>开卡{{choseItem.month}}个月
</view>
</view>
@ -175,12 +178,14 @@
choseItem: {},
payType: 'wechat',
type: 'hy',
user: ''
}
},
onShow() {
this.getMemberInfo()
},
onLoad(options) {
this.user = uni.getStorageSync('userInfo')
this.type = options.type
},
methods: {
@ -630,4 +635,4 @@
}
}
}
</style>
</style>

@ -11,7 +11,7 @@
<view class="park-bd">
<view class="item"><text>{{cityInfo.fuwu_hours}}</text>服务总时长</view>
<view class="item"><text>{{cityInfo.fuwu_num}}</text>服务总数</view>
<view class="item"><text>{{cityInfo.star}}</text>为我服务次数</view>
<view class="item"><text>{{cityInfo.service_num_for_me}}</text>为我服务次数</view>
</view>
<view class="park-fd">
<image :src="cityInfo.wechat"></image>

@ -5,7 +5,9 @@
<view class="helpItem" :class="((index == itemList.length - 1) && item.child.length == 0) ? 'border' : ''"
v-for="(item, index) in itemList" :key="index">
<view class="helpMain" @click="goListPage(item)">
<u-icon name="question-circle"></u-icon>
<u-icon name="arrow-left" class="zhishi" color="#dfdbdb" size="28"></u-icon>
<image :src="item.img_url" mode="" class="helpImg"></image>
<!-- <u-icon name="question-circle"></u-icon> -->
<view class="mainText">
<text>{{ item.name }}</text>
<u-icon name="arrow-right" v-if="item.name != ''" color="#8B8B8B" size="22"></u-icon>
@ -61,21 +63,21 @@
that.itemList = res.data.list;
that.itemList.map(item => {
if (item.child.length > 0) {
if (parseInt(item.child.length % 4) == 1 && item.child.length < 3) {
if (parseInt(item.child.length % 4) == 1) {
item.child.push({}, {}, {})
}
if (parseInt(item.child.length % 4) == 2 && item.child.length < 3) {
if (parseInt(item.child.length % 4) == 2) {
item.child.push({}, {})
}
if (parseInt(item.child.length % 4) == 3) {
item.child.push({})
}
if (parseInt(item.child.length % 4) == 1 && item.child.length > 4) {
if (parseInt(item.child.length % 4) == 1) {
item.child.push({})
}
}
item.childArr = []
item.childArr = item.child.slice(0, 9)
item.childArr = item.child.slice(0, 4)
})
}
@ -137,7 +139,13 @@
align-items: center;
flex-direction: column;
position: relative;
// border-bottom: 1px solid #dfdbdb;
.helpImg {
width: 50rpx;
height: 50rpx;
border-radius: 50%;
}
.titleIcon {
width: 50upx;

@ -122,7 +122,7 @@ export default{
.filterTitle{
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-weight: 700;
color: #303030;
text-align: center;
}

@ -76,6 +76,11 @@
</script>
<style lang="scss" scoped>
::v-deep .u-btn--primary {
background-color: #FF6257 !important;
border-color: #FF6257;
}
.afterSales {
padding: 32upx;
@ -120,7 +125,7 @@
.filterTitle {
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-weight: 700;
color: #303030;
text-align: center;
padding-bottom: 30rpx;

@ -85,7 +85,7 @@
.filterTitle {
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-weight: 700;
color: #303030;
text-align: center;
}

@ -55,12 +55,12 @@
</view>
<view class="btnGroup">
<view class="btn info"
v-show="!item.order_refund_id&& item.order_status==10&&item.pay_status==20&&item.delivery_status==10"
v-show="!item.order_refund_id&& item.order_status==10&&item.delivery_type==10&&item.pay_status==20&&item.delivery_status==10"
@click="goJump('/pages/news3/updateAddr',item,0)">修改地址</view>
<view class="btn primary" v-show="!item.order_refund_id&&item.order_status==10&&item.pay_status==10"
@click="goJump('/pages/news3/updatePrice',item)">修改价格</view>
<view class="btn primary"
v-show="!item.order_refund_id&&item.order_status==10&&item.pay_status==20&&item.delivery_status==10"
v-show="!item.order_refund_id&&item.order_status==10&&item.delivery_type==10&&item.pay_status==20&&item.delivery_status==10"
@click="goJump('/pages/news3/sendOutGoods',item,2)">发货</view>
<view class="btn info" v-show="item.audit_status==0&&(item.order_status!=20)"
@click="refuseOrder(item,20)">拒绝</view>
@ -71,7 +71,7 @@
删除订单</view>
<view class="btn info" @click="refundAfter(item)" v-show="item.state_text=='receipt'">转至售后</view>
<view class="btn primary"
v-show="!item.order_refund_id&&item.order_status==10&&item.pay_status==20&&(item.delivery_status==20||item.delivery_status==30)"
v-show="!item.order_refund_id&&item.order_status==10&&item.delivery_type==10&&item.pay_status==20&&(item.delivery_status==20||item.delivery_status==30)"
@click="goJump('/pages/news3/sendOutGoods',item,1)">修改物流</view>
</view>
</view>

@ -72,6 +72,14 @@
{{orderInfo.delivery_type_text}}
</view>
</view>
<view class="descItem" v-if="orderInfo.delivery_type==20">
<view class="descLeft">
<text>到达时间</text>
</view>
<view class="descRight">
{{orderInfo.to_store_time}}
</view>
</view>
<view class="descItem">
<view class="descLeft">
<text>配送费</text>
@ -170,13 +178,13 @@
<!-- 底部按钮 -->
<view class="footer-btn">
<view class="del"
v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==10"
v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.delivery_type==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==10"
@click="goJump('/pages/news3/updateAddr',orderInfo,0)">修改地址</view>
<view class="btn"
v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==10"
@click="goJump('/pages/news3/updatePrice',orderInfo)">修改价格</view>
<view class="btn"
v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==10"
v-show="!orderInfo.order_refund_id&&orderInfo.delivery_type==10&&orderInfo.order_status==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==10"
@click="goJump('/pages/news3/sendOutGoods',orderInfo,2)">发货</view>
<view class="del" v-show="orderInfo.audit_status==0" @click="refuseOrder(orderInfo,20)">拒绝</view>
<view class="btn" v-show="orderInfo.audit_status==0" @click="refuseOrder(orderInfo,10)">同意</view>
@ -184,7 +192,7 @@
v-show="(!orderInfo.order_refund_id&&orderInfo.order_status==30&&orderInfo.pay_status==20&&orderInfo.delivery_status==20)||(!orderInfo.order_refund_id&&orderInfo.order_status==20&&orderInfo.pay_status==10&&orderInfo.delivery_status==10)">
删除订单</view>
<view class="btn"
v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==20&&(orderInfo.delivery_status==20||orderInfo.delivery_status==30)"
v-show="!orderInfo.order_refund_id&&orderInfo.delivery_type==10&&orderInfo.order_status==10&&orderInfo.pay_status==20&&(orderInfo.delivery_status==20||orderInfo.delivery_status==30)"
@click="goJump('/pages/news3/sendOutGoods',orderInfo,1)">修改物流</view>
</view>
</view>
@ -196,7 +204,8 @@
<view class="filterItem c">
<view class="tuiAdderss" v-if="audit_status==10">
<text>退货地址:</text>
<view class="" @click="goJump('/pages/news3/addressList','',0)"><text :style="{'color': addressData?'#303030':'#ABABAB'}"></text>
<view class="" @click="goJump('/pages/news3/addressList','',0)"><text
:style="{'color': addressData?'#303030':'#ABABAB'}"></text>
{{addressData?addressData.name+addressData.phone:'请选择退货地址'}}
<u-icon name="arrow-right" color="#979797" size="28"></u-icon>
</view>
@ -253,7 +262,7 @@
isToggle: false,
refund_image_id: '',
refund_notes: '',
addressData:''
addressData: ''
};
},
onLoad(option) {
@ -362,13 +371,15 @@
min-height: 100%;
padding-bottom: 140rpx;
}
.tuiAdderss {
.tuiAdderss {
padding: 30rpx 0;
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1rpx solid #EAEAEA;
}
.orderInfo {
display: flex;
align-items: center;
@ -545,7 +556,7 @@
/* 收货地址 */
.shipping-address {
height: 180upx;
height: 130upx;
background: #FFFFFF;
border-radius: 4px 4px 4px 4px;
opacity: 1;

@ -48,6 +48,18 @@
<view class="peo">手机号</view>
<view class="name">{{ order.extract_shop.phone }}</view>
</view>
<view class="thr">
<view class="peo">营业时间</view>
<view class="name">{{ order.extract_shop.shop_hours }}</view>
</view>
<view class="thr">
<view class="peo">到店时间</view>
<view class="name">{{ order.to_store_time }}</view>
</view>
<view class="thr">
<view class="peo">营业时间</view>
<view class="name">{{ order.extract_shop.shop_hours }}</view>
</view>
<!-- <view class="thr">
<view class="peo">预计到店时间</view>
<view class="name">2023-12-20 09:15</view>
@ -65,8 +77,8 @@
</view>
</view>
</view>
<view class="sendHome"
v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
<view class="sendHome" v-if="order.delivery_type == DeliveryTypeEnum.EXPRESS.value">
<view class="fline">
<view class="leftInfo">
<image src="/static/order/am.png" mode="" class="am"></image>
@ -88,14 +100,14 @@
<view class="leftInfo">
<image src="/static/order/cd.png" mode="" class="am"></image>
<view class="gp">
<text>收货方式</text>
{{order.delivery_type==10?'快递配送':'门店自提'}}
<text>收货方式</text>快递配送
<!-- {{order.delivery_type==10?'快递配送':'门店自提'}} -->
</view>
</view>
<view class="up" @click="onCdDia(order.goods_id)"
<!-- <view class="up" @click="onCdDia(order.goods_id)"
v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
我要催单
</view>
</view> -->
</view>
</view>
<view class="goodsDetail">
@ -285,16 +297,16 @@
核销码
</view>
<view class="buyAgain" @click="handleTargetExpress(order.order_id)"
v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value&&order.delivery_type == DeliveryTypeEnum.EXPRESS.value">
查看物流
</view>
<view class="buyAgain" @click="onReceipt(order.order_id)"
style="color:#fff;background: linear-gradient( 180deg, #FD5D06 0%, #F3211A 100%);"
v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value && order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value">
v-if="order.delivery_type == DeliveryTypeEnum.EXPRESS.value&&order.delivery_status == DeliveryStatusEnum.DELIVERED.value && order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value">
确认收货
</view>
<view class="buyAgain" @click="onCdDia(order.order_id)"
v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
v-if="order.delivery_type == DeliveryTypeEnum.EXPRESS.value&&order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
催发货
</view>
<!-- <view class="buyAgain" @click="onCancel(order.order_id)"
@ -828,7 +840,7 @@
.consignee {
width: 694rpx;
height: 200rpx;
// height: 200rpx;
background: #FFFFFF;
border-radius: 10rpx 10rpx 10rpx 10rpx;
opacity: 1;
@ -839,9 +851,10 @@
.conLeft {
.thr {
display: flex;
overflow: hidden;
// display: flex;
width: 474rpx;
height: 34rpx;
// height: 34rpx;
font-size: 24rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
@ -849,13 +862,17 @@
line-height: 34rpx;
margin-bottom: 20rpx;
// justify-content: flex-start;
.peo {
width: 160rpx;
width: 150rpx;
float: left;
}
.name {
color: #333333;
color: #333;
float: left;
word-wrap: break-word;
width: 300rpx;
}
}

@ -80,17 +80,17 @@
<view class="n"
v-if="item.pay_status == PayStatusEnum.PENDING.value && item.order_status == OrderStatusEnum.NORMAL.value"
@click="onPay(item.order_id)">立即支付</view>
<view class="n" v-if="item.delivery_status == DeliveryStatusEnum.DELIVERED.value"
<view class="n" v-if="item.delivery_type == DeliveryTypeEnum.EXPRESS.value&&item.delivery_status == DeliveryStatusEnum.DELIVERED.value"
@click="onLogistics(item.order_id)">查看物流
</view>
<view class="n n-1"
v-if="item.delivery_status == DeliveryStatusEnum.DELIVERED.value && item.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value"
v-if="item.delivery_type == DeliveryTypeEnum.EXPRESS.value&&item.delivery_status == DeliveryStatusEnum.DELIVERED.value && item.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value"
@click="onReceipt(item.order_id)">确认收货</view>
<view class="n"
v-if="(item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == ReceiptStatusEnum.NOT_RECEIVED.value)||item.order_status == OrderStatusEnum.CANCELLED.value"
@click="handleTargetGoods(item.goods[0].goods_id)">再次购买</view>
<view class="n"
v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
v-if="item.delivery_type == DeliveryTypeEnum.EXPRESS.value&&item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
@click="onCdDia(item.order_id)">催发货</view>
<!-- <view class="n"
v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"

@ -12,7 +12,8 @@
<view class="image-text_1" v-if="!isLogin" @click="goLogin()">
未登录
</view>
<button class="avatar-wrapper" v-else @click="onChooseAvatar">
<button class="avatar-wrapper" v-else type="primary" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<!-- <button class="avatar-wrapper" v-else @click="onChooseAvatar"> -->
<text lines="1" class="text-group_1">{{userInfo.nick_name}}</text>
<image :src="$picUrl+'/static/user/weChat.png'" class="thumbnail_1"></image>
</button>
@ -611,27 +612,13 @@
},
methods: {
onChooseAvatar(e) {
console.log(e)
let that = this
uni.getUserProfile({
desc: 'Wexin', //
success: res => {
let rawData = JSON.parse(res.rawData)
this.userInfo.avatar_url = rawData.avatarUrl;
this.userInfo.nick_name = rawData.nickName;
console.log("用户信息", JSON.parse(res.rawData))
if (rawData) {
that.headImgUpload(rawData.avatarUrl, rawData.nickName)
} else {
return that.$toast('获取失败')
}
}
})
that.headImgUpload(e.detail.avatarUrl)
},
nickSubmit(avatar_id,nick_name) {
nickSubmit(avatar_id, nick_name) {
UserApi.editUser({
avatar_id: avatar_id,
nick_name: nick_name
avatar_id: avatar_id
})
.then(res => {
if (res.status == 200) {
@ -651,7 +638,7 @@
})
.finally()
},
headImgUpload(avatarUrl, nickName) {
headImgUpload(avatarUrl) {
//
const that = this
UserApi.wxHeadImgUpload({
@ -659,7 +646,7 @@
checkLogin: 1
})
.then(res => {
that.nickSubmit(res.data.fileInfo.file_id, nickName)
that.nickSubmit(res.data.fileInfo.file_id)
})
},
goShopOrderList() {
@ -952,7 +939,6 @@
flex-direction: column;
justify-content: flex-end;
padding-bottom: 30rpx;
.toTop {
position: fixed;
bottom: 30rpx;
@ -1141,6 +1127,12 @@
padding: 0;
margin: 0;
border: none;
::v-ddep uni-button:after {
border: none !important;
}
button[type=primary][plain]{
border: none !important;
}
}
.text-group_1 {

Loading…
Cancel
Save