1

components/lyg-popup/lyg-popup.vue

@@ -60,6 +60,7 @@
 					if (res.data) {
 						that.showPopup = false;
 						uni.showTabBar({});
+						this.$emit('popupState', true);
 					}
 				},
 				fail: function(e) {

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.0.6",
-    "versionCode" : 106,
+    "versionName" : "1.0.7",
+    "versionCode" : 107,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages.json

@@ -23,12 +23,6 @@
 					"selectedIconPath":"static/img/jiaoyi_check.png",
 					"text": "交易"
 				},
-				{
-					"pagePath": "pages/home/home",
-					"iconPath":"static/img/liangxin.png",
-					"selectedIconPath":"static/img/liangxin.png",
-					"text": "粮信"
-				},
 				{
 					"pagePath": "pages/tran/tran",
 					"iconPath":"static/img/wuliu.png",

pages/sale/index.vue

@@ -16,15 +16,15 @@
             }
         },
         onLoad() {
-
+			
         },
         methods: {
             popupState(state) {
-                console.log(state);
+                console.log("popupState",state);
 				if(state){
-					uni.navigateTo({
-						url: '/pages/public/login'
-					})
+					uni.switchTab({
+						url: '/pages/sale/information'
+					});
 				}
 				else{
 					

pages/sale/information.vue

@@ -132,11 +132,15 @@
 			</view>
 			
 		</view>
+		<lyg-popup @popupState="popupState" title="服务协议" protocolPath='/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html'
+		     policyPath='/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html' policyStorageKey="has_read_privacy"></lyg-popup>
+		
 	</view>
 </template>
 
 <script>
 	import { formatDate } from '@/common/date.js';
+	import lyg_popup from '@/components/lyg-popup/lyg-popup.vue';
     import dragButton from "@/components/drag-button/drag-button.vue";
 	import swiperUp from "@/components/swiperup.vue";
 	import {
@@ -145,7 +149,8 @@
 	export default {
 		components: {
 		    dragButton,
-			swiperUp
+			swiperUp,
+			lyg_popup
 		},
 		name: "sale",
 		data() {
@@ -214,6 +219,9 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
+			popupState(state) {
+			    console.log("popupState",state);
+			},
 			DotStyle(e) {
 				this.dotStyle = e.detail.value
 			},

pages/user/user.vue

@@ -65,19 +65,18 @@
 						 class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 						</view>
 		</view>
-		<neil-modal
+		<!-- <neil-modal
 			:show="inputShow" 
 			@close="cancel" 
 			:style="{display:inputStatus}"
 			title="点击按钮开启客服对话" 
 			showCancel="true"
 			>
-			<!-- <input v-model="inputContent" style="margin:20upx;"  placeholder="请输入昵称" /> -->
 			<button open-type='contact' class="margin:20upx;bg-green">
 				<text class="cuIcon-phone">联系我们</text>
 			</button>
 			
-		</neil-modal>
+		</neil-modal> -->
     </view>  
 	
 </template>  
@@ -163,7 +162,7 @@
 							icon:'cuIcon-phone',
 							tips: 0,
 							url:'/pages/user/contact',
-							show:true
+							show:false
 						},
 						{
 							num:7,

store/index.js

@@ -28,7 +28,7 @@ const saveLifeData = function(key, value) {
 			    }
 			});
 			uni.showTabBarRedDot({
-				index: 4
+				index: 3
 			});
 		}
 		if(key == 'taskTip' && tmp[key] < value){
@@ -38,7 +38,7 @@ const saveLifeData = function(key, value) {
 			    }
 			});
 			uni.showTabBarRedDot({
-				index: 4
+				index: 3
 			});
 		}
 		tmp[key] = value;