Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/Lexus-media

src/App.vue

@@ -38,7 +38,7 @@ export default {
     return {
       navTitle1: ' > 数据管理',
       navTitle2: '',
-      isManufacturer: 'distributor', // distributor 经销商 manufacturer 厂商
+      isManufacturer: 'manufacturer', // distributor 经销商 manufacturer 厂商
       userAccount: '',
       userToken:''
     }
@@ -111,6 +111,8 @@ export default {
           console.log(this.isManufacturer)
         }
       }else {
+        sessionStorage.clear();
+        localStorage.clear();
         let query = this.$route.query || {};
         sessionStorage.setItem('setToken',query.token);
         this.userToken = query.token;

src/views/data/UploadInfor.vue

@@ -124,8 +124,8 @@
     <div class="dataName" style="margin-top: 2%;">
       <span>反馈设置</span>
       <select class="selectStyle" v-model="isFeedBack" autocomplete="off">
-        <option value="0">否</option>
-        <option value="1">是</option>
+        <option value="0">不需要反馈</option>
+        <option value="1">需要反馈</option>
       </select>
       <input
               type="date"