Merge branch 'wpf' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

App.vue

@@ -10,7 +10,7 @@
 	// +----------------------------------------------------------------------
 	// #ifdef APP-PLUS
 	let jpushModule = uni.requireNativePlugin("JG-JPush");
-    const mp = uni.requireNativePlugin('uniMP');
+  const mp = uni.requireNativePlugin('uniMP');
 	// #endif  
 	import {
 		checkLogin
@@ -77,6 +77,7 @@
 			this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 			this.globalData.uid = this.$store.state.app.uid;
       
+      // #ifdef APP-PLUS
       //监听uni小程序发送的事件
       mp.onUniMPEventReceive(ret=>{
       	console.log('小程序事件: ', ret);
@@ -86,6 +87,7 @@
           });
         }
       });
+      // #endif
       
 			let that = this;
 			// #ifdef MP

pages/gather/gather.vue

@@ -31,7 +31,7 @@
       :show="jurisdiction"
       mode="permission"
       :text="emptyText"
-      icon="http://cdn.uviewui.com/uview/empty/permission.png"
+      icon="/static/empty/permission.png"
     ></u-empty>
     <view class="business com special_work" v-if="jurisdiction == false">
       <view class="title project">
@@ -101,9 +101,9 @@
       </view>
     </view>
 
-    <view class="" v-if="jurisdiction == false && isShow == false">
+    <!-- <view class="" v-if="jurisdiction == false && isShow == false">
       <emptyPage title="暂无信息"></emptyPage>
-    </view>
+    </view> -->
   </view>
 </template>
 
@@ -139,7 +139,9 @@ import {
 import {
   getDiy
 } from '@/api/api.js';
+// #ifdef APP-PLUS
 import uniMP from '@/utils/uniMP.js';
+// #endif
 
 export default {
   components: {
@@ -335,7 +337,7 @@ export default {
       uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
     },
     getUniMp (appid) {
-      console.log('点击供销平台');
+      console.log('点击小程序');
       // #ifdef APP-PLUS
       uniMP.loadMP(appid);
       return;

pages/moreProject/moreProject.vue

@@ -281,7 +281,7 @@
         </view>
       </template>
     </m-tabbar> -->
-		<view class="" v-if='jurisdiction==false&&isShow==false'>
+		<view class="" style="padding-top: 1px;" v-if='jurisdiction==false&&isShow==false'>
 			<emptyPage title="暂无信息"></emptyPage>
 		</view>