Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile

src/pages/goods/detail.vue

@@ -135,9 +135,6 @@
         	height="100">
         </u--textarea>
         <view class="title">上传凭证</view>
-<<<<<<< HEAD
-        <zj-upload key="cp" @getFiles="getFiles" :fileList="aaa" :count="9" />
-=======
         <!-- <zj-upload key="cp" @getFiles="getFiles" :fileList="reportForm.fileList" :count="9" /> -->
         <view class="images">
         	<block v-for="(item, index) in reportForm.fileList" :key='index'>
@@ -151,7 +148,6 @@
         		<text class="text">点击上传</text>
         	</view>
         </view>
->>>>>>> origin/master
       </view>
     </zj-dialog-box>
   </view>

src/pages/issue/index.vue

@@ -369,9 +369,10 @@ export default {
                     energy: '',
                     goodsCreateTime: ''
                   }
+                  this.fileList = []
                   this.$refs.form.clearValidate()
                   this.disabled = false
-                  this.crossPage.$emit('reloadHomePage');
+                  this.crossPage.$emit('reloadHomePage', 1);
                   this.$navToPage({
                       url: '/pages/index/index'
                     },

src/pages/mine/myBuy/logistics.vue

@@ -2,9 +2,9 @@
 	<view class="app-container">
 		<view class="all-container" v-if="logisticsData && logisticsData.length > 0">
 			<view class="top-container">
-				<view class="left">{{logisticsData[0].comName}}<text>{{logisticsData[0].logisticsNum}}</text></view>
+				<view class="left">{{logisticsData[0].comName}}<text>{{logisticsData[0].logisticsNo}}</text></view>
 				<view class="right">
-					<text @tap="copy(logisticsData[0].logisticsNum)">复制单号</text>
+					<text @tap="copy(logisticsData[0].logisticsNo)">复制单号</text>
 				</view>
 			</view>
 			<view class="mian-container">

src/pages/mine/myBuy/return.vue

@@ -182,6 +182,8 @@ export default {
           orderId: this.orderId
         })
         .then(res => {
+          console.log(res);
+          this.formdata.applyNote = res.data.applyNote
           this.form = res.data
           this.fileList = res.data.orderRefundFileList.map(v => v.imgUrl)
           if (['AFTER_WAIT', 'REFUND', 'NO_REFUND'].indexOf(res.data.status) !== -1) {