Merge branch 'master' of http://192.168.10.18:3000/sooka_shop/sooka_consult_uniapp

pages/highServer/knowledge/knowledge.vue

@@ -108,7 +108,9 @@
 					if (res.code == 200) {
 						getDetails(item.id).then(res => {
 							let data = res.data
-							data.urls = data.imgUrlList.split(',')
+              if(data.imgUrlList!=null){
+                data.urls = data.imgUrlList.split(',')
+              }
 							uni.navigateTo({
 								url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
 							});

pages/index/index.vue

@@ -432,9 +432,16 @@
 				});
 			},
 			goShangCheng() {
-				uni.navigateTo({
-					url: '/pages/demo/shangcheng/shangcheng'
-				});
+        wx.navigateToMiniProgram({
+          appId: 'wx0904bdfd9c082418',
+          path: 'pages/tabbar/home/index',
+          //develop开发版；trial体验版；release正式版
+          envVersion: 'develop',
+          success(res) {
+            // 打开成功
+            console.log("跳转小程序成功！",res);
+          }
+        })
 			},
 
 			goDetails(id) {
@@ -557,7 +564,7 @@
 							});
 						})
 					} else {
-						
+
 						uni.showToast({
 							title: res.msg
 						})

pages/me/myPayKnow/myPayKnow.vue

@@ -47,6 +47,10 @@
 		myPayKnow
 	} from '@/api/me/me.js'
 
+  import {
+    getDetails
+  } from '@/api/knowledge/knowledge.js';
+
 	export default {
 		data() {
 			return {
@@ -109,9 +113,13 @@
 
 			goDetails(item) {
 				if (item == null) return;
-				uni.navigateTo({
-          url: '/pages/highServer/knowledgeDetails/knowledgeDetails?id=' + item.id,
-				});
+        getDetails(item.id).then(res => {
+          let data = res.data
+          data.urls = data.imgUrlList.split(',')
+          uni.navigateTo({
+            url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
+          });
+        })
 			}
 		}
 	};