二手

src/main/resources/static/js/flea-market/form.js

@@ -4,7 +4,7 @@ var fleaMarketForm = new Vue({
     data:{
         fenlei:[
             {name:'二手仪器',value:'1'},
-            {name:'临期产品',value:'2'},
+            // {name:'临期产品',value:'2'},
             {name:'其他',value:'3'},
         ],
         currentId:0,
@@ -35,12 +35,12 @@ var fleaMarketForm = new Vue({
             brandName:'',//其他品牌
             fixedYears:null,//出厂
             companyName:'',//公司名称
-            maturityYears:'',//产品到期
+            // maturityYears:'',//产品到期
             price1:'',//交易价
             detailTalkFlag:1,//是否启用详聊
-            normalPrice:'',//市场价
-            originalPrice:'',//采购价
-            stock:'',//数量
+            // normalPrice:'',//市场价
+            // originalPrice:'',//采购价
+            // stock:'',//数量
             productQuality:'',//商品成色
             contactName:'',//联系人
             contactMobile:'',//联系方式
@@ -199,26 +199,26 @@ var fleaMarketForm = new Vue({
                 },2000);
                 return
          }
-         if(_this.secondParams.secondHandType ==2) {
-         if (_this.secondParams.normalPrice == '') {
-                 _this.vShow_Market = true;
-                 _this.fromMessage = '请输入市场价';
-                 _this.scrollIntoView();
-                 setTimeout(function () {
-                     _this.vShow_Market = false;
-                 }, 2000);
-                 return
-             }
-             if (_this.secondParams.maturityYears == '') {
-                 _this.vShow_expire = true;
-                 _this.fromMessage = '请输入产品到期日';
-                 _this.scrollIntoView();
-                 setTimeout(function () {
-                     _this.vShow_expire = false;
-                 }, 2000);
-                 return
-             }
-         }
+         // if(_this.secondParams.secondHandType ==2) {
+         // if (_this.secondParams.normalPrice == '') {
+         //         _this.vShow_Market = true;
+         //         _this.fromMessage = '请输入市场价';
+         //         _this.scrollIntoView();
+         //         setTimeout(function () {
+         //             _this.vShow_Market = false;
+         //         }, 2000);
+         //         return
+         //     }
+         //     if (_this.secondParams.maturityYears == '') {
+         //         _this.vShow_expire = true;
+         //         _this.fromMessage = '请输入产品到期日';
+         //         _this.scrollIntoView();
+         //         setTimeout(function () {
+         //             _this.vShow_expire = false;
+         //         }, 2000);
+         //         return
+         //     }
+         // }
          if(_this.secondParams.price1 == ''){
                   _this.vShow_Price = true;
                   _this.fromMessage = '请输入交易价';
@@ -228,26 +228,26 @@ var fleaMarketForm = new Vue({
                     },2000);
                     return
              }
-         if(_this.secondParams.secondHandType ==2){
-             if(_this.secondParams.originalPrice == ''){
-              _this.vShow_original = true;
-              _this.fromMessage = '请输入采购价/原价';
-              _this.scrollIntoView();
-                setTimeout(function(){
-                    _this.vShow_original = false;
-                },2000);
-                return
-           }
-         if(_this.secondParams.stock == ''){
-              _this.vShow_Number = true;
-              _this.fromMessage = '请输入数量';
-              _this.scrollIntoView();
-                setTimeout(function(){
-                    _this.vShow_Number = false;
-                },2000);
-                return
-            }
-         }
+         // if(_this.secondParams.secondHandType ==2){
+         //     if(_this.secondParams.originalPrice == ''){
+         //      _this.vShow_original = true;
+         //      _this.fromMessage = '请输入采购价/原价';
+         //      _this.scrollIntoView();
+         //        setTimeout(function(){
+         //            _this.vShow_original = false;
+         //        },2000);
+         //        return
+         //   }
+         // if(_this.secondParams.stock == ''){
+         //      _this.vShow_Number = true;
+         //      _this.fromMessage = '请输入数量';
+         //      _this.scrollIntoView();
+         //        setTimeout(function(){
+         //            _this.vShow_Number = false;
+         //        },2000);
+         //        return
+         //    }
+         // }
 
 
          if(_this.secondParams.productQuality == ''){

src/main/resources/static/js/supplier-center/shop/release.js

@@ -52,6 +52,7 @@ var releaseContainer = new Vue({
             twoClassifyName:'',
             threeClassifyName:'',
             brandName:'',
+            attribute:''
         },
         params:{
             param:[],//相关参数
@@ -90,6 +91,10 @@ var releaseContainer = new Vue({
             {placeholder:'建议输入商品大类别关键词',value:""},
             {placeholder:'建议输入商品小类别关键词',value:""},
         ],
+        attributeList:[
+            {name:'产品',value:'1'},
+            {name:'仪器',value:'2'}
+        ],
         productDetailInfoID:null,
         ProvinceList:[],
         GoodsImagesList:[],
@@ -123,6 +128,7 @@ var releaseContainer = new Vue({
         vShow_GoodsImages:false,
         vShow_detailInfoEditor:true,
         vShow_orderInfoEditor:true,
+        vShow_attribute:false,
     },
     computed: {
 
@@ -613,6 +619,14 @@ var releaseContainer = new Vue({
                 },2000);
                 return;
             }
+            if(_this.releaseParams.attribute == ''){
+                _this.vShow_attribute=true;
+                 _this.scrollIntoView();
+                setTimeout(function(){
+                    _this.vShow_attribute = false;
+                },2000);
+                return;
+            }
             if(_this.releaseParams.tinyTypeID == ''){
                 _this.vShow_TinyTypeID = true;
                 _this.fromMessage = '请选择商品分类';

src/main/resources/templates/flea-market/form.html

@@ -38,10 +38,10 @@
                         </div>
                          <span class="release-tips errTips icon mIcon" v-show="vShow_instrumentType">{{fromMessage}}</span>
                     </div>
-                    <div class="linqi_text" v-show="secondParams.secondHandType==2">
-                        <div class="jiaobiao"></div>
-                        <p>临期产品是指临近保质期的产品，距离到期日最好在6个月以上</p>
-                    </div>
+<!--                    <div class="linqi_text" v-show="secondParams.secondHandType==2">-->
+<!--                        <div class="jiaobiao"></div>-->
+<!--                        <p>临期产品是指临近保质期的产品，距离到期日最好在6个月以上</p>-->
+<!--                    </div>-->
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品品牌：</div>
 
@@ -63,11 +63,11 @@
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;">出厂日期：</div>
                         <input type="text"  v-model="secondParams.fixedYears" id="shopyear" maxlength="10" placeholder="请输入出厂日期 如：2020年06月">
                     </div>
-                     <div class="unlogin-item input-item shrink-spacing"  v-show="secondParams.secondHandType==2">
-                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>产品到期日：</div>
-                        <input type="text"  v-model="secondParams.maturityYears" id="expire" maxlength="10" placeholder="请输入产品到期日，如：2020年12月">
-                        <span class="release-tips errTips icon mIcon" v-show="vShow_expire">{{fromMessage}}</span>
-                    </div>
+<!--                     <div class="unlogin-item input-item shrink-spacing"  v-show="secondParams.secondHandType==2">-->
+<!--                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>产品到期日：</div>-->
+<!--                        <input type="text"  v-model="secondParams.maturityYears" id="expire" maxlength="10" placeholder="请输入产品到期日，如：2020年12月">-->
+<!--                        <span class="release-tips errTips icon mIcon" v-show="vShow_expire">{{fromMessage}}</span>-->
+<!--                    </div>-->
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;">公司名称：</div>
                         <input type="text"  v-model="secondParams.companyName" id="mechanismname" maxlength="30" placeholder="请输入公司名称，不超过30个汉字">
@@ -81,21 +81,21 @@
                         <span class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</span>
                         <span class="release-tips errTips icon mIcon" v-show="vShow_Price">{{fromMessage}}</span>
                     </div>
-                     <div class="unlogin-item input-item shrink-spacing" v-show="secondParams.secondHandType==2">
-                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>市场价：</div>
-                        <input type="text"  v-model="secondParams.normalPrice" id="market" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')"   placeholder="请输入市场价">
-                        <span class="release-tips errTips icon mIcon" v-show="vShow_Market">{{fromMessage}}</span>
-                    </div>
-                    <div class="unlogin-item input-item shrink-spacing" v-show="secondParams.secondHandType==2">
-                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>采购价/原价：</div>
-                        <input type="text"  v-model="secondParams.originalPrice" id="original_price" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')" placeholder="请输入采购价/原价"/>
-                        <span class="release-tips errTips icon mIcon" v-show="vShow_original">{{fromMessage}}</span>
-                    </div>
-                     <div class="unlogin-item input-item shrink-spacing" v-show="secondParams.secondHandType==2">
-                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>数量：</div>
-                        <input type="text"  id="number" v-model="secondParams.stock" maxlength="30" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入数量">
-                       <span class="release-tips errTips icon mIcon" v-show="vShow_Number">{{fromMessage}}</span>
-                    </div>
+<!--                     <div class="unlogin-item input-item shrink-spacing" v-show="secondParams.secondHandType==2">-->
+<!--                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>市场价：</div>-->
+<!--                        <input type="text"  v-model="secondParams.normalPrice" id="market" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')"   placeholder="请输入市场价">-->
+<!--                        <span class="release-tips errTips icon mIcon" v-show="vShow_Market">{{fromMessage}}</span>-->
+<!--                    </div>-->
+<!--                    <div class="unlogin-item input-item shrink-spacing" v-show="secondParams.secondHandType==2">-->
+<!--                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>采购价/原价：</div>-->
+<!--                        <input type="text"  v-model="secondParams.originalPrice" id="original_price" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')" placeholder="请输入采购价/原价"/>-->
+<!--                        <span class="release-tips errTips icon mIcon" v-show="vShow_original">{{fromMessage}}</span>-->
+<!--                    </div>-->
+<!--                     <div class="unlogin-item input-item shrink-spacing" v-show="secondParams.secondHandType==2">-->
+<!--                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>数量：</div>-->
+<!--                        <input type="text"  id="number" v-model="secondParams.stock" maxlength="30" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入数量">-->
+<!--                       <span class="release-tips errTips icon mIcon" v-show="vShow_Number">{{fromMessage}}</span>-->
+<!--                    </div>-->
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品成色：</div>
                         <input type="text" maxlength="10" id="shopcolor"v-model="secondParams.productQuality"  placeholder="请输入商品成色，如“9成新”">

src/main/resources/templates/flea-market/list.html

@@ -21,9 +21,9 @@
                 <li class="ClassA icon" @click="handle('1')" :class="[currentId == '1' ? 'active':'',currentId == '1' ? 'jqSelect':'']">
                     {{ tabTitleName }}
                 </li>
-                <li class="ClassA icon" @click="handle('2')" :class="[currentId == '2' ? 'active':'',currentId == '2' ? 'jqSelect':'']">
-                    临期产品
-                </li>
+<!--                <li class="ClassA icon" @click="handle('2')" :class="[currentId == '2' ? 'active':'',currentId == '2' ? 'jqSelect':'']">-->
+<!--                    临期产品-->
+<!--                </li>-->
                 <li class="ClassA icon" @click="handle('3')" :class="[currentId == '3' ? 'active':'',currentId == '3' ? 'jqSelect':'']">
                     其他
                 </li>
@@ -36,10 +36,10 @@
                     {{ tabTitleName }}
                     <span class="line" v-if="currentId == '1'"></span>
                 </li>
-                <li class="ClassA" @click="handle('2')" :class="[currentId == '2' ? 'active':'',currentId == '2' ? 'off':'']">
-                    临期产品
-                    <span class="line" v-if="currentId == '2'"></span>
-                </li>
+<!--                <li class="ClassA" @click="handle('2')" :class="[currentId == '2' ? 'active':'',currentId == '2' ? 'off':'']">-->
+<!--                    临期产品-->
+<!--                    <span class="line" v-if="currentId == '2'"></span>-->
+<!--                </li>-->
                 <li class="ClassA" @click="handle('3')" :class="[currentId == '3' ? 'active':'',currentId == '3' ? 'off':'']">
                     其他
                     <span class="line" v-if="currentId == '3'"></span>

src/main/resources/templates/single-page/repair.html

@@ -19,9 +19,9 @@
         </h1>
         <div class="content">
             <img src="/img/repair/repair.jpg" alt="采美仪器维修介绍">
-            <div class="btnBox">
-                <a href="/repair/form.html" class="fixedBtn">申请维修</a>
-            </div>
+<!--            <div class="btnBox">-->
+<!--                <a href="/repair/form.html" class="fixedBtn">申请维修</a>-->
+<!--            </div>-->
         </div>
     </div>
 </div>

src/main/resources/templates/supplier-center/shop/release.html

@@ -61,6 +61,16 @@
                                 <div class="release-input"><input class="input" v-model="releaseParams.aliasName" maxlength="40" type="text" placeholder="请输入该商品在您公司内部的名称" @blur="blur_aliasName"></div>
                                 <div class="release-tips" v-show="vShow_AliasName">{{fromMessage}}</div>
                             </div>
+                             <div class="release-from clear">
+                                 <div class="release-label"><span class="star">*</span>商品属性:</div>
+                                    <div class="release-input">
+                                        <div class="release-props">
+                                            <label class="release-radio"><input type="radio" name="includedTax" v-model="releaseParams.attribute" value="1" ><i class="icon mIcon">产品</i></label>
+                                            <label class="release-radio"><input type="radio" name="includedTax" v-model="releaseParams.attribute" value="2" checked><i class="icon mIcon">仪器</i></label>
+                                        </div>
+                                </div>
+                                <div class="release-tips" v-show="vShow_attribute">{{fromMessage}}</div>
+                             </div>
                             <div class="release-from clear">
                                 <div class="release-label"><span class="star">*</span>商品分类:</div>
                                 <div class="release-input">