Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/components/app-swiper.vue

@@ -4,7 +4,7 @@
 		<swiper :indicator-dots="tagShow" :autoplay="autoplay" :interval="5000" :duration="150" class="tui-banner-swiper" :circular="true" indicator-color="#969696" indicator-active-color="#3387ff" @change="bannerChange">
 			<swiper-item v-for="(item, index) in list" :key="index" @tap.stop="detail">
 				<img :src="item.img" class="tui-slide-image" mode="scaleToFill" />
-        <view class="info">2312</view>
+        		<view class="info">{{item.name || ''}}</view>
 			</swiper-item>
 		</swiper>
 		<!-- <app-tag v-if="tagShow" class="swiper-tag" type="translucent" shape="circleLeft" size="small">{{index + 1}}/{{list.length}}</app-tag> -->

ghsApp/src/pagesClient/official/index.vue

@@ -4,7 +4,6 @@
       <image :src="`${constant.imgUrl}/ghs/home_page/logo.png`" mode="widthFix"></image>
 
 					<view class="header_logo-more">
-						<!-- <view class="experience" v-if="getLoginInfo.showDemo==1" @tap="experienceFun">体验</view> -->
 						<view @click="register()" class="free_register" v-if="getLoginInfo.openShop == 1">免费注册</view>
 						<view v-if="getLoginInfo.openShop != 1" class="free_register">已申请</view>
 					</view>
@@ -99,16 +98,20 @@ export default {
       ],
       swiper: [
         {
-          img: `${this.$constant.imgUrl}/ghs/home_page/img.png`
+          img: `${this.$constant.imgUrl}/ghs/case/5.jpg`,
+          name:'纯彩花艺'
         },
         {
-          img: `${this.$constant.imgUrl}/retail/official/banner-2.png`
+          img: `${this.$constant.imgUrl}/ghs/case/6.jpg`,
+          name:'旺鹭花行'
         },
         {
-          img: `${this.$constant.imgUrl}/retail/official/banner-3.png`
+          img: `${this.$constant.imgUrl}/ghs/case/7.jpg`,
+          name:'莱漫花行'
         },
         {
-          img: `${this.$constant.imgUrl}/retail/official/banner-4.png`
+          img: `${this.$constant.imgUrl}/ghs/case/8.jpg`,
+          name:'好多花'
         }
       ],
     }