merge

apis/index.js

@@ -9,8 +9,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-    // apiUrl	: 'https://api.gongli.vip/api/', // 正式环境
+    apiUrl	: 'https://api.gongli.vip/api/', // 正式环境
-    apiUrl: 'http://api.gl.shangkelian.cn/api/', //  测试
+    // apiUrl: 'http://api.gl.shangkelian.cn/api/', //  测试
     timeout: 60000
 }
 

manifest.json

@@ -2,7 +2,7 @@
     "name" : "共力生态",
     "appid" : "__UNI__DE7B0E6",
     "description" : "共力生态",
-    "versionName" : "1.0.48",
+    "versionName" : "1.0.51",
     "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */

pages.json

@@ -203,7 +203,6 @@
                 "navigationBarBackgroundColor": "#FFFFFF"
             }
         },
-
         {
             "path": "pages/refund/detail",
             "name": "OrderRefundDetail",
@@ -653,53 +652,44 @@
                 "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
-
+		}
-        }
+	],
-    ],
+	"tabBar": {
-    "tabBar": {
+		"borderStyle": "white",
-        "borderStyle": "white",
+		"selectedColor": "#34CE98",
-        "selectedColor": "#34CE98",
+		"list": [{
-        "list": [{
+				"iconPath": "static/tabBar/tabBar_00.png",
-                "iconPath": "static/tabBar/tabBar_00.png",
+				"selectedIconPath": "static/tabBar/tabBar_show_00.png",
-                "selectedIconPath": "static/tabBar/tabBar_show_00.png",
+				"pagePath": "pages/life/life",
-                "pagePath": "pages/life/life",
+				"text": "共力人生"
-                "text": "共力人生"
+			}, {
-            }, {
+				"iconPath": "static/tabBar/tabBar_02.png",
-                "iconPath": "static/tabBar/tabBar_02.png",
+				"selectedIconPath": "static/tabBar/tabBar_show_02.png",
-                "selectedIconPath": "static/tabBar/tabBar_show_02.png",
+				"pagePath": "pages/store/index",
-                "pagePath": "pages/store/index",
+				"text": "DT商城"
-                "text": "DT商城"
+			},
-            },
+			{
-            {
+				"iconPath": "static/tabBar/tabBar_05.png",
-                "iconPath": "static/tabBar/tabBar_05.png",
+				"selectedIconPath": "static/tabBar/tabBar_show_05.png",
-                "selectedIconPath": "static/tabBar/tabBar_show_05.png",
+				"pagePath": "pages/rank/index",
-                "pagePath": "pages/rank/index",
+				"text": "排行榜"
-                "text": "排行榜"
+			},
-            },
+			{
-            {
+				"iconPath": "static/tabBar/tabBar_03.png",
-                "iconPath": "static/tabBar/tabBar_03.png",
+				"selectedIconPath": "static/tabBar/tabBar_show_03.png",
-                "selectedIconPath": "static/tabBar/tabBar_show_03.png",
+				"pagePath": "pages/user/index",
-                "pagePath": "pages/user/index",
+				"text": "我的"
-                "text": "我的"
+			}
-            }
+		]
-        ]
+	},
-    },
+	"globalStyle": {
-    "globalStyle": {
+		"navigationBarTextStyle": "black",
-        "navigationBarTextStyle": "black",
+		"navigationBarTitleText": "ZH健康",
-        "navigationBarTitleText": "ZH健康",
+		"navigationBarBackgroundColor": "#F3F6FB",
-        "navigationBarBackgroundColor": "#F3F6FB",
+		"backgroundColorTop": "#F3F6FB",
-        "backgroundColorTop": "#F3F6FB",
+		"backgroundColorBottom": "#F3F6FB"
-        "backgroundColorBottom": "#F3F6FB"
+	},
-    },
+	"easycom": {
-    "easycom": {
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-        "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+	}
-    },
-    "condition": {
-        "current": 0,
-        "list": [{
-            "name": "",
-            "path": "",
-            "query": ""
-        }]
-    }
 }

pages/user/index.vue

@@ -113,10 +113,10 @@
             </block>
         </view>
         <view class="btns-box">
-            <view class="btns-box-item" @click="onBtn('PinList', {})" v-if="collage_switch">
+            <!-- <view class="btns-box-item" @click="onBtn('PinList', {})" v-if="collage_switch">
                 <image class="icon" src="@/static/user/userIcon_15.png" mode="widthFix" />
                 我的拼单 <uni-icons class="forward" type="forward" color="#999" />
-            </view>
+            </view> -->
             <view class="btns-box-item" @click="onBtn('MyCard', {})">
                 <image class="icon" src="@/static/user/userIcon_00.png" mode="widthFix" />
                 我的卡券 <uni-icons class="forward" type="forward" color="#999" />