Merge remote-tracking branch 'origin/master'

pages/demo/wenba/wenba.vue

@@ -69,16 +69,11 @@
 
             <em class="iconfont icon-xiangyoujiantou"></em>
         </view>
-		<upload :imgArr="imageList" :fileSize="1" :limit="3" @updateImg="updateImg"></upload>
     </view>
 </template>
 
 <script>
-import upload from '../../../components/upload/index.vue'
 export default {
-	components: {
-		upload
-	},
     data() {
         return {
 			imageList:[

pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view>
 		<!-- index.wxml -->
 		<view class="topBj">
-			<image :src="loadImgSrc(bigImg)"></image>
+			<image :src="loadImgSrcLocalhost(bigImg)"></image>
 		</view>
 		<view class="container">
 			<!-- 主导航 -->
@@ -86,7 +86,7 @@
 				:circular="circular" class="banner">
 				<block v-for="(item, index) in banners" :key="index">
 					<swiper-item>
-						<image :src="loadImgSrc(item)" mode="aspectFill"></image>
+						<image :src="loadImgSrcLocalhost(item)" mode="aspectFill"></image>
 					</swiper-item>
 				</block>
 			</swiper>
@@ -381,7 +381,7 @@
 			// 跳转至更多高频服务页面
 			toMore(){
 				uni.navigateTo({
-					url:"../service/service"
+					url:"/pages/highServer/service/service"
 				})
 			},
 			goZcDetail(e) {
@@ -446,7 +446,7 @@
 			},
 			goWenBa() {
 				uni.navigateTo({
-					url: '/pages/asking/asking'
+					url: '/pages/demo/wenba/wenba'
 				});
 			},
 			goHangQing() {
@@ -456,13 +456,13 @@
 			},
 			goShangCheng() {
 				uni.navigateTo({
-					url: '/pages/shangcheng/shangcheng'
+					url: '/pages/demo/shangcheng/shangcheng'
 				});
 			},
 
 			goDetails() {
 				uni.navigateTo({
-					url: '/pages/wenbaxiangqing/wenbaxiangqing'
+					url: '/pages/demo/wenbaxiangqing/wenbaxiangqing'
 				});
 			},
 

pages/quotations/quotations.vue

@@ -5,7 +5,7 @@
         <uni-grid :column="5" @change="change" :showBorder="false" :square="true">
           <uni-grid-item v-for="item in categories" :index="item.id">
             <view class="grid-item-box">
-              <image class="image" :src="loadImgSrc(item.icon)" mode="aspectFit"></image>
+              <image class="image" :src="loadImgSrcLocalhost(item.icon)" mode="aspectFit"></image>
               <text class="text">{{ item.productName }}</text>
             </view>
           </uni-grid-item>