删除关注公众号

common/admin.js

@@ -3,13 +3,16 @@ const utils = require('../common/util.js');
 
 //服务接口访问配置
 var config = {
-	// sysweburl: "http://110.188.24.28:50200", // 测试
 	// sysweburl: "http://110.188.24.28:50300", // 开发
-	sysweburl: "http://171.94.154.2:50105/hl", // 正式
-	// upfileurl: "http://110.188.24.28:50120/file/upload", // 测试
-	upfileurl: "http://171.94.154.2:50105/hlfs/file/upload", // 正式
-	// getfileurl: "http://110.188.24.28:50120", // 测试
-	getfileurl: "http://171.94.154.2:50105/hlfs", // 正式
+	sysweburl: "http://110.188.24.28:50200", // 测试
+	// sysweburl: "http://171.94.154.2:50105/hl", // 正式
+	// sysweburl: "https://new.zg12345.cn/hl", // 正式
+	upfileurl: "http://110.188.24.28:50120/file/upload", // 测试
+	// upfileurl: "http://171.94.154.2:50105/hlfs/file/upload", // 正式
+	// upfileurl: "https://new.zg12345.cn/hlfs/file/upload", // 正式
+	getfileurl: "http://110.188.24.28:50120", // 测试
+	// getfileurl: "http://171.94.154.2:50105/hlfs", // 正式
+	// getfileurl: "https://new.zg12345.cn/hlfs", // 正式
 }
 
 // 服务器返回字段

pages/BaseTabBar/Mine.vue

@@ -39,7 +39,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="moreServiceBox">
+		<view class="moreServiceBox" v-if="openID">
 			<view class="moreServiceTitle">更多服务</view>
 			<view class="moreServiceContent">
 				<view class="serviceContentItem" @tap="onMyRewardTo" v-if="openID">
@@ -58,11 +58,11 @@
 					<view class="serviceContentItemTitle">邀请码</view>
 					<image class="serviceContentItemIcon" src="../../static/img/mine/right.png"></image>
 				</view> -->
-				<view class="serviceContentItem" @tap="onGZHTo">
+				<!-- <view class="serviceContentItem" @tap="onGZHTo">
 					<image class="serviceContentItemImg" src="../../static/img/mine/weixin.png"></image>
 					<view class="serviceContentItemTitle">关注公众号</view>
 					<image class="serviceContentItemIcon" src="../../static/img/mine/right.png"></image>
-				</view>
+				</view> -->
 				<view class="serviceContentItem" @tap="loginOut" v-if="openID">
 					<image class="serviceContentItemImg" src="../../static/img/mine/logout.png"></image>
 					<view class="serviceContentItemTitle">退出登录</view>

pages/CareTabBar/Mine.vue

@@ -39,7 +39,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="moreServiceBox">
+		<view class="moreServiceBox" v-if="openID">
 			<view class="moreServiceTitle">更多服务</view>
 			<view class="moreServiceContent">
 				<view class="serviceContentItem" @tap="onMyRewardTo" v-if="openID">
@@ -58,11 +58,11 @@
 					<view class="serviceContentItemTitle">邀请码</view>
 					<image class="serviceContentItemIcon" src="../../static/img/mine/right.png"></image>
 				</view> -->
-				<view class="serviceContentItem" @tap="onGZHTo">
+				<!-- <view class="serviceContentItem" @tap="onGZHTo">
 					<image class="serviceContentItemImg" src="../../static/img/mine/weixin.png"></image>
 					<view class="serviceContentItemTitle">关注公众号</view>
 					<image class="serviceContentItemIcon" src="../../static/img/mine/right.png"></image>
-				</view>
+				</view> -->
 				<view class="serviceContentItem" @tap="loginOut" v-if="openID">
 					<image class="serviceContentItemImg" src="../../static/img/mine/logout.png"></image>
 					<view class="serviceContentItemTitle">退出登录</view>

pagesBase/GridmanReward/Index.vue

@@ -24,13 +24,14 @@
 						<!-- <view class="tabItem" :class="tabIndex == '2' ? 'active' : ''" @tap="onChangeState('2')">待补领</view> -->
 					</view>
 				</view>
-				<view class="titleTips" v-show="tabIndex != '1'">
+				<!-- <view class="titleTips" v-show="tabIndex != '1'">
 					<image src="../../static/img/mine/starIcon.png" class="tipsIcon"></image>
 					<text class="tipsText">关注微信公众号“</text>
 					<text class="linkText" @tap="onGZHTo">自贡随手拍</text>
 					<text class="tipsText">”</text>
-				</view>
-				<view class="rewardDetailBox" :style="{height: (tabIndex == '1' ? 'calc(100% - 120rpx)' : 'calc(100% - 168rpx)')}">
+				</view> -->
+				<!-- <view class="rewardDetailBox" :style="{height: (tabIndex == '1' ? 'calc(100% - 120rpx)' : 'calc(100% - 168rpx)')}"> -->
+				<view class="rewardDetailBox" style="height: calc(100% - 120rpx)">
 					<view v-if="rewardList.length > 0">
 						<view class="rewardContentBox" v-for="(item, index) in rewardList">
 							<view class="rewardTitleBox" @tap="onChangeContentShow(item.creationTimeText)">

pagesBase/MyReward/Index.vue

@@ -24,13 +24,14 @@
 						<view class="tabItem" :class="tabIndex == '2' ? 'active' : ''" @tap="onChangeState('2')">待补领</view>
 					</view>
 				</view>
-				<view class="titleTips" v-show="tabIndex != '1'">
+				<!-- <view class="titleTips" v-show="tabIndex != '1'">
 					<image src="../../static/img/mine/starIcon.png" class="tipsIcon"></image>
 					<text class="tipsText">关注微信公众号“</text>
 					<text class="linkText" @tap="onGZHTo">自贡随手拍</text>
 					<text class="tipsText">”</text>
-				</view>
-				<view class="rewardDetailBox" :style="{height: (tabIndex == '1' ? 'calc(100% - 120rpx)' : 'calc(100% - 168rpx)')}">
+				</view> -->
+				<!-- <view class="rewardDetailBox" :style="{height: (tabIndex == '1' ? 'calc(100% - 120rpx)' : 'calc(100% - 168rpx)')}"> -->
+				<view class="rewardDetailBox" style="height: calc(100% - 120rpx)">
 					<view v-if="rewardList.length > 0">
 						<view class="rewardContentBox" v-for="(item, index) in rewardList">
 							<view class="rewardTitleBox" @tap="onChangeContentShow(item.Date)">

pagesBase/MyReward/Index_Temp.vue

@@ -23,13 +23,14 @@
 						<view class="tabItem" :class="tabIndex == '0' ? 'active' : ''" @tap="onChangeState('0')">待领取</view>
 					</view>
 				</view>
-				<view class="titleTips" v-show="tabIndex != '1'">
+				<!-- <view class="titleTips" v-show="tabIndex != '1'">
 					<image src="../../static/img/mine/starIcon.png" class="tipsIcon"></image>
 					<text class="tipsText">关注微信公众号“</text>
 					<text class="linkText" @tap="onGZHTo">自贡随手拍</text>
 					<text class="tipsText">”</text>
-				</view>
-				<view class="rewardDetailBox" :style="{height: (tabIndex == '1' ? 'calc(100% - 120rpx)' : 'calc(100% - 168rpx)')}">
+				</view> -->
+				<!-- <view class="rewardDetailBox" :style="{height: (tabIndex == '1' ? 'calc(100% - 120rpx)' : 'calc(100% - 168rpx)')}"> -->
+				<view class="rewardDetailBox" style="height: calc(100% - 120rpx)">
 					<view v-if="rewardList.length > 0">
 						<view class="rewardContentBox" v-for="(item, index) in rewardList">
 							<view class="rewardTitleBox" @tap="onChangeContentShow(item.creationTimeText)">
@@ -93,11 +94,15 @@
 			that.navBarHeight = that.$systemInfo.navBarHeight;
 			that.onGetData(function() {
 				that.onGetListData(function() {
-					that.onGetDetailListData(that.rewardList[0].creationTimeText, function(data){
-						that.rewardList[0].list = data;
-						that.$set(that.rewardList, 0, that.rewardList[0]);
+					if(that.rewardList.length > 0){
+						that.onGetDetailListData(that.rewardList[0].creationTimeText, function(data){
+							that.rewardList[0].list = data;
+							that.$set(that.rewardList, 0, that.rewardList[0]);
+							that.isShow = true;
+						})
+					}else {
 						that.isShow = true;
-					})
+					}
 				});
 			});
 		},
@@ -156,10 +161,12 @@
 				if (that.tabIndex != tabIndex) {
 					that.tabIndex = tabIndex;
 					that.onGetListData(function(){
-						that.onGetDetailListData(that.rewardList[0].creationTimeText, function(data){
-							that.rewardList[0].list = data;
-							that.$set(that.rewardList, 0, that.rewardList[0]);
-						})
+						if(that.rewardList.length > 0){
+							that.onGetDetailListData(that.rewardList[0].creationTimeText, function(data){
+								that.rewardList[0].list = data;
+								that.$set(that.rewardList, 0, that.rewardList[0]);
+							})
+						}
 					});
 				}
 			},

pagesCare/GridmanReward/Index.vue

@@ -24,13 +24,14 @@
 						<!-- <view class="tabItem" :class="tabIndex == '2' ? 'active' : ''" @tap="onChangeState('2')">待补领</view> -->
 					</view>
 				</view>
-				<view class="titleTips" v-show="tabIndex != '1'">
+				<!-- <view class="titleTips" v-show="tabIndex != '1'">
 					<image src="../../static/img/mine/starIcon.png" class="tipsIcon"></image>
 					<text class="tipsText">关注微信公众号“</text>
 					<text class="linkText" @tap="onGZHTo">自贡随手拍</text>
 					<text class="tipsText">”</text>
-				</view>
-				<view class="rewardDetailBox" :style="{height: (tabIndex == '1' ? 'calc(100% - 120rpx)' : 'calc(100% - 168rpx)')}">
+				</view> -->
+				<!-- <view class="rewardDetailBox" :style="{height: (tabIndex == '1' ? 'calc(100% - 120rpx)' : 'calc(100% - 168rpx)')}"> -->
+				<view class="rewardDetailBox" style="height: calc(100% - 120rpx)">
 					<view v-if="rewardList.length > 0">
 						<view class="rewardContentBox" v-for="(item, index) in rewardList">
 							<view class="rewardTitleBox" @tap="onChangeContentShow(item.creationTimeText)">

pagesCare/MyReward/Index_Temp.vue

@@ -23,13 +23,14 @@
 						<view class="tabItem" :class="tabIndex == '0' ? 'active' : ''" @tap="onChangeState('0')">待领取</view>
 					</view>
 				</view>
-				<view class="titleTips" v-show="tabIndex != '1'">
+				<!-- <view class="titleTips" v-show="tabIndex != '1'">
 					<image src="../../static/img/mine/starIcon.png" class="tipsIcon"></image>
 					<text class="tipsText">关注微信公众号“</text>
 					<text class="linkText" @tap="onGZHTo">自贡随手拍</text>
 					<text class="tipsText">”</text>
-				</view>
-				<view class="rewardDetailBox" :style="{height: (tabIndex == '1' ? 'calc(100% - 120rpx)' : 'calc(100% - 168rpx)')}">
+				</view> -->
+				<!-- <view class="rewardDetailBox" :style="{height: (tabIndex == '1' ? 'calc(100% - 120rpx)' : 'calc(100% - 168rpx)')}"> -->
+				<view class="rewardDetailBox" style="height: calc(100% - 120rpx)">
 					<view v-if="rewardList.length > 0">
 						<view class="rewardContentBox" v-for="(item, index) in rewardList">
 							<view class="rewardTitleBox" @tap="onChangeContentShow(item.creationTimeText)">
@@ -93,11 +94,15 @@
 			that.navBarHeight = that.$systemInfo.navBarHeight;
 			that.onGetData(function() {
 				that.onGetListData(function() {
-					that.onGetDetailListData(that.rewardList[0].creationTimeText, function(data){
-						that.rewardList[0].list = data;
-						that.$set(that.rewardList, 0, that.rewardList[0]);
+					if(that.rewardList.length > 0){
+						that.onGetDetailListData(that.rewardList[0].creationTimeText, function(data){
+							that.rewardList[0].list = data;
+							that.$set(that.rewardList, 0, that.rewardList[0]);
+							that.isShow = true;
+						})
+					}else {
 						that.isShow = true;
-					})
+					}
 				});
 			});
 		},
@@ -156,10 +161,12 @@
 				if (that.tabIndex != tabIndex) {
 					that.tabIndex = tabIndex;
 					that.onGetListData(function(){
-						that.onGetDetailListData(that.rewardList[0].creationTimeText, function(data){
-							that.rewardList[0].list = data;
-							that.$set(that.rewardList, 0, that.rewardList[0]);
-						})
+						if(that.rewardList.length > 0){
+							that.onGetDetailListData(that.rewardList[0].creationTimeText, function(data){
+								that.rewardList[0].list = data;
+								that.$set(that.rewardList, 0, that.rewardList[0]);
+							})
+						}
 					});
 				}
 			},