liudan
/
huitong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
liudan 5 months ago
parent d78ab2ba9d
commit b552abb5e5
6 changed files with 41 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      pages/huitong/huitongbao/index.vue
  2. 36
      pages/order_addcart/order_addcart.vue
  3. 6
      pages/users/user_integral/index.vue
  4. 7
      pages/users/user_integral1/fenhong.vue
  5. 6
      pages/users/user_integral1/index.vue
  6. 6
      pages/users/user_integral1/user_contribute.vue

8
pages/huitong/huitongbao/index.vue
Unescape View File

@ -66,13 +66,15 @@
</view> </view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>
</view> --> </view> -->
<view style="width: 87%;margin-right: 20rpx;"> <view style="margin-right: 20rpx;">
<view class='state'>{{item.type}} <view class='state'>{{item.type}}
<text style="margin-left:10rpx;">{{(item.ext != null&&item.ext.from_phone)?`来自${item.ext.from_phone}`:(item.ext !== null&&item.ext.to_phone)?`转给${item.ext.to_phone}`:''}}</text> <text style="margin-left:10rpx;">{{(item.ext != null&&item.ext.from_phone)?`来自${item.ext.from_phone}`:(item.ext !== null&&item.ext.to_phone)?`转给${item.ext.to_phone}`:''}}</text>
</view> </view>
<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"> <view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
<text>昵称:{{item.user_nickname}}</text>
<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
<text>昵称:{{item.order?item.order.nickname:item.user_nickname}}</text>
<text style="margin-left:10rpx;" v-if="item.order_sn">订单号:{{item.order_sn}}</text>
</view> </view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>

36
pages/order_addcart/order_addcart.vue
Unescape View File

@ -288,6 +288,14 @@
this.cartList.valid = res.data.list; this.cartList.valid = res.data.list;
this.cartList.invalid = res.data.fail this.cartList.invalid = res.data.fail
if(res.data.list.length == 0 && res.data.list.length == 0){
this.recommend = true;
if(!this.hostProduct.length){
this.getHostProduct();
}
}else{
this.recommend = false
}
}) })
this.getCartNum(); this.getCartNum();
}else{ }else{
@ -596,6 +604,7 @@
* *
*/ */
ChangeAttr: function(res) { ChangeAttr: function(res) {
let productSelect = this.productValue[res]; let productSelect = this.productValue[res];
this.currSku = res; this.currSku = res;
this.newVal = this.productValue[res]; this.newVal = this.productValue[res];
@ -664,6 +673,7 @@
}) })
}, },
goCat: function() { goCat: function() {
console.log("yyyy")
let that = this; let that = this;
changeCartNum(that.goods.cart_id, { changeCartNum(that.goods.cart_id, {
cart_num: that.goods.cart_num, cart_num: that.goods.cart_num,
@ -680,7 +690,7 @@
} }
that.onMyEvent(); that.onMyEvent();
that.getCartList(true); that.getCartList(true);
that.isAllSelect = false that.isAllSelect = true
}).catch(error => { }).catch(error => {
that.$util.Tips({ that.$util.Tips({
@ -749,19 +759,19 @@
}) })
}) })
this.cartList.valid = res.data.list; this.cartList.valid = res.data.list;
let newArr=JSON.parse(uni.getStorageSync('cartSelectedGoods')) // let newArr=JSON.parse(uni.getStorageSync('cartSelectedGoods'))
console.log(newArr,"报错") // console.log(newArr,"报错")
this.cartList.valid.forEach(item=>{ // this.cartList.valid.forEach(item=>{
item.list.forEach(p=>{ // item.list.forEach(p=>{
newArr.forEach(i=>{ // newArr.forEach(i=>{
if(p.product_id==i){ // if(p.product_id==i){
this.$set(p,'check',true) // this.$set(p,'check',true)
} // }
}) // })
}) // })
}) // })
this.cartList.invalid = res.data.fail this.cartList.invalid = res.data.fail
if(res.data.list.length == 0 && res.data.list.length == 0){ if(res.data.list.length == 0 && res.data.list.length == 0){
this.recommend = true; this.recommend = true;
@ -806,7 +816,7 @@
}) })
}) })
uni.setStorageSync('cartSelectedGoods',JSON.stringify(selectedCart)) // uni.setStorageSync('cartSelectedGoods',JSON.stringify(selectedCart))
} }
this.cartAllCheck('goodsCheck') this.cartAllCheck('goodsCheck')

6
pages/users/user_integral/index.vue
Unescape View File

@ -49,12 +49,12 @@
<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text> <text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
</view> </view>
<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index"> <view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
<view style="width: 87%;margin-right: 20rpx;"> <view style="margin-right: 20rpx;">
<view class='state'>{{item.type}}</view> <view class='state'>{{item.type}}</view>
<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"> <view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
<text>昵称:{{item.user_nickname}}</text>
<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
<text>昵称:{{item.order?item.order.nickname:item.user_nickname}}</text>
<text style="margin-left:10rpx;" v-if="item.order_sn">订单号:{{item.order_sn}}</text>
</view> </view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>
</view> </view>

7
pages/users/user_integral1/fenhong.vue
Unescape View File

@ -39,11 +39,12 @@
<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text> <text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
</view> </view>
<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index"> <view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
<view style="width: 87%;margin-right: 20rpx;"> <view style="margin-right: 20rpx;">
<view class='state'>{{item.type}}</view> <view class='state'>{{item.type}}</view>
<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"> <view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
<text>昵称:{{item.user_nickname}}</text>
<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text> <text>昵称:{{item.order?item.order.nickname:item.user_nickname}}</text>
<text style="margin-left:10rpx;" v-if="item.order_sn">订单号:{{item.order_sn}}</text>
</view> </view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>

6
pages/users/user_integral1/index.vue
Unescape View File

@ -43,11 +43,11 @@
<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text> <text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
</view> </view>
<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index"> <view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
<view style="width: 87%;margin-right: 20rpx;"> <view style="margin-right: 20rpx;">
<view class='state'>{{item.type}}</view> <view class='state'>{{item.type}}</view>
<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"> <view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
<text>昵称:{{item.user_nickname}}</text> <text>昵称:{{item.order?item.order.nickname:item.user_nickname}}</text>
<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text> <text style="margin-left:10rpx;" v-if="item.order_sn">订单号:{{item.order_sn}}</text>
</view> </view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>

6
pages/users/user_integral1/user_contribute.vue
Unescape View File

@ -43,12 +43,12 @@
<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text> <text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
</view> </view>
<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index"> <view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
<view style="width: 87%;margin-right: 20rpx;"> <view style="margin-right: 20rpx;">
<view class='state'>{{item.type}}</view> <view class='state'>{{item.type}}</view>
<view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;"> <view style="color:#333;font-size:24rpx;margin:10rpx 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">
<text>昵称:{{item.user_nickname}}</text>
<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
<text>昵称:{{item.order?item.order.nickname:item.user_nickname}}</text>
<text style="margin-left:10rpx;" v-if="item.order_sn">订单号:{{item.order_sn}}</text>
</view> </view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>
</view> </view>

Write Preview
Loading…
Cancel
Save