Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/page/login/index.vue

@@ -1,15 +1,18 @@
 <template>
   <div class="login-container"
+       :class="backgroundClass"
        ref="login"
        @keyup.enter.native="handleLogin">
     <top-color v-show="false"></top-color>
     <div class="login-weaper animated bounceInDown">
-      <div class="login-left">
+      <div class="login-left" :class="backgroundClass">
         <div class="login-time">
           {{time}}
         </div>
          <!--<img class="img" src="/img/logoTubao.png" alt="">-->
-        <p class="title">{{ $t('login.info') }}</p>
+        <p class="title">
+            {{ special === 1 ? '多多易车配管理平台' :$t('login.info') }}
+        </p>
           <!--$t 国际化vue-i18n中英文切换 -->
       </div>
       <div class="login-border">
@@ -61,7 +64,8 @@
           source: "",
           code: "",
           state: "",
-        }
+        },
+          special: 0
       };
     },
     watch: {
@@ -76,7 +80,15 @@
     mounted() {
     },
     computed: {
-      ...mapGetters(["website", "tagWel"])
+      ...mapGetters(["website", "tagWel"]),
+        backgroundClass() {
+            const domain = window.location.hostname.split('.')[0];
+            if ('duoduo' === domain) {
+                this.special = 1
+                return `bg-${domain}`;
+            }
+            return 'bg-default';
+        }
     },
     props: [],
     methods: {

src/styles/login.scss

@@ -5,15 +5,23 @@
   width: 100%;
   height: 100%;
   margin: 0 auto;
-  background-image: url("/img/bg/bg.jpg");
+  // background-image: var(--login-bg-image, url("/img/bg/bg.jpg"));
   background-size: 100% 100%;
+    &.bg-default {
+        background-image: url("/img/bg/bg.jpg");
+    }
+    &.bg-duoduo {
+        background:
+            linear-gradient(rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)),
+            url("/img/bg/main-bg.jpg") center/cover;
+    }
 }
 
 .login-weaper {
   margin: 0 auto;
   width: 1000px;
   box-shadow: -4px 5px 10px rgba(0, 0, 0, 0.4);
-
+    border-radius: 40px;
   .el-input-group__append {
     border: none;
   }
@@ -28,15 +36,26 @@
 }
 
 .login-left {
-  border-top-left-radius: 5px;
-  border-bottom-left-radius: 5px;
+  border-top-left-radius: 40px;
+  border-bottom-left-radius: 40px;
   justify-content: center;
   flex-direction: column;
-  background-color: #409EFF;
+  //background-color: #409EFF;
   color: #fff;
   float: left;
   width: 50%;
   position: relative;
+    &.bg-default {
+        background: #409EFF;
+    }
+    &.bg-duoduo {
+        background:
+            linear-gradient(rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)),
+            #409EFF;
+    }
+    &.bg-localhost {
+        background: rgba(64, 158, 255, 0.7);
+    }
 }
 
 .login-left .img {
@@ -66,8 +85,8 @@
 
 .login-border {
   border-left: none;
-  border-top-right-radius: 5px;
-  border-bottom-right-radius: 5px;
+  border-top-right-radius: 40px;
+  border-bottom-right-radius: 40px;
   color: #fff;
   background-color: #fff;
   width: 50%;

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -692,9 +692,10 @@
                                 <span style="color: #4c9e44;cursor: pointer;text-decoration: underline"
                                     @click="emailJump('cy')">场站</span>
                             </span>
+<!--                            :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"-->
                             <search-query :datalist="cyData" :selectValue="assemblyForm.cyCnName" :filterable="true"
                                 :clearable="true" :remote="true"
-                                :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
+
                                 :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择场站"
                                 @remoteMethod="remoteMethod($event, 'cy')" @corpChange="corpChange($event, 'cy')"
                                 @corpFocus="remoteMethod($event, 'cy')">

src/views/tirePartsMall/basicData/commodityInformation/js/optionList.js

@@ -1,4 +1,3 @@
-import { number } from "echarts"
 
 export const option = {
   searchShow: true,
@@ -130,7 +129,23 @@ export const option = {
       searchLabelWidth: 120,
       hide: true,
       overHidden: true
-    }
+    }, {
+          label: "是否共享商品",
+          prop: "shared",
+          search: true,
+          searchLabelWidth: 120,
+          overHidden: true,
+          hide: true,
+          showColumn: true,
+          type: 'select',
+          dicData: [{
+              label: '否',
+              value: 0
+          }, {
+              label: '是',
+              value: 1
+          }]
+      }
   ]
 }
 export const optionList = {

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -2496,6 +2496,7 @@ export default {
                         }
                     }
                     this.form.storageName = this.form.$storageId ? this.form.$storageId : ''
+                    this.form.billType = 0
                     submit({
                         bsType: "XS",
                         ...this.form