研学商品和邀请更新

invite/detail.vue

@@ -19,7 +19,7 @@
         </view>
       </view>
     </view>
-    <u-empty v-if="list.length == 0"></u-empty>
+    <u-empty iconSize="90px" textSize="14px" v-if="list.length == 0"></u-empty>
 
     <u-datetime-picker :show="show" v-model="time" mode="year-month" @cancel="show = false" @close="show = false"
       @confirm="confirm"></u-datetime-picker>

invite/wallet/hangingAmount.vue

@@ -11,7 +11,7 @@
 
     <view class="item" v-for="item in list">
       <view class="avatar">
-        <u-avatar size="40" text="佣金"></u-avatar>
+        <u-avatar size="40px" text="佣金"></u-avatar>
       </view>
       <view class="info">
         <view class="type_amount">
@@ -49,7 +49,9 @@ export default {
       if (content) {
         this.list = content;
         for (const element of this.list) {
-          this.total += element.total
+          if(element.receiptsType === 'WAIT'){
+            this.total += element.total
+          }
         }
       }
     })

invite/wallet/history.vue

@@ -30,7 +30,7 @@
       </view>
     </view>
 
-    <u-empty v-if="list.length == 0"></u-empty>
+    <u-empty iconSize="90px" textSize="14px" v-if="list.length == 0"></u-empty>
 
     <u-datetime-picker :show="show" v-model="time" mode="year-month" @cancel="show = false" @close="show = false"
       @confirm="confirm"></u-datetime-picker>

invite/wallet/withdraw.vue

@@ -72,6 +72,7 @@ export default {
               });
             }
             uni.hideLoading();
+            uni.navigateBack();
           }
         )
       } else {

study/community/detail.vue

@@ -60,7 +60,7 @@
 									{{item.createTime}}
 								</view>
 								<view class="address">
-									{{item.ip}}
+									{{item.ip || ''}}
 								</view>
 							</view>
 						</view>
@@ -83,13 +83,13 @@
 				<view class="icon-box">
 					<image class="icon" @click="handleLike" :src="info.isLike?require('../../static/like.png'):require('../../static/unLike.png')" mode=""></image>
 					<view class="num">
-						999
+						0
 					</view>
 				</view>
 				<view class="icon-box">
 					<image class="icon" src="../../static/comment.png" mode=""></image>
 					<view class="num">
-						999
+						1
 					</view>
 				</view>
 			</view>
@@ -153,14 +153,21 @@
 				// }
 			},
 			send(val){
-				console.log(val);
+				// console.log(val);
+				const user = JSON.parse(uni.getStorageSync('userInfo'))
 				this.list.push({
-						head:require('../../static/logo.png'),
-						userName:'李老师',
+						head:user.imgPath,
+						userName:user.nickname,
 						content:val.detail.value,
 						createTime:uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss'),
-						ip:'成都市',
+						// ip:'成都市',
 				})
+				this.text = ''
+				uni.showToast({
+					title: '评论经审核后才会显示。',
+					icon:'none',
+					duration: 2000
+				});
 			},
 			back(){
 				var pages = getCurrentPages();

study/pay/orderPay.vue

@@ -8,7 +8,7 @@
     </view>
 
     <view class="content progress"
-      v-if="info.goodsList[0].goodsState == 'APPLY_REFUND' || info.goodsList[0].goodsState == 'REFUNDED'"
+      v-if="info.goodsList[0].goodsState == 'APPLY_REFUNDING' || info.goodsList[0].goodsState == 'REFUNDED'"
       @click="refundDetail">
       <view class="progress-title">
         退款进度
@@ -239,7 +239,7 @@
 
     <template>
       <view class="content refund-box"
-        v-if="info.goodsList[0].goodsState == 'APPLY_REFUND' || (info.goodsList[0].refundLog && info.goodsList[0].refundLog.remark)">
+        v-if="info.goodsList[0].goodsState == 'APPLY_REFUNDING' || (info.goodsList[0].refundLog && info.goodsList[0].refundLog.remark)">
         <view class="title">
           退款原因
         </view>
@@ -248,7 +248,7 @@
           {{ info.goodsList[0].refundLog.remark }}
         </view>
       </view>
-      <button type="default" :loading="btnLoading" v-if="info.goodsList[0].goodsState == 'APPLY_REFUND'" class="pay-btn"
+      <button type="default" :loading="btnLoading" v-if="info.goodsList[0].goodsState == 'APPLY_REFUNDING'" class="pay-btn"
         @click="cancelReply">取消退款</button>
     </template>
 
@@ -535,7 +535,7 @@ export default {
       if (val.refundLog && val.refundLog.refund == 'REFUSAL_REFUND' && !val.change) {
         return '拒绝退款'
       }
-      else if (val.goodsState == 'APPLY_REFUND') {
+      else if (val.goodsState == 'APPLY_REFUNDING') {
         return '退款审核中'
       } else if (val.goodsState == 'CLOSE') {
         return '关闭订单'