Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -65,7 +65,7 @@
 															<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
 														</template> -->
 														<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
-														<text v-if="items.productRefundRuleVo.refundType == 1">条件退</text>
+														<text v-if="items.productRefundRuleVo.refundType == 1">有条件退</text>
 														<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
 													</text>
 													<text class="product-rule"> 无需取票 </text>

pages/my/customerService/enterpriseWechat/enterpriseWechat.vue

-<!-- 客服 -->
+<!-- 景区电话列表 -->
 <template>
 	<view class="wrap">
 		<view class="title">
@@ -28,7 +28,7 @@ export default {
         {name:'重庆抗战遗址博物馆',phone:'023-62462447'},
         {name:'重庆杜莎夫人蜡像馆',phone:'023-63492828'},
         {name:'红岩文旅',phone:'023-81037996'},
-        {name:'胖丁旅行',phone:'4000720368'},
+        {name:'胖丁旅行综合咨询',phone:'4000720368'},
       ]
     }
   },