Merge branch 'lx-dev' of gitee.com:cabbage_qd/web-base-h5 into lx-online

pages/bonus/index.vue

@@ -9,7 +9,8 @@
 			</view>
 		</scroll-view>
 		<view class="sum-val">
-			昨日实发合计: <span>{{toSum | toThousandthAndKeepDecimal}}</span>
+			<view v-if="monthIncomeTotal" >本月合计: <span>{{monthIncomeTotal | toThousandthAndKeepDecimal}}</span></view>
+			<view>昨日合计: <span>{{toSum | toThousandthAndKeepDecimal}}</span></view>
 		</view>
 		<template>
 			<sgsy v-if="navIndex==0" ref="sgsyData" :checkRule="marketList[0].isShow" :num="page.pageNum" />
@@ -93,7 +94,8 @@
 				page: {
 					pageSize: 50,
 					pageNum: 1,
-				}
+				},
+				monthIncomeTotal: 0,
 			}
 		},
 		components: {
@@ -112,7 +114,9 @@
 		methods: {
 			getSum() {
 				api1.queryBonusTotal({}).then((res) => {
+					console.log(res, '....res====aa')
 					this.toSum = res.rows[0].realIncomeTotal
+					this.monthIncomeTotal = res.rows[0].monthIncomeTotal
 				})
 			},
 			bindPickerChange(e) {
@@ -148,12 +152,15 @@
 <style lang="scss">
 	.sum-val {
 		background-color: #fff;
-		height: 100rpx;
-		line-height: 100rpx;
+		// height: 100rpx;
+		line-height: 60rpx;
 		text-align: right;
 		margin-top: 10rpx;
 		padding-right: 20rpx;
-
+		display: flex;
+		flex-direction: column;
+		align-items: flex-end;
+		justify-content: flex-end;
 		span {
 			font-size: 34rpx;
 			font-weight: bold;

pages/specialArea/details.vue

@@ -156,7 +156,7 @@
       <view class="pop_a">
         <view class="pop_tt">
           <view class="pop_t">
-            <img :src="imgUrlList[1]" alt="" />
+            <img :src="imgUrlList[0]" alt="" />
             <view>{{
               goodDetail.goodsPrice | numberToCurrency | isLocal
             }}</view>
@@ -251,6 +251,7 @@ export default {
       isWidth: 375,
       pkCountry: 1,
       countDown: "",
+      bannerImgList: []
     };
   },
  
@@ -267,11 +268,11 @@ export default {
   },
   computed: {
     ...mapGetters(["user", "shopCarLength"]),
-    bannerImgList() {
-      const list = this.imgUrlList.map(item => item)
-      list.splice(1,1)
-      return list
-    }
+    // bannerImgList() {
+    //   const list = this.imgUrlList.map(item => item)
+    //   list.splice(1,1)
+    //   return list
+    // }
   },
   methods: {  
     toIndex() {
@@ -359,7 +360,6 @@ export default {
           // this.goodDetail.sales = sl
           // this.mainImgUrl = res.data.videoUrl
           this.imgUrlList = [
-            res.data.videoUrl,
             res.data.cover,
             res.data.cover1,
             res.data.cover2,
@@ -368,9 +368,21 @@ export default {
             res.data.cover5,
             res.data.cover6,
           ];
+          this.bannerImgList = [
+            res.data.videoUrl,
+            res.data.cover1,
+            res.data.cover2,
+            res.data.cover3,
+            res.data.cover4,
+            res.data.cover5,
+            res.data.cover6,
+          ];
           this.imgUrlList = this.imgUrlList.filter(
             (item) => item && item.trim()
           );
+          this.bannerImgList = this.bannerImgList.filter(
+            (item) => item && item.trim()
+          );
           this.goodDetail.productParams.forEach((item, index) => {
             item.waresItemsParamsList.forEach((ctem, cndex) => {
               ctem.quantity = 0;