From-wh 2 лет назад
Родитель
Сommit
5939f2d86d

+ 7 - 7
template/admin/src/components/linkaddress/index.vue

@@ -269,19 +269,19 @@
                   </Radio>
                   </Radio>
                 </RadioGroup>
                 </RadioGroup>
               </div>
               </div>
-              <template v-if="customdate.status == 1">
-                <FormItem label="跳转路径:" prop="url">
+              <div v-if="customdate.status == 1">
+                <FormItem label="跳转路径:" prop="url" key="url">
                   <Input v-model="customdate.url" placeholder="请输入正确跳转路径"></Input>
                   <Input v-model="customdate.url" placeholder="请输入正确跳转路径"></Input>
                 </FormItem>
                 </FormItem>
-              </template>
-              <template v-if="customdate.status == 2">
-                <FormItem label="APPID:" prop="appid">
+              </div>
+              <div v-if="customdate.status == 2">
+                <FormItem label="APPID:" prop="appid" key="appid">
                   <Input v-model="customdate.appid" placeholder="请输入正确APPID"></Input>
                   <Input v-model="customdate.appid" placeholder="请输入正确APPID"></Input>
                 </FormItem>
                 </FormItem>
-                <FormItem label="小程序路径:" prop="mpUrl">
+                <FormItem label="小程序路径:" prop="mpUrl" key="mpUrl">
                   <Input v-model="customdate.mpUrl" placeholder="请输入正确小程序路径"></Input>
                   <Input v-model="customdate.mpUrl" placeholder="请输入正确小程序路径"></Input>
                 </FormItem>
                 </FormItem>
-              </template>
+              </div>
             </Form>
             </Form>
           </div>
           </div>
         </div>
         </div>

+ 64 - 34
template/admin/src/components/uploadImg/index.vue

@@ -7,7 +7,7 @@
       :visible.sync="uploadModal"
       :visible.sync="uploadModal"
       width="1024px"
       width="1024px"
       :fullscreen="!isPage"
       :fullscreen="!isPage"
-      @closed="closed"
+      @close="closed"
     >
     >
       <div class="main" v-loading="loading">
       <div class="main" v-loading="loading">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
@@ -61,7 +61,7 @@
                     <i class="el-icon-error btndel" @click="handleWebRemove(file)" />
                     <i class="el-icon-error btndel" @click="handleWebRemove(file)" />
                   </div>
                   </div>
                 </el-upload>
                 </el-upload>
-                <div class="tips">建议上传图片最大宽度750px,不超过3MB;仅支持jpeg、png格式</div>
+                <div class="tips">建议上传图片最大宽度750px,不超过3MB;仅支持jpeg、png格式,拖拽调整上传顺序</div>
               </div>
               </div>
             </div>
             </div>
           </el-form-item>
           </el-form-item>
@@ -82,39 +82,44 @@
               </div>
               </div>
             </div>
             </div>
           </template>
           </template>
-        </el-form>
-        <div class="code-image" v-if="ruleForm.type == 2">
-          <div class="left">
-            <div class="code" ref="qrCodeUrl"></div>
-            <el-cascader
-              class="form-width"
-              v-model="ruleForm.region"
-              :props="props"
-              :options="categoryList"
-              @change="handleChange"
-            ></el-cascader>
-            <div>扫描二维码,快速上传手机图片</div>
-          </div>
-          <div class="right">
-            <el-button size="small" @click="scanUploadGet">刷新图库</el-button>
-            <div class="tip">刷新图库按钮,可显示移动端上传成功的图片</div>
-            <div class="img-box">
-              <div
-                v-for="(item, index) in ruleForm.imgList"
-                :key="index"
-                class="pictrue"
-                draggable="false"
-                @dragstart="handleDragStart($event, item)"
-                @dragover.prevent="handleDragOver($event, item)"
-                @dragenter="handleDragEnter($event, item)"
-                @dragend="handleDragEnd($event, item)"
-              >
-                <img :src="item.att_dir" />
-                <i class="el-icon-error btndel" @click="handleWebRemove(item)" />
+          <div class="code-image" v-if="ruleForm.type == 2">
+            <div class="left">
+              <el-form-item label="上传至分组:" prop="region">
+                <el-cascader
+                  class="form-width"
+                  v-model="ruleForm.region"
+                  :props="props"
+                  :options="categoryList"
+                  @change="handleChange"
+                ></el-cascader>
+              </el-form-item>
+              <el-form-item label="二维码:" prop="region">
+                <div class="code" ref="qrCodeUrl"></div>
+                <div class="trip">扫描二维码,快速上传手机图片</div>
+                <div class="trip-small">建议使用手机浏览器</div>
+              </el-form-item>
+            </div>
+            <div class="right">
+              <el-button size="small" @click="scanUploadGet">刷新图库</el-button>
+              <div class="tip">刷新图库按钮,可显示移动端上传成功的图片</div>
+              <div class="img-box">
+                <div
+                  v-for="(item, index) in ruleForm.imgList"
+                  :key="index"
+                  class="pictrue"
+                  draggable="false"
+                  @dragstart="handleDragStart($event, item)"
+                  @dragover.prevent="handleDragOver($event, item)"
+                  @dragenter="handleDragEnter($event, item)"
+                  @dragend="handleDragEnd($event, item)"
+                >
+                  <img :src="item.att_dir" />
+                  <i class="el-icon-error btndel" @click="handleWebRemove(item)" />
+                </div>
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>
-        </div>
+        </el-form>
       </div>
       </div>
 
 
       <span slot="footer" class="dialog-footer">
       <span slot="footer" class="dialog-footer">
@@ -178,24 +183,37 @@ export default {
       scanToken: '',
       scanToken: '',
       limit: 20,
       limit: 20,
       loading: false,
       loading: false,
+      time: undefined,
     };
     };
   },
   },
   created() {},
   created() {},
   mounted() {},
   mounted() {},
+  beforeDestroy() {
+    clearInterval(this.time);
+    this.time = undefined;
+  },
   methods: {
   methods: {
     closed() {
     closed() {
+      console.log('1');
       this.ruleForm.type = 0;
       this.ruleForm.type = 0;
       this.ruleForm.region = 0;
       this.ruleForm.region = 0;
       this.scanToken = '';
       this.scanToken = '';
       this.webImgUrl = '';
       this.webImgUrl = '';
       this.ruleForm.imgList = [];
       this.ruleForm.imgList = [];
+      clearInterval(this.time);
+      this.time = undefined;
       scanUploadCode().then((res) => {});
       scanUploadCode().then((res) => {});
     },
     },
     radioChange(type) {
     radioChange(type) {
       this.ruleForm.type = type;
       this.ruleForm.type = type;
       this.ruleForm.imgList = [];
       this.ruleForm.imgList = [];
+      clearInterval(this.time);
+      this.time = undefined;
       if (type == 2) {
       if (type == 2) {
         this.scanUploadQrcode();
         this.scanUploadQrcode();
+        this.time = setInterval((e) => {
+          this.scanUploadGet();
+        }, 2000);
       }
       }
     },
     },
     scanUploadQrcode() {
     scanUploadQrcode() {
@@ -442,7 +460,6 @@ export default {
 }
 }
 .code-image{
 .code-image{
     display flex
     display flex
-    padding-left 100px
     margin-top 12px
     margin-top 12px
     .left{
     .left{
         display flex
         display flex
@@ -464,19 +481,32 @@ export default {
         }
         }
         .form-width{
         .form-width{
             width 200px
             width 200px
-            margin-bottom 18px
         }
         }
         .code{
         .code{
             margin-bottom 14px
             margin-bottom 14px
         }
         }
+         .trip{
+          color #333333
+          text-align: center
+          line-height: 18px;
+        }
+        .trip-small{
+            font-size: 12px;
+            font-weight: 400;
+            color: #BBBBBB;
+            text-align: center
+            line-height: 16px;
+        }
     }
     }
     .right{
     .right{
+      margin-top: 62px;
         .tip{
         .tip{
             font-size: 12px;
             font-size: 12px;
             font-weight: 400;
             font-weight: 400;
             color: #BBBBBB;
             color: #BBBBBB;
             margin 10px 0
             margin 10px 0
         }
         }
+
     }
     }
 }
 }
 </style>
 </style>

+ 0 - 1
template/admin/src/pages/app/upload/index.vue

@@ -68,7 +68,6 @@ export default {
   created() {
   created() {
     this.token = this.$route.query.token;
     this.token = this.$route.query.token;
     this.pid = this.$route.query.pid;
     this.pid = this.$route.query.pid;
-    this.pid = this.$route.query.pid;
     document.title = '手机端扫码上传';
     document.title = '手机端扫码上传';
   },
   },
   methods: {
   methods: {

+ 2 - 2
template/admin/src/pages/order/orderList/handle/orderSend.vue

@@ -38,7 +38,7 @@
           <Input v-model="formItem.to_tel" placeholder="请输入寄件人电话" style="width: 60%"></Input>
           <Input v-model="formItem.to_tel" placeholder="请输入寄件人电话" style="width: 60%"></Input>
         </FormItem>
         </FormItem>
         <FormItem label="寄件人地址:">
         <FormItem label="寄件人地址:">
-          <Input v-model="formItem.to_addr" placeholder="请输入寄件人地址" style="width: 60%"></Input>
+          <Input v-model="formItem.to_addr" placeholder="请输入寄件人地址" style="width: 60%" @on-blur="watchPrice"></Input>
         </FormItem>
         </FormItem>
       </template>
       </template>
       <div>
       <div>
@@ -62,7 +62,7 @@
           </div>
           </div>
         </FormItem>
         </FormItem>
         <FormItem label="快递业务类型:" v-if="formItem.type == 1 && formItem.express_record_type == 3">
         <FormItem label="快递业务类型:" v-if="formItem.type == 1 && formItem.express_record_type == 3">
-          <Select v-model="formItem.service_type" filterable placeholder="请选择业务类型" style="width: 60%">
+          <Select v-model="formItem.service_type" filterable placeholder="请选择业务类型" style="width: 60%" @on-change="watchPrice">
             <Option v-for="item in serviceTypeList" :value="item" :key="item">{{ item }}</Option>
             <Option v-for="item in serviceTypeList" :value="item" :key="item">{{ item }}</Option>
           </Select>
           </Select>
         </FormItem>
         </FormItem>