添加积分奖励&抽卡文字超出

pages/cjx/index/index.vue

@@ -59,15 +59,21 @@
 													mode="heightFix"></image>
 											</view>
 											<view v-show="item.prizeType == 0" class="card-text-2">下次继续</view>
+
 											<view v-show="item.prizeType == 1" class="card-text-1">现金红包</view>
 											<view v-show="item.prizeType == 1" class="card-money">￥{{item.money/100}}
 											</view>
-											<view v-show="item.prizeType == 1" class="card-text-2">已存入您的微信零钱</view>
+											<view v-show="item.prizeType == 1" class="card-text-2">已存入您的<br/>微信零钱</view>
+
 											<view v-show="item.prizeType == 2" class="card-text-1">再来一包</view>
 											<view v-show="item.prizeType == 2" class="card-img-item">
 												<image style="height:100rpx" :src="item.img" mode="heightFix"></image>
 											</view>
 											<view v-show="item.prizeType == 2" class="card-text-2">凭包装兑换</view>
+
+                      <view v-show="item.prizeType == 4" class="card-text-1">积分奖励</view>
+                      <view v-show="item.prizeType == 4" class="card-point">+{{item.point}}</view>
+                      <view v-show="item.prizeType == 4" class="card-text-2">积分已累计</view>
 										</view>
 									</view>
 								</view>
@@ -87,6 +93,7 @@
               </view>
               <view v-show="prizeJson.prizeType == 1 || prizeJson.prize_type == 1" class="popup_text1">现金红包</view>
               <view v-show="prizeJson.prizeType == 2 || prizeJson.prize_type == 2" class="popup_text1">再来一包</view>
+              <view v-show="prizeJson.prizeType == 4 || prizeJson.prize_type == 4" class="popup_text1">积分奖励</view>
               <view class="center">
                 <image v-show="prizeJson.prizeType == 1 || prizeJson.prize_type == 1" class="popup_img"
                        src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/money.png"
@@ -100,6 +107,8 @@
                 已存入您的微信零钱！</view>
               <view v-show="prizeJson.prizeType == 2 || prizeJson.prize_type == 2" class="center pupup_text3">
                 请凭包装袋到购买门店兑换！</view>
+              <view v-show="prizeJson.prizeType == 4 || prizeJson.prize_type == 4" class="center pupup_text3">
+                积分已累计！</view>
             </view>
 
 
@@ -182,7 +191,8 @@
 						img: '',
 						money: '',
 						prizeType: '',
-						isFlipping: false
+						isFlipping: false,
+            point: ''
 					},
 					{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/two.png',
@@ -194,7 +204,8 @@
 						img: '',
 						money: '',
 						prizeType: '',
-						isFlipping: false
+						isFlipping: false,
+            point: ''
 					},
 					{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/three.png',
@@ -206,7 +217,8 @@
 						img: '',
 						money: '',
 						prizeType: '',
-						isFlipping: false
+						isFlipping: false,
+            point: ''
 					},
 					{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/four.png',
@@ -218,7 +230,8 @@
 						img: '',
 						money: '',
 						prizeType: '',
-						isFlipping: false
+						isFlipping: false,
+            point: ''
 					},
 					{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/five.png',
@@ -230,7 +243,8 @@
 						img: '',
 						money: '',
 						prizeType: '',
-						isFlipping: false
+						isFlipping: false,
+            point: ''
 					},
 					{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/six.png',
@@ -242,7 +256,8 @@
 						img: '',
 						money: '',
 						prizeType: '',
-						isFlipping: false
+						isFlipping: false,
+            point: ''
 
 					}
 				],
@@ -294,6 +309,7 @@
 					this.cards[i].money = list['card' + i].money;
 					this.cards[i].prizeName = list['card' + i].prizeName == undefined ? list['card' + i].prize_name : list[
 						'card' + i].prizeName;
+          this.cards[i].point = list['card' + i].point;
 				}
 				this.$forceUpdate();
 
@@ -396,6 +412,7 @@
 							that.totalDetail[i].prize_type;
 						that.cards[i].img = that.totalDetail[i].img;
 						that.cards[i].money = that.totalDetail[i].money;
+            that.cards[i].point = that.totalDetail[i].point;
 						that.cards[i].prizeName = that.totalDetail[i].prizeName == undefined ?
 							that.totalDetail[i].prize_name :
 							that.totalDetail[i].prizeName;
@@ -708,6 +725,11 @@
 		font-size: 36rpx;
 		color: #FF31C2;
 	}
+  .card-point {
+    font-weight: 500;
+    font-size: 36rpx;
+    color: yellow;
+  }
 
 	.card-text-1 {
 		font-weight: 500;

pages/cjx/my/my.vue

@@ -42,12 +42,12 @@
 							扫码记录
 						</view>
 					</u-col>
-					<u-col span="4" textAlign="center" @click="jumpScanAddress">
-						<image class="tubiao" src="/static/images/tabbar/cjx/scan.png" mode="aspectFit" />
-						<view class="">
-							业务管理
-						</view>
-					</u-col>
+<!--					<u-col span="4" textAlign="center" @click="jumpScanAddress">-->
+<!--						<image class="tubiao" src="/static/images/tabbar/cjx/scan.png" mode="aspectFit" />-->
+<!--						<view class="">-->
+<!--							业务管理-->
+<!--						</view>-->
+<!--					</u-col>-->
 					<u-col span="4">
 				
 					</u-col>

pages/hexiao/xiaoshou/index.vue

@@ -58,7 +58,7 @@
     <view class="content">
       <view class="t-one">
         <view class="t-text">核销和上货趋势统计</view>
-        <view class="charts-box">
+        <view class="charts-box"  v-show="!timeShow">
           <qiun-data-charts
               type="line"
               :opts="opts"
@@ -66,7 +66,7 @@
           />
         </view>
       </view>
-      <view class="t-one" v-show=" type == 2">
+      <view class="t-one" v-show=" type == 2 && !timeShow">
         <view class="t-text">巡店统计</view>
         <view class="charts-box">
           <qiun-data-charts
@@ -135,7 +135,7 @@
       </view>
 
     </u-popup>
-    <u-calendar :minDate="minDate"  :monthNumber="6"  :show="timeShow" :mode="mode" @confirm="confirm" @close="timeShow = false"></u-calendar>
+    <u-calendar :minDate="minDate"  :monthNumber="6"  :show="timeShow" :mode="mode" @confirm="confirm" @close="timeCalendar"></u-calendar>
 
   </view>
 
@@ -146,6 +146,7 @@ import {getSalesTotal,getSalesTrend,getSalesmanSalesTotal,getSalesmanSalesTrend,
 export default {
   data() {
     return {
+      chartTitle: "核销和上货趋势统计",
       storeId: 0,
 	    ywyId:0,
       minDate: new Date(new Date().setMonth(new Date().getMonth() - 2)),
@@ -214,7 +215,12 @@ export default {
   onReady() {
   },
   methods: {
+    timeCalendar(){
+      console.log('timeCalendar');
+      this.timeShow = false;
+    },
     initMenDian() {
+      this.chartTitle = "核销和上货趋势统计";
       let  that = this;
       getStoreSalesSummary(this.startTime,this.endTime,this.storeId).then(res => {
         if (res.code === 0){
@@ -349,6 +355,7 @@ export default {
 
     },
     initJXS() {
+      this.chartTitle = "核销和下单趋势统计";
       getSalesTotal(this.startTime,this.endTime).then(res => {
             if (res.code === 0){
               this.hexiaoNumber = res.data.orderTotal;
@@ -541,6 +548,10 @@ export default {
   ::v-deep .u-input{
     background-color: #fff;
   }
+  ::v-deep .u-calendar{
+	  z-index: 999;
+  }
+  
   .popup-content{
     height: 45vh;
     padding: 10px;