修改字段

src/app.json

@@ -121,7 +121,8 @@
       "pages": [
         "pages/scratch/scratch",
         "pages/scratchRule/scratchRule",
-        "pages/sign/sign"
+        "pages/sign/sign",
+        "pages/liveSubscrib/liveSubscrib"
       ]
     }
   ],

src/pages/confirmOrder/confirmOrder.js

@@ -55,7 +55,7 @@ wxService.page({
     couponDiscountPreviews: [],
     coouponDiscount : 0,
     //积分抵扣
-    pointDeductOpen : true,//是否开启积分抵扣
+    pointDeductOpen : false,//是否开启积分抵扣
     deductCheckStatus : false,//是否勾选使用积分抵扣
     pointDeductRuleShow : false,//是否显示积分抵扣规则
     pointDeductRuleUrl : '',//积分规则说明

src/pages/productDetail/productDetail.js

@@ -215,10 +215,9 @@ wxService.page({
       title: '领取中..',
     });
 
-    wxService.post(`/coupon/coupon/drawBatch`,{
+    wxService.post(`/marketing/couponActivitySet/getCoupon`,{
       couponSettingId : item.id,
       memberId : memberId,
-      storeId : '',
     }).then(res => {
       wx.hideLoading();
       if(res.data.result == 0){

src/pages/userCenter/userCenter.wxml

@@ -67,9 +67,9 @@
   plugid='{{contactUsPluginId}}'  />
 </view>
 <!-- 加入群聊 -->
-<view class="chat-group" wx:if="{{!isQiye && contactUsIsOpen}}" >
+<!-- <view class="chat-group" wx:if="{{!isQiye && contactUsIsOpen}}" >
   <chat-cell bind:startmessage='chatStartMessage' bind:completemessage="chatCompletemessage" plugid='89412d66cf1d2fd26a9d175ba2902a18'/>
-</view>
+</view> -->
 <!-- 联系我点击成功之后的回调 -->
 <contact-us-modal contactShow="{{contactUsModal}}"/>
 

src/project.config.json

@@ -720,6 +720,13 @@
 					"pathName": "subPackageMarketing/page/pages/sign/sign",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "直播订阅",
+					"pathName": "subPackageMarketing/page/pages/liveSubscrib/liveSubscrib",
+					"query": "room_id=8",
+					"scene": null
 				}
 			]
 		}

src/subPackageMarketing/page/pages/liveSubscrib/liveSubscrib.js

+// subPackageMarketing/page/pages/liveSubscrib/liveSubscrib.js
+const wxService = require('../../../../utils/wxService')
+const utils = require('../../../../utils/util')
+import { Integer } from '../../../../utils/integerDigitalConvertion'
+const app = getApp();
+let livePlayer = requirePlugin('live-player-plugin')
+
+wxService.page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    room_id : '',
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    
+    console.log(options)
+    this.data.room_id = options.room_id;
+    this.setData({
+      room_id : this.data.room_id
+    });
+
+    livePlayer.getLiveStatus({room_id : this.data.room_id}).then(res => {
+      console.log(res)
+    })
+
+
+    setTimeout(() => {
+      wx.createSelectorQuery().select('.live-player-subscribe__btn').boundingClientRect().exec((res) =>{
+        console.log(res)
+      });
+      
+    },1000);
+  },
+
+  //点击事件
+  onTapDoSubscrib(e){
+    console.log(e)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

src/subPackageMarketing/page/pages/liveSubscrib/liveSubscrib.json

+{
+  "disableScroll": true,
+  "navigationBarTitleText": "直播订阅",
+  "usingComponents": {
+    "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
+  }
+}
\ No newline at end of file

src/subPackageMarketing/page/pages/liveSubscrib/liveSubscrib.wxml

+<!--subPackageMarketing/page/pages/liveSubscrib/liveSubscrib.wxml-->
+<view catchtap="onTapDoSubscrib" id="parent" class="parent">
+  <subscribe room-id="{{room_id}}"  id="child"></subscribe>
+</view>
+

src/subPackageMarketing/page/pages/liveSubscrib/liveSubscrib.wxss

+/* subPackageMarketing/page/pages/liveSubscrib/liveSubscrib.wxss */
\ No newline at end of file

src/subPackageMarketing/page/pages/scratchRule/app.wxss

-/**app.wxss**/
-.container {
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: space-between;
-	padding: 200rpx 0;
-	box-sizing: border-box;
-}
-.wpl {
-  white-space:pre-line;
-}
-/* 主题色 */
-
-.theme-color {
-	background-color: #cb3c3c;
-}
-
-.theme-text-color {
-	color: #cb3c3c;
-}
-
-.empty{
-  width: 100%;
-  height: 200rpx;
-  display: flex;
-  color: #999999;
-  justify-content: center;
-  align-items: center;
-  font-size: 24rpx;
-}
-
-.no-more-data{
-  width: 100%;
-  height: auto;
-  padding: 20rpx 0;
-  display: flex;
-  color: #999999;
-  justify-content: center;
-  align-items: center;
-  font-size: 24rpx;
-}
-
-/* 按钮样式 */
-.btn {
-	width: 100%;
-	margin-left: 0;
-	margin-right: 0;
-	padding-left: 0;
-	padding-right: 0;
-	border-radius: 0;
-}
-.btn:active {
-	opacity: 0.5;
-}
-.btn-default {
-	background: none;
-	color: #808080;
-	border: 1px solid #808080;
-}
-
-.btn-primary {
-	background-color: #cb3c3c;
-	color: #ffffff;
-	border: 1px solid #cb3c3c;
-	font-size: 25rpx;
-}
-.btn-gray {
-	background-color: #959595;
-	color: #ffffff;
-	border: 1px solid #959595;
-	font-size: 25rpx;
-}
-.btn-outline {
-	background: none;
-	color: #cb3c3c;
-}
-
-.clear-btn{
-  appearance: none;
-  border: none;
-  background: transparent;
-  margin: 0;
-}
-
-.positionRe{
-  position: relative;
-}
-
-.positionAbs{
-  position: absolute;
-  z-index: 2;
-  width: 100%;
-  height: 100%;
-  left: 0;
-  top: 0;
-}
-
-/* 按钮大小 */
-.btn-xs {
-	height: 39rpx;
-	line-height: 39rpx;
-}
-.btn-sm {
-	height: 46rpx;
-	line-height: 46rpx;
-}
-.btn-lg {
-	height: 88rpx;
-	line-height: 88rpx;
-}
-.fixed-bottom0 {
-	position: fixed;
-	bottom: 0;
-	width: 100%;
-	z-index: 9999;
-}
-
-.pr {
-	float: right;
-}
-
-.df {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-/*文字居中*/
-.tc {
-	text-align: center;
-}
-.df-1 {
-	flex: 1;
-}