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

1

Browse Source
main
liudan 7 months ago
parent e35b6bf4f7
commit dfb7b30126
7 changed files with 43 additions and 9 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. 1
      App.vue
  2. 13
      pages/huitong/huitongbao/index.vue
  3. 7
      pages/order_addcart/order_addcart.vue
  4. 9
      pages/users/user_integral/index.vue
  5. 7
      pages/users/user_integral1/fenhong.vue
  6. 8
      pages/users/user_integral1/index.vue
  7. 7
      pages/users/user_integral1/user_contribute.vue

1
App.vue
Unescape View File

@ -137,6 +137,7 @@
if(that.globalData.copy_command_status == 1){ if(that.globalData.copy_command_status == 1){
uni.getClipboardData({ uni.getClipboardData({
success: function (res) { success: function (res) {
uni.hideToast()
if(/^(\/@[1-9]{1}).*\*\//.test(res.data)){ if(/^(\/@[1-9]{1}).*\*\//.test(res.data)){
that.$store.commit("PARSE_PWD", res.data) that.$store.commit("PARSE_PWD", res.data)
} }

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

@ -60,10 +60,21 @@
<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> <!-- <view>
<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>
</view>
<view>{{item.create_time}}</view>
</view> -->
<view style="width: 87%;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;">
<text>昵称:{{item.user_nickname}}</text>
<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
</view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>
</view> </view>
<view> <view>

7
pages/order_addcart/order_addcart.vue
Unescape View File

@ -311,7 +311,7 @@
this.getCartNum(); this.getCartNum();
this.goodsHidden = true; this.goodsHidden = true;
this.footerswitch = true; this.footerswitch = true;
// this.isAllSelect = true; //全不选 this.isAllSelect = true; //全不选
this.selectValue = []; //选中的数据 this.selectValue = []; //选中的数据
this.isShowAuth = false; this.isShowAuth = false;
uni.setStorage({ uni.setStorage({
@ -355,6 +355,8 @@
console.log(selectedArr) console.log(selectedArr)
if(selectedArr.length==i.list.length){ if(selectedArr.length==i.list.length){
this.$set(i,'allCheck',true) this.$set(i,'allCheck',true)
}else{
this.$set(i,'allCheck',false)
} }
}) })
@ -748,6 +750,7 @@
}) })
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,"报错")
this.cartList.valid.forEach(item=>{ this.cartList.valid.forEach(item=>{
item.list.forEach(p=>{ item.list.forEach(p=>{
newArr.forEach(i=>{ newArr.forEach(i=>{
@ -847,7 +850,7 @@
// 全选 // 全选
console.log(allArr,"oooo12345",this.cartList.valid,isFirst) console.log(allArr,"oooo12345",this.cartList.valid,isFirst)
if(!isFirst){ if(!isFirst){
this.isAllSelect = allArr.length == this.cartList.valid.length ? true : false this.isAllSelect = allArr.length!=0&&this.cartList.valid.length!=0&&allArr.length == this.cartList.valid.length ? true : false
} }
}, },

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

@ -49,8 +49,13 @@
<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> <view style="width: 87%;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;">
<text>昵称:{{item.user_nickname}}</text>
<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
</view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>
</view> </view>
<view> <view>
@ -491,7 +496,7 @@
.integral-details .wrapper .list .item .state { .integral-details .wrapper .list .item .state {
margin-bottom: 24rpx; // margin-bottom: 24rpx;
font-size: 30rpx; font-size: 30rpx;
color: #333333; color: #333333;
} }

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

@ -39,8 +39,13 @@
<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> <view style="width: 87%;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;">
<text>昵称:{{item.user_nickname}}</text>
<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
</view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>
</view> </view>
<view> <view>

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

@ -43,9 +43,13 @@
<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> <view style="width: 87%;margin-right: 20rpx;">
<view class='state'>{{item.type}}</view> <view class='state'>{{item.type}}</view>
<view style="margin: 10rpx 0;">订单号:{{item.order_sn}}</view> <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>
</view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>
</view> </view>
<view> <view>

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

@ -43,8 +43,13 @@
<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> <view style="width: 87%;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;">
<text>昵称:{{item.user_nickname}}</text>
<text style="margin-left:10rpx;">订单号:{{item.order_sn}}</text>
</view>
<view>{{item.create_time}}</view> <view>{{item.create_time}}</view>
</view> </view>
<view> <view>

Write Preview
Loading…
Cancel
Save