Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

src/App.vue

@@ -4,6 +4,9 @@ import { sgyOrderGetStatus } from './api/order';
 import testJson from './static/json/test.json';
 import { getToken } from './utils/auth';
 import { setOrderDic } from './utils/orderDic';
+// beforeMount(() => {
+//   if (!getToken()) signIn();
+// });
 onLaunch(() => {
   if (!getToken()) signIn();
   sgyOrderGetStatus().then((res) => {
@@ -22,12 +25,18 @@ onHide(() => {
 });
 // 登录
 const signIn = () => {
-  getTokenUser(testJson).then((res) => {
-    const token = res.data.access_token;
-    const userInfo = res.data.user_info;
-    xma.setStorageSync('Authorization', token);
-    xma.setStorageSync('userInfo', userInfo);
-    console.log('登录...');
+  xma.xh.getUserProfile({
+    range: ['ACCOUNT', 'MOBILE', 'CITIZEN'],
+    async success(info) {
+      const info2 = JSON.stringify(info);
+      getTokenUser(info2).then((res) => {
+        const token = res.data.access_token;
+        const userInfo = res.data.user_info;
+        xma.setStorageSync('Authorization', token);
+        xma.setStorageSync('userInfo', userInfo);
+        console.log('登录...');
+      });
+    },
   });
 };
 </script>

src/pages.json

@@ -9,7 +9,8 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "小程序平台"
+				"navigationBarTitleText": "小程序平台",
+				"navigationStyle":"custom"
 			}
 		},
 		{

src/pages/index/index.vue

@@ -322,6 +322,12 @@ const reset = () => {
   cardData2.value = [];
   show.value = false;
 };
+
+const toUse = () => {
+  xma.navigateTo({
+    url: '/pages/index/listFood?type=1',
+  });
+};
 // 商家列表分页-搜索列表
 const getMerchantList = () => {
   xma.showLoading({