From 4192328e3cc952864daf48c0232a4ee1eb6f2e97 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 29 Dec 2023 19:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E8=B1=86=E8=B1=86?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8A=B5=E6=89=A3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                           |  11 ++-
 pages.json                              |  18 ++--
 pages/activity/liveBroadcast/index.vue  |   6 +-
 pages/index/component/liveBroadcast.vue |  30 +++---
 pages/users/order_confirm/index.vue     | 121 +++++++++++++++---------
 project.config.json                     |   4 +-
 6 files changed, 111 insertions(+), 79 deletions(-)

diff --git a/manifest.json b/manifest.json
index 78447fb..854113c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
 {
-    "name" : "万马奔腾",
+    "name" : "众创公社",
     "appid" : "__UNI__FADD765",
     "description" : "",
-    "versionName" : "1.0.4",
-    "versionCode" : 127,
+    "versionName" : "1.0.0",
+    "versionCode" : 1,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -158,7 +158,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx7aac64d4d4419260",
+        "appid" : "wx3333c42c5f068ac6",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -201,5 +201,6 @@
         },
         "title" : "加载中...",
         "template" : "template.h5.html"
-    }
+    },
+    "vueVersion" : "2"
 }
diff --git a/pages.json b/pages.json
index 5fcf9e2..dd7897c 100644
--- a/pages.json
+++ b/pages.json
@@ -15,7 +15,7 @@
 			"style": {
 				"navigationBarTitleText": "首页",
 					"navigationStyle": "custom",
-				// #ifdef APP-PLUS	
+				// #ifdef APP-PLUS
 					"enablePullDownRefresh": true,
 				// #endif
 				"app-plus": {
@@ -57,7 +57,7 @@
 			"path": "pages/goods_details/index",
 			"style": {
 				"navigationStyle": "custom"
-				// #ifdef MP || APP-PLUS	
+				// #ifdef MP || APP-PLUS
 				,
 				"navigationBarBackgroundColor": "#F2F2F2"
 				// #endif
@@ -664,7 +664,7 @@
 				{
 					"path": "goods_details/index",
 					"style": {
-						"navigationBarTitleText": "商品详情"				
+						"navigationBarTitleText": "商品详情"
 					}
 				},
 				{
@@ -904,7 +904,7 @@
 //			"plugins": {
 //				"live-player-plugin": {
 //					"version": "1.3.2",
-//					"provider": "wx7aac64d4d4419260"
+//					"provider": "wx3333c42c5f068ac6"
 //				}
 //			}
 		},
@@ -1066,7 +1066,7 @@
 		    "enablePullDownRefresh": false,
 		    //#ifdef APP
 		    "path": "appSwiper/index",
-		    //#endif	
+		    //#endif
 		    //#ifndef APP
 		    "path": "nvueSwiper/index",
 		    //#endif
@@ -1169,7 +1169,7 @@
 		      "style": {
 		        "navigationBarTitleText": "兑换订单详情"
 		      }
-		    }		
+		    }
 		  ]
 		},
 		{
@@ -1248,7 +1248,7 @@
 		"navigationBarTitleText": "加载中...",
 		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#F8F8F8"
-			//#ifndef H5 
+			//#ifndef H5
 			,
 		"titleNView": true
 			//#endif
@@ -1286,7 +1286,7 @@
 			{
 				"pagePath": "pages/order_addcart/order_addcart",
 				"iconPath": "static/images/3-001.png",
-				"selectedIconPath": "static/images/3-002.png",				
+				"selectedIconPath": "static/images/3-002.png",
 				"text": "购物车"
 			},
 			{
@@ -1306,4 +1306,4 @@
 		}]
 	},
 	"sitemapLocation": "sitemap.json"
-}
\ No newline at end of file
+}
diff --git a/pages/activity/liveBroadcast/index.vue b/pages/activity/liveBroadcast/index.vue
index ebfb12c..42021aa 100644
--- a/pages/activity/liveBroadcast/index.vue
+++ b/pages/activity/liveBroadcast/index.vue
@@ -3,7 +3,7 @@
 		<view class='flash-sale'>
 			<view class='list'>
 				<view v-for="(item,index) in broadcastList" :key='index' >
-					<navigator hover-class="none" :url="((item.live_status == 103 &&  item.replay_status) || item.live_status === 101 || item.live_status === 102) ? 'plugin-private://wx7aac64d4d4419260/pages/live-player-plugin?room_id=' + item.room_id : ''">
+					<navigator hover-class="none" :url="((item.live_status == 103 &&  item.replay_status) || item.live_status === 101 || item.live_status === 102) ? 'plugin-private://wx3333c42c5f068ac6/pages/live-player-plugin?room_id=' + item.room_id : ''">
 						<view class='item acea-row row-between-wrapper'>
 							<view class="live-image">
 								<img class="image" :src="item.share_img">
@@ -266,12 +266,12 @@
 		color: #fff;
 		min-width: 130rpx;
 		max-width: 140rpx;
-		height: 50rpx;	
+		height: 50rpx;
 		font-size: 22rpx;
 		&.playRadius {
 			border-radius:  18rpx 0px 0 0px;
 		}
-		
+
 		&.notPlayRadius {
 			border-radius: 18rpx 0px 18rpx 0px;
 		}
diff --git a/pages/index/component/liveBroadcast.vue b/pages/index/component/liveBroadcast.vue
index ea91758..2567cc7 100644
--- a/pages/index/component/liveBroadcast.vue
+++ b/pages/index/component/liveBroadcast.vue
@@ -14,7 +14,7 @@
 				<view class="live-wrapper mores">
 					<scroll-view scroll-x="true" style="white-space: nowrap; display: flex">
 						<view class="item" v-for="(item, index) in liveList" :key="index">
-							<navigator hover-class="none" :url="'plugin-private://wx7aac64d4d4419260/pages/live-player-plugin?room_id=' + item.room_id">
+							<navigator hover-class="none" :url="'plugin-private://wx3333c42c5f068ac6/pages/live-player-plugin?room_id=' + item.room_id">
 								<view
 									class="live-top"
 									:style="'background:' + (item.live_status == 101 ? playBg : item.live_status != 101 && item.live_status != 102 ? endBg : notBg) + ';'"
@@ -46,7 +46,7 @@
 			</block>
 			<block v-if="listStyle == 1">
 				<view class="live-wrapper-a">
-					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx7aac64d4d4419260/pages/live-player-plugin?room_id=' + item.room_id" hover-class="none">
+					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx3333c42c5f068ac6/pages/live-player-plugin?room_id=' + item.room_id" hover-class="none">
 						<view class="img-box">
 							<view class="label bgblue" v-if="item.live_status == 102">
 								<view class="txt">预告</view>
@@ -73,7 +73,7 @@
 							</view>
 							<view v-if="item.broadcast" class="goods-wrapper">
 								<block v-if="item.broadcast.length<=3 && item.broadcast.length > 0">
-									<view class="goods-item" v-for="(goods,index) in item.broadcast" :key="index">					
+									<view class="goods-item" v-for="(goods,index) in item.broadcast" :key="index">
 										<image :src="goods.goods.cover_img" alt="">
 										<text class="line1">￥{{goods.goods.price}}</text>
 									</view>
@@ -85,7 +85,7 @@
 									</view>
 									<view class="goods-item">
 										<image :src="item.broadcast[item.broadcast.length-1].goods.feeds_img" alt="">
-										<view class="num">+{{item.broadcast.length}}</view>	
+										<view class="num">+{{item.broadcast.length}}</view>
 									</view>
 								</block>
 								<block v-if="item.broadcast.length == 0">
@@ -98,7 +98,7 @@
 			</block>
 			<block v-if="listStyle == 2">
 				<view class="live-wrapper-b">
-					<navigator class="live-item-b" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx7aac64d4d4419260/pages/live-player-plugin?room_id=' + item.room_id" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
+					<navigator class="live-item-b" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx3333c42c5f068ac6/pages/live-player-plugin?room_id=' + item.room_id" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
 						<view class="img-box">
 							<view class="label bgblue" v-if="item.live_status == 102">
 								<view class="txt">预告</view>
@@ -153,7 +153,7 @@
 			}
 		},
 		watch: {
-			
+
 		},
 		data() {
 			return {
@@ -187,7 +187,7 @@
 						res.data.list.forEach(val => {
 							val.link =
 								(val.live_status == 103 && val.replay_status) || val.live_status === 101 || val.live_status === 102
-									? 'plugin-private://wx7aac64d4d4419260/pages/live-player-plugin?room_id=' + val.room_id
+									? 'plugin-private://wx3333c42c5f068ac6/pages/live-player-plugin?room_id=' + val.room_id
 									: '';
 						});
 						that.$set(that,'liveList',res.data.list)
@@ -219,8 +219,8 @@
 			justify-content: center;
 			color: #fff;
 			width: 120rpx;
-			height: 32rpx;		
-		}	
+			height: 32rpx;
+		}
 		.broadcast-time {
 			z-index: 20;
 			position: absolute;
@@ -299,10 +299,10 @@
 			border-radius: 16rpx 0px 16rpx 0px;
 			&.playRadius {
 				border-radius: 16rpx 0 0 0;
-			}			
+			}
 			&.notPlayRadius {
 				border-radius: 16rpx 0px 16rpx 0px;
-			}	
+			}
 			image {
 				width: 30rpx;
 				height: 30rpx;
@@ -391,7 +391,7 @@
 					align-items: center;
 					color: #999;
 					font-size: 24rpx;
-					margin-top: 10rpx;	
+					margin-top: 10rpx;
 				}
 				.goods-wrapper{
 					display: flex;
@@ -476,7 +476,7 @@
 					.goods-wrapper{
 						flex: 1;
 					}
-				}	
+				}
 			}
 		}
 	}
@@ -556,7 +556,7 @@
 			width: 38px;
 			height: 100%;
 			text-align: center;
-			background: linear-gradient(270deg, #2FA1F5 0%, #0076FF 100%);	
-		}	
+			background: linear-gradient(270deg, #2FA1F5 0%, #0076FF 100%);
+		}
 	}
 </style>
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index eebc2d0..fc9e7be 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -101,9 +101,9 @@
 										</view>
 										<view class="delivery_type">
 											<text v-if="!goods.allow_delivery">不支持快递</text>
-											<text v-if="!goods.allow_take">不支持到店核销</text> 
+											<text v-if="!goods.allow_take">不支持到店核销</text>
 										</view>
-										
+
 									</view>
 									<view class="err-txt" v-if="goods.undelivered && addressInfo.real_name">
 										<text class="iconfont icon-zhuyi-copy"></text>
@@ -135,14 +135,19 @@
 							</view>
 						</view>
             <view class="boxs" v-if="item.order.total_integral > 0">
-              <view class='item acea-row row-between-wrapper' v-if="item.order.use_mer_integral > 0">
-                <view>本商户积分抵扣</view>
-                <view class='discount'>使用{{item.order.use_mer_integral}}积分抵扣{{item.order.use_mer_integral_price}}</view>
-              </view>
-              <view class='item acea-row row-between-wrapper' v-if="item.order.use_platform_integral > 0">
-                <view>平台积分抵扣</view>
-                <view class='discount'>使用{{item.order.use_platform_integral}}积分抵扣{{item.order.use_platform_integral_price}}</view>
+              <!--<view class='item acea-row row-between-wrapper' v-if="item.order.use_mer_integral > 0">-->
+              <!--  <view>本商户积分抵扣</view>-->
+              <!--  <view class='discount'>使用{{item.order.use_mer_integral}}积分抵扣{{item.order.use_mer_integral_price}}</view>-->
+              <!--</view>-->
+              <!--<view class='item acea-row row-between-wrapper' v-if="item.order.use_platform_integral > 0">-->
+              <!--  <view>平台积分抵扣</view>-->
+              <!--  <view class='discount'>使用{{item.order.use_platform_integral}}积分抵扣{{item.order.use_platform_integral_price}}</view>-->
+              <!--</view>-->
+              <view class='item acea-row row-between-wrapper' v-if="item.order.use_legumes_integral > 0">
+                <view>积分抵扣</view>
+                <view class='discount'>使用{{item.order.use_legumes_integral}}积分抵扣{{item.order.use_legumes_integral_price}}</view>
               </view>
+
             </view>
 						<view class='item acea-row row-between-wrapper' v-if='shippingType==0 && item.isTake == 0 && order_model == 0'>
 							<view>快递费用 <text
@@ -273,7 +278,7 @@
 						<view class='discount'>
 							<input type="text" v-model="post.real_name" placeholder="请填写收货人姓名" placeholder-class='placeholder' />
 						</view>
-					</view>					
+					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view><text class="item-require">*</text>收货人电话</view>
 						<view class='discount'>
@@ -337,7 +342,7 @@
 				<view class='item acea-row row-between-wrapper integral-switch-content' v-if="open_integral && userInfo.integral > 0 && order_type == 0 && is_has_integral_use > 0">
 					<view>积分抵扣：</view>
           <view class="integral-switch-list">
-            <view class="integral-s-l-box" v-if="hold_mer_integral > 0" @click="changeIntegral('mer')">
+<!--            <view class="integral-s-l-box" v-if="hold_mer_integral > 0" @click="changeIntegral('mer')">
               <view v-if="!use_mer_integral">持有相关商户积分<text class="pColor">{{hold_mer_integral}}</text></view>
               <view v-else>
                 使用了<text class="pColor">{{order_use_mer_integral}}</text>个商户积分，共抵扣<text class="pColor">{{order_use_mer_integral_price}}</text>元
@@ -356,6 +361,16 @@
                 <view class="iconfont icon-weixuanzhong" v-if="!use_platform_integral"></view>
                 <view class='iconfont icon-xuanzhong1' v-else></view>
               </view>
+            </view>-->
+            <view class="integral-s-l-box" v-if="hold_legumes_integral > 0" @click="changeIntegral('legumes')">
+              <view v-if="!use_legumes_integral">持有积分<text class="pColor">{{hold_legumes_integral}}</text></view>
+              <view v-else>
+                使用了<text class="pColor">{{order_use_legumes_integral}}</text>个积分，共抵扣<text class="pColor">{{order_use_legumes_integral_price}}</text>元
+              </view>
+              <view class="checkbox integral_checked">
+                <view class="iconfont icon-weixuanzhong" v-if="!use_legumes_integral"></view>
+                <view class='iconfont icon-xuanzhong1' v-else></view>
+              </view>
             </view>
           </view>
 					<!--<view class='money'>
@@ -585,14 +600,18 @@
 				animated: false,
 				totalPrice: 0,
 				// use_integral: false,
-        use_mer_integral: false,// 是否使用商户积分
-        use_platform_integral: false,// 是否使用平台积分
-        order_use_mer_integral: 0,// 使用的商户总积分
-        order_use_mer_integral_price: 0,// 商户积分抵扣的总金额
-        order_use_platform_integral: 0,// 使用的平台总积分
-        order_use_platform_integral_price: 0,// 平台积分抵扣的总金额
-        hold_mer_integral: 0,// 用户持有的当前订单相关商户总商户积分
-        hold_platform_integral: 0,// 用户持有的平台积分总数
+        // use_mer_integral: false,// 是否使用商户积分
+        // use_platform_integral: false,// 是否使用平台积分
+        // order_use_mer_integral: 0,// 使用的商户总积分
+        // order_use_mer_integral_price: 0,// 商户积分抵扣的总金额
+        // order_use_platform_integral: 0,// 使用的平台总积分
+        // order_use_platform_integral_price: 0,// 平台积分抵扣的总金额
+        // hold_mer_integral: 0,// 用户持有的当前订单相关商户总商户积分
+        // hold_platform_integral: 0,// 用户持有的平台积分总数
+        order_use_legumes_integral: 0,// 使用的商户总积分
+        order_use_legumes_integral_price: 0,// 商户积分抵扣的总金额
+        use_legumes_integral: false,// 是否使用豆豆积分
+        hold_legumes_integral: 0,// 用户持有的豆豆积分
         is_has_integral_use: 0,
         pagesUrl: "",
 				orderKey: "",
@@ -743,16 +762,18 @@
 			changeIntegral: function(type) {
         console.log("--------- 变更类型 ---------------",type);
 				// this.use_integral = !this.use_integral;
-        if(type === 'mer') {
-          this.use_mer_integral = !this.use_mer_integral;
-          // 判断：开启商户积分 则不开启平台积分
-          if(this.use_mer_integral) this.use_platform_integral = false;
-        }
-        if(type === 'platform') {
-          this.use_platform_integral = !this.use_platform_integral;
-          // 判断：开启平台积分 则不开启商户积分
-          if(this.use_platform_integral) this.use_mer_integral = false;
-        }
+        // if(type === 'mer') {
+        //   this.use_mer_integral = !this.use_mer_integral;
+        //   // 判断：开启商户积分 则不开启平台积分
+        //   if(this.use_mer_integral) this.use_platform_integral = false;
+        // }
+        // if(type === 'platform') {
+        //   this.use_platform_integral = !this.use_platform_integral;
+        //   // 判断：开启平台积分 则不开启商户积分
+        //   if(this.use_platform_integral) this.use_mer_integral = false;
+        // }
+        if(type === 'legumes') this.use_legumes_integral = !this.use_legumes_integral;
+
 				this.getConfirm(this.addressId);
 			},
 			showPresellAgree(){
@@ -1013,8 +1034,9 @@
 					takes: that.take,
 					use_coupon: that.subCoupon,
 					// use_integral: that.use_integral,
-          use_mer_integral: that.use_mer_integral,
-          use_platform_integral: that.use_platform_integral,
+          // use_mer_integral: that.use_mer_integral,
+          // use_platform_integral: that.use_platform_integral,
+          use_legumes_integral: that.use_legumes_integral
         }).then(res => {
 					// 默认选中
 					that.is_take = false
@@ -1027,7 +1049,7 @@
 								that.subCoupon[el.mer_id].push(coupon.coupon_user_id)
 							}
 						})
-					})	
+					})
 					that.subCoupon['0'] = []
 					if(res.data.platformCoupon.length > 0){
 						res.data.platformCoupon.forEach(el => {
@@ -1053,14 +1075,22 @@
 					that.$set(that, 'integral_price', res.data.order_total_integral_price);
 					that.$set(that, 'open_integral', res.data.openIntegral);
 					// that.$set(that, 'use_integral', res.data.useIntegral);
-          that.$set(that, 'use_mer_integral', res.data.useMerIntegral);
-          that.$set(that, 'use_platform_integral', res.data.usePlatformIntegral);
-          that.$set(that, 'order_use_mer_integral', res.data.order_use_mer_integral);
-          that.$set(that, 'order_use_mer_integral_price', res.data.order_use_mer_integral_price);
-          that.$set(that, 'order_use_platform_integral', res.data.order_use_platform_integral);
-          that.$set(that, 'order_use_platform_integral_price', res.data.order_use_platform_integral_price);
-          that.$set(that, 'hold_mer_integral', res.data.hold_mer_integral);
-          that.$set(that, 'hold_platform_integral', res.data.hold_platform_integral);
+          // 商户积分
+          // that.$set(that, 'use_mer_integral', res.data.useMerIntegral);
+          // that.$set(that, 'order_use_mer_integral_price', res.data.order_use_mer_integral_price);
+          // that.$set(that, 'hold_mer_integral', res.data.hold_mer_integral);
+          // that.$set(that, 'order_use_mer_integral', res.data.order_use_mer_integral);
+          // 平台积分
+          // that.$set(that, 'use_platform_integral', res.data.usePlatformIntegral);
+          // that.$set(that, 'order_use_platform_integral', res.data.order_use_platform_integral);
+          // that.$set(that, 'order_use_platform_integral_price', res.data.order_use_platform_integral_price);
+          // that.$set(that, 'hold_platform_integral', res.data.hold_platform_integral);
+          // 豆豆积分
+          that.$set(that, 'use_legumes_integral', res.data.useLegumesIntegral);
+          that.$set(that, 'order_use_legumes_integral', res.data.order_use_legumes_integral);
+          that.$set(that, 'order_use_legumes_integral_price', res.data.order_use_legumes_integral_price);
+          that.$set(that, 'hold_legumes_integral', res.data.hold_legumes_integral);
+
           that.$set(that, 'is_has_integral_use', res.data.is_has_integral_use);
 					that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length>0) ? that.order_extend : res.data.order_extend);
 					that.totalPrice = res.data.order_price
@@ -1374,7 +1404,7 @@
 							});
 							break;
 							// #endif
-						default: 
+						default:
 							let pages = '/pages/order_pay_status/index?order_id=' +
 								orderId + '&msg=取消支付'
 							return that.$util.Tips({
@@ -1524,8 +1554,9 @@
 					key: this.order_key,
 					takes: this.take,
 					// use_integral: this.use_integral,
-          use_mer_integral: this.use_mer_integral,
-          use_platform_integral: this.use_platform_integral,
+          // use_mer_integral: this.use_mer_integral,
+          // use_platform_integral: this.use_platform_integral,
+          use_legumes_integral: this.use_legumes_integral,
 					receipt_data: this.invoiceData,
 					extend: this.extend,
 					post: this.post,
@@ -1812,7 +1843,7 @@
 	/deep/.order-submission .virtual_form .uni-input-wrapper {
 		text-align: right;
 	}
-	
+
 	.order-submission .virtual_form .item-require{
 		color: red;
 		margin-right: 4rpx;
@@ -2149,7 +2180,7 @@
 								color: var(--view-priceColor);
 								font-size: 20rpx;
 							}
-							
+
 						}
 					}
 					.err-txt {
diff --git a/project.config.json b/project.config.json
index 9a6f590..65956b5 100644
--- a/project.config.json
+++ b/project.config.json
@@ -45,7 +45,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.14.3",
-  "appid": "wx7aac64d4d4419260",
+  "appid": "wx3333c42c5f068ac6",
   "projectname": "crmeb_merchant_h5",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
@@ -55,4 +55,4 @@
     "tabSize": 2
   },
   "condition": {}
-}
\ No newline at end of file
+}