Explorar el Código

帮机构下单

zhengjinyi hace 1 año
padre
commit
74e88b6291

+ 2 - 2
src/main/resources/config/dev/application-dev.yml

@@ -54,10 +54,10 @@ logging:
 caimei:
   siteEnv: 0 #网站环境,(2:正式环境,1:测试环境,0:开发环境)
   #spiServer: http://192.168.2.68:8008
-#  coreServer: https://core-b.caimei365.com
+  coreServer: https://core-b.caimei365.com
   #coreServer: http://192.168.2.67:18002
   #coreServer: http://192.168.2.17:18002
-  coreServer: http://192.168.2.102:18002
+#  coreServer: http://192.168.2.102:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http://localhost:8009
   destPath: classpath:/

+ 47 - 1
src/main/resources/static/css/supplier-center/order/order-create.css

@@ -49,6 +49,52 @@
 
 /*移动*/
 @media screen and (max-width:768px) {
-    .wrap_tittle {height: 10.6vw;line-height: 10.6vw;background: #fff;padding: 0 2.7vw;font-size: 3.4vw;color: #22272e;border-bottom: solid .27vw #e2e7ef;}
+    table, td, th{border: none;}
+    .right{padding-bottom: 20vw;}
+    .crumbs {font-size: 16px;color: #22272e;padding-left: 216px;}
+    .order-title{ box-sizing: border-box;padding: 2vw; }
+    .order-title p{ font-size: 16px;color: #22272E; }
+    .order-address-form{ width: 100%;height: auto;padding: 16px 16px 10px 16px;box-sizing: border-box;background: #FFFFFF; }
+    .order-product-form { width: 100%;height: auto;padding:0 16px 16px 16px;box-sizing: border-box;background: #FFFFFF;}
+    .order-product-form .cartTit{height:50px;line-height:50px;border-bottom: 1px solid #E2E7EF;text-align: center;}
+    .order-product-form .c1{float:left;width:300px;height:100%;position:relative;}
+    .order-product-form .c2{float:left;width:150px}
+    .order-product-form .c3{float:left;width:200px}
+    .order-product-form .c4{float:left;width:80px}
+    .order-product-form .c5{float:left;width:200px;position:relative}
+    .order-product-none { text-align: center;width: 100%;height: 122px;padding: 25px 0;box-sizing: border-box;}
+    .order-product-none p{ line-height: 36px;font-size: 14px;color: #9AA5B5;}
+    .order-product-main{width: 100%;height: auto;box-sizing: border-box;padding: 10px 0; }
+    .order-product-item{width: 100%;height: 80px;text-align: center;line-height: 80px;position: relative;padding: 10px 0;}
+    .order-product-item .item-delete{width: 80px;height: 80px;text-align: center;line-height: 80px;position: absolute;right: -20px;}
+    .order-product-item .item-delete .el-icon-close{font-size: 16px;color: #333333;cursor: pointer;}
+    .order-product-item .product-img{width: 80px;height: 80px;float: left;box-sizing: border-box;border: 1px solid #e1e1e1;}
+    .order-product-item .product-img img{width: 80px;height: 80px;}
+    .order-product-item .product-name{width: 220px;height: 80px;float: left;box-sizing: border-box;padding: 20px 0}
+    .order-product-item .product-name p{line-height: 20px; font-size: 12px;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;overflow: hidden;}
+    .order-product-total{width: 100%;height: 58px;box-sizing: border-box;padding-top: 16px;border-top: 1px solid #E1E1E1; }
+    .order-product-total .order-product-note{float: left;width: 70%;height: 100%;line-height: 42px;font-size: 16px;color: #22272E;}
+    .order-product-total .order-product-note .el-input{width: 480px !important; }
+    .order-product-total .order-product-price{float: right;width: 30%;height: 100%;line-height: 42px;}
+    .order-product-total .order-totalPrice{float: left;font-size: 16px;color: #22272E;margin-right: 20px;}
+    .order-product-total .order-totalPrice .red{color: #F94B4B;}
+    .freight-radio{ width: 100%;height: 28px;line-height: 28px;float: left;margin-bottom: 10px;}
+    .order-product-bsn { width: 100%;height: auto;padding:0 16px 16px 16px;box-sizing: border-box;background: #FFFFFF;margin-top: 16px;}
+    .order-product-add { text-align: center;width: 100%;height: 60px;padding: 20px 0 0 0;box-sizing: border-box;}
+    .order-product-add span{ margin: 0 5px;}
+    .order-invoice-form{ width: 100%;height: auto;padding: 16px;box-sizing: border-box;background: #FFFFFF; }
+    .order-invoice-radio{ width: 100%;height: 36px;line-height: 36px;margin: 5px 0;}
+    .order-el-confirm{width: 100%;text-align: right;box-sizing: border-box;padding: 2vw;background: #FFFFFF;float: left;margin-top: 0;}
+    .order-el-confirm {position: fixed;bottom: 0;right: 0;}
+    .order-el-confirm .inner {width: 100%;margin: 0 auto;z-index: 9999;}
+    /*  el-dialog 样式  */
+    .filter-container { padding-bottom: 10px; }
+    .filter-item { display: inline-block;vertical-align: middle; margin-bottom: 10px;}
+    .filter-control {display: inline-block;margin-bottom: 10px;margin-right: 10px;}
+    .filter-control>span,.filter-control>.el-input{ display: inline-block;vertical-align: middle;}
+    .filter-control>span { margin-right: 10px; font-size: 14px;color: #606266;}
+    .filter-control>.el-input{  width: 200px;}
+    .filter-control>.el-select{  width: 200px;}
+    footer{display: none;}
 
 }

+ 12 - 13
src/main/resources/static/js/supplier-center/order/order-create.js

@@ -434,22 +434,21 @@ const seeDetail = new Vue({
     mounted () {
         const _this = this;
         this.getProvinceOptions();
-        if (isPC) {
-            _this.open = true;
-        }
         if(globalUserData){
             this.listQuery.shopId = this.confirmParam.shopId =  globalUserData.shopId;
             this.shopId = this.prosParams.shopId = globalUserData.shopId;
         }
-        $(window).scroll(function (event) {
-            var supportPageOffset = window.pageXOffset !== undefined; // 判断是否支持pageXOffset
-            var isCSS1Compat = ((document.compatMode || "") === "CSS1Compat"); // 判断渲染模式是不是标准模式
-            var scrollHeight = supportPageOffset ? window.pageYOffset : isCSS1Compat ? document.documentElement.scrollTop : document.body.scrollTop;
-            if (scrollHeight < 100) {
-                _this.isFiexd = true
-            } else {
-                _this.isFiexd = false
-            }
-        });
+        if (isPC) {
+            $(window).scroll(function (event) {
+                var supportPageOffset = window.pageXOffset !== undefined; // 判断是否支持pageXOffset
+                var isCSS1Compat = ((document.compatMode || "") === "CSS1Compat"); // 判断渲染模式是不是标准模式
+                var scrollHeight = supportPageOffset ? window.pageYOffset : isCSS1Compat ? document.documentElement.scrollTop : document.body.scrollTop;
+                if (scrollHeight < 100) {
+                    _this.isFiexd = true
+                } else {
+                    _this.isFiexd = false
+                }
+            });
+        }
     },
 });

+ 88 - 42
src/main/resources/templates/supplier-center/order/order-create.html

@@ -31,48 +31,94 @@
         </div>
 
         <div class="order-address-form">
-          <el-form ref="dataForm" :rules="rules" :model="addressForm">
-            <el-form-item label="收货人:" label-position="left" prop="receiver" :rules="rules.receiver" label-width="98px">
-              <el-input v-model="addressForm.receiver" placeholder="请填写收货人"  maxlength="40"></el-input>
-            </el-form-item>
-            <el-form-item label="联系方式:" label-position="left" prop="mobile" :rules="rules.mobile" label-width="98px">
-              <el-input v-model="addressForm.mobile" placeholder="请填写联系方式"  maxlength="11"></el-input>
-            </el-form-item>
-            <el-row :gutter="24" class="box-row">
-              <el-col :span="8">
-                <el-form-item label="联系地址:" label-position="left" prop="provinceId" :rules="rules.provinceId" label-width="98px">
-                  <el-select v-model="addressForm.provinceId" clearable @change="getCityList(addressForm.provinceId)">
-                    <el-option value="" label="请选择"></el-option>
-                    <el-option v-for="(item, index) in provinceList" :key="index" :label="item.name" :value="item.id"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="" prop="cityId" :rules="rules.cityId" label-position="false" label-width="0px">
-                  <el-select v-model="addressForm.cityId" clearable @change="getTownList(addressForm.provinceId)">
-                    <el-option value="" label="请选择"></el-option>
-                    <el-option v-for="(item, index) in cityList" :key="index" :label="item.name" :value="item.id"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="" prop="townId" :rules="rules.townId" label-position="false" label-width="0px">
-                  <el-select v-model="addressForm.townId" clearable>
-                    <el-option value="" label="请选择"></el-option>
-                    <el-option v-for="(item, index) in townList" :key="index" :label="item.name" :value="item.id"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label=""  prop="address" label-position="left"  :rules="rules.address" label-width="98px">
-              <el-input v-model="addressForm.address"
-                        type="textarea"
-                        placeholder="建议您如实填写详细收货地址,例如:街道名称,门牌号码,楼层和房间号等信息"
-                        maxlength="200"
-                        :autosize="{ minRows: 5, maxRows: 6}">
-              </el-input>
-            </el-form-item>
-          </el-form>
+          <template v-if="isPC">
+            <el-form ref="dataForm" :rules="rules" :model="addressForm">
+              <el-form-item label="收货人:" label-position="left" prop="receiver" :rules="rules.receiver" label-width="98px">
+                <el-input v-model="addressForm.receiver" placeholder="请填写收货人"  maxlength="40"></el-input>
+              </el-form-item>
+              <el-form-item label="联系方式:" label-position="left" prop="mobile" :rules="rules.mobile" label-width="98px">
+                <el-input v-model="addressForm.mobile" placeholder="请填写联系方式"  maxlength="11"></el-input>
+              </el-form-item>
+              <el-row :gutter="24" class="box-row">
+                <el-col :span="8">
+                  <el-form-item label="联系地址:" label-position="left" prop="provinceId" :rules="rules.provinceId" label-width="98px">
+                    <el-select v-model="addressForm.provinceId" clearable @change="getCityList(addressForm.provinceId)">
+                      <el-option value="" label="请选择"></el-option>
+                      <el-option v-for="(item, index) in provinceList" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="" prop="cityId" :rules="rules.cityId" label-position="false" label-width="0px">
+                    <el-select v-model="addressForm.cityId" clearable @change="getTownList(addressForm.provinceId)">
+                      <el-option value="" label="请选择"></el-option>
+                      <el-option v-for="(item, index) in cityList" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="" prop="townId" :rules="rules.townId" label-position="false" label-width="0px">
+                    <el-select v-model="addressForm.townId" clearable>
+                      <el-option value="" label="请选择"></el-option>
+                      <el-option v-for="(item, index) in townList" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-form-item label=""  prop="address" label-position="left"  :rules="rules.address" label-width="98px">
+                <el-input v-model="addressForm.address"
+                          type="textarea"
+                          placeholder="建议您如实填写详细收货地址,例如:街道名称,门牌号码,楼层和房间号等信息"
+                          maxlength="200"
+                          :autosize="{ minRows: 5, maxRows: 6}">
+                </el-input>
+              </el-form-item>
+            </el-form>
+          </template>
+          <template v-else>
+            <el-form ref="dataForm" :rules="rules" :model="addressForm">
+              <el-form-item label="收货人:" label-position="top" prop="receiver" :rules="rules.receiver">
+                <el-input v-model="addressForm.receiver" placeholder="请填写收货人"  maxlength="40"></el-input>
+              </el-form-item>
+              <el-form-item label="联系方式:" label-position="top" prop="mobile" :rules="rules.mobile">
+                <el-input v-model="addressForm.mobile" placeholder="请填写联系方式"  maxlength="11"></el-input>
+              </el-form-item>
+              <el-row :gutter="24" class="box-row">
+                <el-col :span="8">
+                  <el-form-item label="省:" label-position="top" prop="provinceId" :rules="rules.provinceId">
+                    <el-select v-model="addressForm.provinceId" clearable @change="getCityList(addressForm.provinceId)">
+                      <el-option value="" label="请选择"></el-option>
+                      <el-option v-for="(item, index) in provinceList" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="市:" prop="cityId" :rules="rules.cityId" label-position="top">
+                    <el-select v-model="addressForm.cityId" clearable @change="getTownList(addressForm.provinceId)">
+                      <el-option value="" label="请选择"></el-option>
+                      <el-option v-for="(item, index) in cityList" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="区县:" prop="townId" :rules="rules.townId" label-position="top">
+                    <el-select v-model="addressForm.townId" clearable>
+                      <el-option value="" label="请选择"></el-option>
+                      <el-option v-for="(item, index) in townList" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-form-item label="联系地址:"  prop="address" label-position="top"  :rules="rules.address">
+                <el-input v-model="addressForm.address"
+                          type="textarea"
+                          placeholder="建议您如实填写详细收货地址,例如:街道名称,门牌号码,楼层和房间号等信息"
+                          maxlength="200"
+                          :autosize="{ minRows: 5, maxRows: 6}">
+                </el-input>
+              </el-form-item>
+            </el-form>
+          </template>
         </div>
         <div class="order-title">
           <p class="info-title">商品清单</p>