Merge branch 'master' of http://47.98.226.240:3000/twt/txCar

* 'master' of http://47.98.226.240:3000/twt/txCar:
  showName

pages/module/maintain.vue

@@ -55,7 +55,7 @@
 										<image src="../../static/img/noimg.png" mode="" class="goodsImg sm" v-else></image> 
 										<view class="goodsCont">
 											<view class="goodsContTop">
-												<view class="goodsItemName">{{v.goodsName}}</view>
+												<view class="goodsItemName">{{v.showName}}</view>
 												<view class="replace" @click.stop="replace(vf,index,findex,i)" v-if="vf.length>1">更换</view>
 											</view>
 											<view class="goodsCOntBOttom">

pages/module/replaceGoods.vue

@@ -8,7 +8,7 @@
 						<image src="../../static/img/noimg.png" mode="" class="goodsImg" v-else></image>
 					</view>
 					<view class="goodsItemRight">
-						<view class="goodsItemName">{{v.goodsName}}</view>
+						<view class="goodsItemName">{{v.showName}}</view>
 						<view class="goodsItemBottom">
 							<view class="goodssalePrice">
 								<span>￥{{v.salePrice}}</span>