Merge branch 'master' of http://139.159.177.244:3000/yuanye/high-mini

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/Authorize.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/mehaotian-search-revision/mehaotian-search-revision.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/mpvue-citypicker/mpvueCityPicker.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-badge/components/uni-badge/uni-badge.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/HM-search/HM-search.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/coupon-details/coupon-details.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods-list/goods-list.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/ratings/ratings.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/recording/recording.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/store-list/store-details.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/store-list/store-list.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/register.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/resetpasswd.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/msg/msg.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/confirmation.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/pay/payment/payment.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/pay/success/success.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabBar/cart/cart.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabBar/category/category.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabBar/home/home.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabBar/user/user.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/Business/Business.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/address/address.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/address/edit/edit.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/coupon/coupon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/deposit/deposit.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/keep/keep.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/mineCoupons/mineCoupons.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/myQR/myQR.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/order_details/order_details.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/order_list/order_list.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/setting/setting.js.map

App.vue

@@ -12,7 +12,7 @@
 			code: '',
 			token: '',
 			brestToken:'',
-			cityId: '500100'
+			cityId: ''
 		},
 		onLaunch: function() {
 		},

pages/tabBar/user/user.vue

@@ -47,7 +47,7 @@
 						<uni-badge  text="1" type="error" />
 					</view> -->
 					
-					<uni-badge style="width: 20px;" :text="textnum" type="error" size="normal"></uni-badge>
+					<uni-badge style="width: 20px;" v-if="row.text == '我的卡券' " :text="textnum" type="error" size="normal"></uni-badge>
 					<view class="img">
 						<image :src="row.img"></image>
 					</view>

unpackage/dist/dev/mp-weixin/common/main.js

@@ -102,7 +102,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
     code: '',
     token: '',
     brestToken: '',
-    cityId: '500100' },
+    cityId: '' },
 
   onLaunch: function onLaunch() {
   },