更多供应商

ghsApp/src/admin/hb/list.vue

@@ -24,9 +24,11 @@
                           <text>{{ item.customName }}</text>
                           </view>
                         <view class="info-name">红包状态：{{item.status==1?'待使用':item.status ==2 ?'已使用':item.status==3?'已失效':'未知' }}</view>
-						<view class="info-name">最低消费：{{ item.miniCost }}元</view>
+						<view class="info-name">红包金额：{{ parseFloat(item.amount) }}元</view>
+						<view class="info-name">最低消费：{{ parseFloat(item.miniCost) }}元</view>
                         <view class="info-name">过期时间：{{ item.endTime.substr(0,10) }}</view>
-                        <view class="info-name">发放时间：{{ item.addTime }}</view>
+                        <view class="info-name">发放时间：{{ item.addTime.substr(0,10) }}</view>
+						<view class="info-name">备注信息：{{ item.remark }}</view>
 					</view>
 					<view class="status primary">
 						<view class="status-name">{{item.amount}}元</view>

hdApp/src/admin/coupon/couponList.vue

@@ -92,13 +92,13 @@ export default {
 			uni.stopPullDownRefresh()
 		})
 	},
-	onReachBottom() {
-		if (this.list.moreData == 1) {
-			this._list().then(res => {
-				uni.stopPullDownRefresh()
-			})
+	onReachBottom () {
+		if (!this.list.finished) {
+		this._list().then(res => {
+			uni.stopPullDownRefresh();
+		});
 		} else {
-			uni.stopPullDownRefresh()
+		uni.stopPullDownRefresh();
 		}
 	},
 	onLoad: function() {
@@ -109,7 +109,7 @@ export default {
 			this._list()
 		},
 		_list() {
-			return shopCouponList({ status: this.tabIndex + 1 }).then(res => {
+			return shopCouponList({ status: this.tabIndex + 1,page: this.list.page }).then(res => {
 				console.log(res)
 				this.completes(res)
 			})

hdApp/src/components/module/app-activily-coupon.vue

@@ -13,7 +13,7 @@
 					<div class="list-det-left">
 						<div class="price-wrap">
 							<span>￥</span>
-							<span class="price">{{ info.amount }}</span>
+							<span class="price">{{ parseFloat(info.xrFlAmount) }}</span>
 						</div>
 					</div>
 					<div class="list-det-right">

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -189,7 +189,7 @@ export default {
 			xjDataInfo:{},
 			shareDiscount:1,
 			ghsId:0,
-			newCustomGift:{amount:100,miniCost:500,validTime:'2021-12-05'},
+			newCustomGift:{xrFlAmount:0},
 			isNewCustom:false,
 			showInvite:false,
 			//推荐新人福利
@@ -377,6 +377,7 @@ export default {
 					}
 					uni.setNavigationBarTitle({title: this.ghsInfo.name})
 					this.option.id = res.data.id;
+					this.newCustomGift.xrFlAmount = res.data.xrFlAmount
 				}).catch(err => {})
 			} else {
 				this.ghsId = this.option.id
@@ -394,6 +395,7 @@ export default {
 						this.isNewCustom = true
 					}
 					this.tjFl = res.data.tjFl
+					this.newCustomGift.xrFlAmount = res.data.xrFlAmount
 				}).catch(err => {})
 			}
 		},

hdApp/src/pagesPurchase/order.vue

@@ -40,7 +40,10 @@
     </view>
     
     <view class="app-footer open_btn">
-			<text style="color:#3385FF;margin-right:30rpx;" @click="bcGhs()">更多供应商</text> <view @click="inviteGhs" class="admin-button-com middle blue">邀请供应商得300元</view>
+      <view @click="bcGhs()" class="admin-button-com middle blue">更多供应商</view>
+      <!--
+      <view @click="inviteGhs" class="admin-button-com middle blue">邀请供应商得300元</view>
+      -->
 		</view>
 
   </view>