Merge branch 'master' of http://git.izouma.com/panhui/yags-front

.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=https://yags.raex.vip
+VUE_APP_BASE_URL=https://test.yags.raex.vip
 NODE_ENV=development
 VUE_APP_PUBLIC_PATH=/
 ASSETS_PATH=raex

src/views/user/Point.vue

@@ -19,7 +19,7 @@
             <div class="title">交易记录</div>
             <div class="point-item" v-for="(item, index) in list" :key="index">
                 <div class="text1">
-                    <span>{{ getLabelName(item.type, typeOptions) }}</span>
+                    <span>{{ item.balanceDesc }}</span>
                     <span>{{ item.amount }}</span>
                 </div>
                 <div class="text2">

src/views/user/ReportAdd.vue

@@ -82,7 +82,7 @@ export default {
                 return item.url;
             });
             this.$http
-                .post('/report/create', form)
+                .post('/report/create', { ...form, pic: form.pic.join() })
                 .then(res => {
                     this.$toast.clear();
                     this.$dialog