Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/win_bid.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 .main {
   width: 100%;
   overflow: scroll;
@@ -7,34 +8,416 @@
   display: none;
 }
 
+.layout_top-bottom {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 100%;
+}
+
+.layout_top-bottom .layou_top {
+  flex: 1;
+  overflow: scroll;
+}
+
+.bottom_button {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  height: .94rem;
+}
+
+.bottom_button .left_btn,
+.bottom_button .right_btn {
+  flex: 1;
+  height: 100%;
+  font-size: .34rem;
+}
+
+.bottom_button .left_btn {
+  color: #2cb7ca;
+  background-color: #fff;
+  border-top: 1px solid #e0e0e0;
+}
+
+.bottom_button .right_btn {
+  color: #fff;
+  background-color: #2cb7ca;
+  border-top: 1px solid #2cb7ca;
+}
+
+.bottom_button button[disabled] {
+  opacity: .5;
+}
+
+.public_btn {
+  width: 100%;
+  height: .94rem;
+  line-height: .94rem;
+  text-align: center;
+  background: #2CB7CA;
+  color: #fff;
+  border-radius: 0.06rem;
+  font-size: .34rem;
+}
+
+.tips_btn {
+  display: flex;
+  position: relative;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.tips_btn .tips_discount {
+  width: 100%;
+}
+
+.tips_btn .tips_discount .tips_d_money {
+  display: none;
+  position: absolute;
+  left: 50%;
+  top: -.2rem;
+  padding: 0 .4rem;
+  height: .64rem;
+  line-height: .64rem;
+  color: #2CB7CA;
+  font-size: .32rem;
+  background-color: #fff;
+  border-radius: .32rem;
+  transform: translate(-50%, -100%);
+  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+}
+
+.tips_btn .tips_discount .tips_d_text {
+  display: none;
+  height: .72rem;
+  line-height: .72rem;
+  color: #fff;
+  font-size: .28rem;
+  text-align: center;
+  background-color: #FFB901;
+}
+
+.tips_btn .btns {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  height: .94rem;
+  line-height: .94rem;
+  color: #fff;
+  font-size: .34rem;
+}
+
+.tips_btn .btns .save-btn,
+.tips_btn .btns .reset-btn {
+  flex: 1;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: .34rem;
+}
+
+.tips_btn .btns .reset-btn {
+  background: #fff;
+  color: #2cb7ca;
+  border-top: 1px solid #e0e0e0;
+}
+
+.tips_btn .btns .save-btn {
+  background: #2cb7ca;
+  color: #fff;
+  border-top: 1px solid #2cb7ca;
+}
+
+.tips_btn .btns button[disabled] {
+  opacity: .5;
+}
+
+.jy_icon {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+.jy_icon.decrease:before,
+.jy_icon.increase:before,
+.jy_icon.increase:after {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  content: '';
+  width: 0.4rem;
+  height: 0.04rem;
+  background-color: #686868;
+  transform: translate(-50%, -50%);
+}
+
+.jy_icon.increase:after {
+  transform: translate(-50%, -50%) rotate(90deg);
+}
+
+/*禁止长按复制 加给body*/
+.no-touch {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+/* 弹性盒子布局 */
+.flex_alginC {
+  display: flex;
+  align-items: center;
+}
+
+.flex_alginC_justB {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flex_alginC_justC {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.flex_column {
+  display: flex;
+  flex-direction: column;
+}
+
+.flex_column_alignC {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+/* 自定义弹窗*/
+@-webkit-keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+.custom-dialog .weui-animate-fade-in {
+  -webkit-animation: c ease 0s forwards;
+  animation: c ease 0s forwards;
+}
+
+@-webkit-keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.custom-dialog .weui-animate-fade-out {
+  -webkit-animation: d ease 0s forwards;
+  animation: d ease 0s forwards;
+}
+
+.custom-dialog .weui-dialog__hd {
+  background: #F5F4F9;
+  padding: .17rem 0;
+  color: #000;
+  font-size: .34rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__bd {
+  padding: .37rem 0;
+  color: #1D1D1D;
+  font-size: .32rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__ft:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__btn:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__ft {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-bottom: .38rem;
+  box-sizing: border-box;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__btn {
+  display: block;
+  width: 1.72rem;
+  height: .72rem;
+  line-height: .72rem;
+  color: #fff;
+  padding: 0;
+  flex: none;
+  text-align: center;
+  border-radius: 3px;
+}
+
+.custom-dialog .weui-dialog__btn_primary {
+  background-color: #2CB7CA;
+  margin-right: 1rem;
+}
+
+.custom-dialog .weui-dialog__btn_default {
+  background-color: #BFBFC3;
+}
+
+/* 自定义switch按钮 */
+.custom-switch {
+  position: relative;
+  width: 52px;
+  height: 32px;
+  border: 1px solid #dfdfdf;
+  outline: 0;
+  border-radius: 16px;
+  box-sizing: border-box;
+  background-color: #dfdfdf;
+  -webkit-transition: background-color .1s,border .1s;
+  transition: background-color .1s,border .1s;
+  -webkit-appearance: none;
+}
+
+.custom-switch:before {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 50px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fdfdfd;
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+}
+
+.custom-switch:after {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 30px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+}
+
+.custom-switch.checked {
+  border-color: #04be02;
+  background-color: #04be02;
+}
+
+.custom-switch.checked:before {
+  transform: scale(0);
+}
+
+.custom-switch.checked:after {
+  transform: translateX(20px);
+}
+
+.custom-toast .weui-toast {
+  font-size: .3rem;
+  padding: 0.2rem;
+  width: auto;
+  max-width: 6rem;
+  min-height: 0;
+  height: auto;
+  top: 50%;
+  left: 50%;
+  margin-left: 0;
+  margin-top: -0.47rem;
+  transform: translateX(-50%) translateY(-50%);
+}
+
+.custom-toast .weui-icon_toast {
+  display: none;
+}
+
+.custom-toast .weui-toast__content {
+  margin: 0;
+}
+
+.win_bid {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.win_bid .main {
+  flex: 1;
+  overflow-y: scroll;
+}
+
 .win_bid .main .query {
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-pack: end;
-      -ms-flex-pack: end;
-          justify-content: flex-end;
+  align-items: center;
+  justify-content: flex-end;
   padding: .3rem;
   color: #2cb7ca;
   font-size: .3rem;
 }
+
 .win_bid .main .query i {
   font-size: .4rem;
   margin-left: .1rem;
 }
+
 .win_bid .main .form .form-item {
   padding: .3rem;
   margin: .2rem 0;
   background: #fff;
 }
+
 .win_bid .main .form .form-item input {
   width: 100%;
   height: 100%;
   font-size: .28rem;
 }
+
 .win_bid .main .form .btn {
   width: 100%;
   height: .94rem;
@@ -43,45 +426,38 @@
   font-size: .34rem;
   text-align: center;
 }
+
 .win_bid .main .form-edit .item-control {
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
+  align-items: center;
+  justify-content: space-between;
   background: #fff;
   height: .88rem;
   line-height: .88rem;
   padding: 0 .3rem;
   margin-top: .2rem;
 }
+
 .win_bid .main .form-edit .item-control input {
   height: 100%;
-  -webkit-box-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  flex: 1;
   background: transparent;
   font-size: .28rem;
 }
+
 .win_bid .main .form-edit .item-control .edit {
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  align-items: center;
   color: #2cb7ca;
   height: .4rem;
   padding: 0 .2rem;
   border-left: 1px solid #e0e0e0;
 }
+
 .win_bid .main .form-edit .item-control .edit i {
   margin-right: .1rem;
 }
+
 .win_bid .main .form-edit .item-btn {
   width: 100%;
   height: .88rem;
@@ -90,54 +466,60 @@
   margin-top: .1rem;
   display: none;
 }
+
 .win_bid .main .form-edit .item-btn .btn {
   width: 50%;
   height: 100%;
-  -webkit-box-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  flex: 1;
   color: #fff;
   float: left;
   font-size: .3rem;
 }
+
 .win_bid .main .form-edit .item-btn .del {
   background: #fe737a;
 }
+
 .win_bid .main .form-edit .item-btn .enter {
   background: #2cb7ca;
 }
-.win_bid .main .add {
+
+.win_bid .add {
   width: 1rem;
   height: 1rem;
   display: block;
-  position: fixed;
-  bottom: .72rem;
-  left: 50%;
-  margin-left: -.5rem;
+  margin: 0 auto 0.72rem;
 }
-.win_bid .main .add img {
+
+.win_bid .add img {
   width: 100%;
   height: 100%;
 }
+
 .win_bid #tipDialog {
   text-align: left;
 }
+
 .win_bid #tipDialog .dialog-title {
   font-size: .34rem;
 }
+
 .win_bid #tipDialog .info li {
   text-align: left !important;
   font-size: .28rem;
 }
+
 .win_bid #tipDialog .info li label {
   display: block;
   font-weight: bold;
   margin: .24rem 0;
 }
+
 .win_bid #tipDialog .info li p {
   font-size: .28rem;
   line-height: 1.4;
 }
+
 .win_bid #tipDialog .weui-dialog__btn_primary {
   color: #2cb7ca;
 }

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js

@@ -85,13 +85,14 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        $('.modify span').each(function(item){
-            $('.modify span')[0].contentEditable = true
-        })
-        keepLastIndex(e.target)
-        // console.log($(this).parent().siblings().find('span').text())
-        $(this).parent().hide()
-        $(this).parent().siblings().css('display','block')
+        let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
+        oSpan.focus();
+        setTimeout(() => {
+            keepLastIndex(oSpan)
+        }, 40);
+        $(this).parent().hide();
+        $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+        $(".addKeyWord").hide();
     })
 
     // 编辑 删除
@@ -100,6 +101,7 @@ $(function(){
         buyerArr.splice($.inArray(buyer, buyerArr),1);
         localStorage.buyer = buyerArr.toString();
         $(this).parents('li').remove();
+        $(".addKeyWord").show();
         hasWords()
         // console.log('删除附加词:',$(this).parent().find('span').text())
     })
@@ -136,6 +138,7 @@ $(function(){
             $(this).parent().siblings().find('.key').text(keyWord)
             $(this).parent().hide().siblings().show()
         }
+        $(".addKeyWord").show();
     })
 
     //去空格方法

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js

@@ -231,10 +231,12 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        $('.modify span').each(function(item){
-            $('.modify span')[0].contentEditable = true
-        });
-        keepLastIndex(e.target);
+        let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
+        oSpan.focus()
+        setTimeout(() => {
+            keepLastIndex(oSpan)
+        }, 40)
+
         var keyWord = $(this).prev().children().find(".key").text();
         for(var i in keyWordArr){
             if(keyWordArr[i].keyWord === keyWord){
@@ -264,8 +266,8 @@ $(function(){
                 $(this).parent().next().find(".addExclusion").text(strs);
             }
         }
-        $(this).parent().hide();
-        $(this).parent().siblings().css('display','block');
+        $(this).parent().hide()
+        $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
         $(".addKeyWord").hide();
     });
 

src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html

@@ -318,14 +318,13 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                $('.modify span').each(function(item){
-                    $('.modify span')[0].contentEditable = true
-                });
-                keepLastIndex(e.target);
-                // console.log($(this).parent().siblings().find('span').text())
+                let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
+                oSpan.focus();
+                setTimeout(() => {
+                    keepLastIndex(oSpan)
+                }, 40);
                 $(this).parent().hide();
-                $(this).parent().siblings().css('display','block')
-                //
+                $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
                 $(".addKeyWord").hide();
             });
 

src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html

@@ -46,11 +46,15 @@
 		top: 18px;
 		color: #444444;
 	}
-	.keyWord .addKeyWord {
+	.addKeyWord i {
+		font-size: 1rem;
+		color: #2cb7ca;
+	}
+	.addKeyWord {
 		width: 100%;
 		position: fixed;
-		/*top: 100%;*/
 		text-align: center;
+		bottom: 10%;
 	}
 	.ios-user-select{
 		-webket-user-select: text;
@@ -78,11 +82,11 @@
 
 		</ul>
 
-		<div class="addKeyWord">
-			<i class="iconfont icon-tianjia"></i>
-		</div>
 	</div>
 </div>
+<div class="addKeyWord">
+	<i class="iconfont icon-tianjia"></i>
+</div>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js"></script>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js"></script>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/additionWord.js?v={{Msg "seo" "version"}}31"></script>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

@@ -318,13 +318,13 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                $('.modify span').each(function(item){
-                    $('.modify span')[0].contentEditable = true
-                });
-                keepLastIndex(e.target)
-                // console.log($(this).parent().siblings().find('span').text())
+                let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
+                oSpan.focus();
+                setTimeout(() => {
+                    keepLastIndex(oSpan)
+                }, 40);
                 $(this).parent().hide();
-                $(this).parent().siblings().css('display','block');
+                $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
                 $(".addKeyWord").hide();
             });
 

src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html

@@ -139,7 +139,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}37"></script>
+    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}39"></script>
     <script>
         $(window).bind("pageshow", function(event){
             if(event.originalEvent.persisted){

src/jfw/modules/app/src/web/templates/dataExport/dataExport_subType.html

@@ -107,6 +107,17 @@
             overflow: hidden;
             width: 280px;
         }
+        body .industry .list ul li i {
+            font-size: .52rem;
+            color: #2cb7ca;
+            margin-left: 0.2rem;
+            position: relative;
+            top: 0.08rem;
+        }
+        .nijian{
+            display: flex;
+            display: -webkit-flex;
+        }
     </style>
 <body>
     <div class="app-layout-header">
@@ -119,7 +130,7 @@
             <div class="list">
                 <ul>
                     <li>
-                    <dl>
+                    <dl class="nijian">
                     <dt class="question" data-value="拟建">拟建项目</dt><i class="iconfont icon-wenhao q-mark"></i>
                     </dl>
                     </li>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -46,11 +46,15 @@
 			top: 18px;
 			color: #444444;
 		}
-		.keyWord .addKeyWord {
+		.addKeyWord i {
+			font-size: 1rem;
+			color: #2cb7ca;
+		}
+		.addKeyWord {
 			width: 100%;
 			position: fixed;
-			/*top: 100%;*/
 			text-align: center;
+			bottom: 10%;
 		}
 		.ios-user-select{
 			-webket-user-select: text;
@@ -76,14 +80,13 @@
 
 			</ul>
 
-			<div class="addKeyWord">
-			<i class="iconfont icon-tianjia"></i>
-			</div>
-
 			</div>
 
 			</div>
-			<script src="/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+	<div class="addKeyWord">
+		<i class="iconfont icon-tianjia"></i>
+	</div>
+	<script src="/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
 	<script src="/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 	<script>
 		$(window).bind("pageshow", function(event){
@@ -203,13 +206,14 @@
 
 			// 编辑
 			$(".showKeyWord").on('click', '.editKeyWord',function(e){
-				$('.modify span').each(function(item){
-					$('.modify span')[0].contentEditable = true
-				});
-				keepLastIndex(e.target)
-				// console.log($(this).parent().siblings().find('span').text())
+				let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
+				oSpan.focus();
+				setTimeout(() => {
+					keepLastIndex(oSpan)
+				}, 40);
 				$(this).parent().hide();
-				$(this).parent().siblings().css('display','block')
+				$(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+				$(".addKeyWord").hide();
 			});
 
 			// 编辑 删除
@@ -218,6 +222,7 @@
 				winnerArr.splice($.inArray(winner, winnerArr),1);
 				localStorage.winner = winnerArr.toString();
 				$(this).parents('li').remove();
+				$(".addKeyWord").show();
 				hasWords()
 				// console.log('删除附加词:',$(this).parent().find('span').text())
 			});
@@ -254,7 +259,7 @@
 					$(this).parent().siblings().find('.key').text(keyWord);
 					$(this).parent().hide().siblings().show()
 				}
-
+				$(".addKeyWord").show();
 			});
 
 			//去空格方法

src/web/staticres/wx_dataExport/css/win_bid.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 .main {
   width: 100%;
   overflow: scroll;
@@ -7,34 +8,416 @@
   display: none;
 }
 
+.layout_top-bottom {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 100%;
+}
+
+.layout_top-bottom .layou_top {
+  flex: 1;
+  overflow: scroll;
+}
+
+.bottom_button {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  height: .94rem;
+}
+
+.bottom_button .left_btn,
+.bottom_button .right_btn {
+  flex: 1;
+  height: 100%;
+  font-size: .34rem;
+}
+
+.bottom_button .left_btn {
+  color: #2cb7ca;
+  background-color: #fff;
+  border-top: 1px solid #e0e0e0;
+}
+
+.bottom_button .right_btn {
+  color: #fff;
+  background-color: #2cb7ca;
+  border-top: 1px solid #2cb7ca;
+}
+
+.bottom_button button[disabled] {
+  opacity: .5;
+}
+
+.public_btn {
+  width: 100%;
+  height: .94rem;
+  line-height: .94rem;
+  text-align: center;
+  background: #2CB7CA;
+  color: #fff;
+  border-radius: 0.06rem;
+  font-size: .34rem;
+}
+
+.tips_btn {
+  display: flex;
+  position: relative;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.tips_btn .tips_discount {
+  width: 100%;
+}
+
+.tips_btn .tips_discount .tips_d_money {
+  display: none;
+  position: absolute;
+  left: 50%;
+  top: -.2rem;
+  padding: 0 .4rem;
+  height: .64rem;
+  line-height: .64rem;
+  color: #2CB7CA;
+  font-size: .32rem;
+  background-color: #fff;
+  border-radius: .32rem;
+  transform: translate(-50%, -100%);
+  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+}
+
+.tips_btn .tips_discount .tips_d_text {
+  display: none;
+  height: .72rem;
+  line-height: .72rem;
+  color: #fff;
+  font-size: .28rem;
+  text-align: center;
+  background-color: #FFB901;
+}
+
+.tips_btn .btns {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  height: .94rem;
+  line-height: .94rem;
+  color: #fff;
+  font-size: .34rem;
+}
+
+.tips_btn .btns .save-btn,
+.tips_btn .btns .reset-btn {
+  flex: 1;
+  width: 50%;
+  text-align: center;
+  height: 100%;
+  font-size: .34rem;
+}
+
+.tips_btn .btns .reset-btn {
+  background: #fff;
+  color: #2cb7ca;
+  border-top: 1px solid #e0e0e0;
+}
+
+.tips_btn .btns .save-btn {
+  background: #2cb7ca;
+  color: #fff;
+  border-top: 1px solid #2cb7ca;
+}
+
+.tips_btn .btns button[disabled] {
+  opacity: .5;
+}
+
+.jy_icon {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+.jy_icon.decrease:before,
+.jy_icon.increase:before,
+.jy_icon.increase:after {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  content: '';
+  width: 0.4rem;
+  height: 0.04rem;
+  background-color: #686868;
+  transform: translate(-50%, -50%);
+}
+
+.jy_icon.increase:after {
+  transform: translate(-50%, -50%) rotate(90deg);
+}
+
+/*禁止长按复制 加给body*/
+.no-touch {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+/* 弹性盒子布局 */
+.flex_alginC {
+  display: flex;
+  align-items: center;
+}
+
+.flex_alginC_justB {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flex_alginC_justC {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.flex_column {
+  display: flex;
+  flex-direction: column;
+}
+
+.flex_column_alignC {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+/* 自定义弹窗*/
+@-webkit-keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+.custom-dialog .weui-animate-fade-in {
+  -webkit-animation: c ease 0s forwards;
+  animation: c ease 0s forwards;
+}
+
+@-webkit-keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.custom-dialog .weui-animate-fade-out {
+  -webkit-animation: d ease 0s forwards;
+  animation: d ease 0s forwards;
+}
+
+.custom-dialog .weui-dialog__hd {
+  background: #F5F4F9;
+  padding: .17rem 0;
+  color: #000;
+  font-size: .34rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__bd {
+  padding: .37rem 0;
+  color: #1D1D1D;
+  font-size: .32rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__ft:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__btn:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__ft {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-bottom: .38rem;
+  box-sizing: border-box;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__btn {
+  display: block;
+  width: 1.72rem;
+  height: .72rem;
+  line-height: .72rem;
+  color: #fff;
+  padding: 0;
+  flex: none;
+  text-align: center;
+  border-radius: 3px;
+}
+
+.custom-dialog .weui-dialog__btn_primary {
+  background-color: #2CB7CA;
+  margin-right: 1rem;
+}
+
+.custom-dialog .weui-dialog__btn_default {
+  background-color: #BFBFC3;
+}
+
+/* 自定义switch按钮 */
+.custom-switch {
+  position: relative;
+  width: 52px;
+  height: 32px;
+  border: 1px solid #dfdfdf;
+  outline: 0;
+  border-radius: 16px;
+  box-sizing: border-box;
+  background-color: #dfdfdf;
+  -webkit-transition: background-color .1s,border .1s;
+  transition: background-color .1s,border .1s;
+  -webkit-appearance: none;
+}
+
+.custom-switch:before {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 50px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fdfdfd;
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+}
+
+.custom-switch:after {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 30px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+}
+
+.custom-switch.checked {
+  border-color: #04be02;
+  background-color: #04be02;
+}
+
+.custom-switch.checked:before {
+  transform: scale(0);
+}
+
+.custom-switch.checked:after {
+  transform: translateX(20px);
+}
+
+.custom-toast .weui-toast {
+  font-size: .3rem;
+  padding: 0.2rem;
+  width: auto;
+  max-width: 6rem;
+  min-height: 0;
+  height: auto;
+  top: 50%;
+  left: 50%;
+  margin-left: 0;
+  margin-top: -0.47rem;
+  transform: translateX(-50%) translateY(-50%);
+}
+
+.custom-toast .weui-icon_toast {
+  display: none;
+}
+
+.custom-toast .weui-toast__content {
+  margin: 0;
+}
+
+.win_bid {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.win_bid .main {
+  flex: 1;
+  overflow-y: scroll;
+}
+
 .win_bid .main .query {
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-pack: end;
-      -ms-flex-pack: end;
-          justify-content: flex-end;
+  align-items: center;
+  justify-content: flex-end;
   padding: .3rem;
   color: #2cb7ca;
   font-size: .3rem;
 }
+
 .win_bid .main .query i {
   font-size: .4rem;
   margin-left: .1rem;
 }
+
 .win_bid .main .form .form-item {
   padding: .3rem;
   margin: .2rem 0;
   background: #fff;
 }
+
 .win_bid .main .form .form-item input {
   width: 100%;
   height: 100%;
   font-size: .28rem;
 }
+
 .win_bid .main .form .btn {
   width: 100%;
   height: .94rem;
@@ -43,45 +426,38 @@
   font-size: .34rem;
   text-align: center;
 }
+
 .win_bid .main .form-edit .item-control {
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
+  align-items: center;
+  justify-content: space-between;
   background: #fff;
   height: .88rem;
   line-height: .88rem;
   padding: 0 .3rem;
   margin-top: .2rem;
 }
+
 .win_bid .main .form-edit .item-control input {
   height: 100%;
-  -webkit-box-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  flex: 1;
   background: transparent;
   font-size: .28rem;
 }
+
 .win_bid .main .form-edit .item-control .edit {
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  align-items: center;
   color: #2cb7ca;
   height: .4rem;
   padding: 0 .2rem;
   border-left: 1px solid #e0e0e0;
 }
+
 .win_bid .main .form-edit .item-control .edit i {
   margin-right: .1rem;
 }
+
 .win_bid .main .form-edit .item-btn {
   width: 100%;
   height: .88rem;
@@ -90,54 +466,60 @@
   margin-top: .1rem;
   display: none;
 }
+
 .win_bid .main .form-edit .item-btn .btn {
   width: 50%;
   height: 100%;
-  -webkit-box-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  flex: 1;
   color: #fff;
   float: left;
   font-size: .3rem;
 }
+
 .win_bid .main .form-edit .item-btn .del {
   background: #fe737a;
 }
+
 .win_bid .main .form-edit .item-btn .enter {
   background: #2cb7ca;
 }
-.win_bid .main .add {
+
+.win_bid .add {
   width: 1rem;
   height: 1rem;
   display: block;
-  position: fixed;
-  bottom: .72rem;
-  left: 50%;
-  margin-left: -.5rem;
+  margin: 0 auto 0.72rem;
 }
-.win_bid .main .add img {
+
+.win_bid .add img {
   width: 100%;
   height: 100%;
 }
+
 .win_bid #tipDialog {
   text-align: left;
 }
+
 .win_bid #tipDialog .dialog-title {
   font-size: .34rem;
 }
+
 .win_bid #tipDialog .info li {
   text-align: left !important;
   font-size: .28rem;
 }
+
 .win_bid #tipDialog .info li label {
   display: block;
   font-weight: bold;
   margin: .24rem 0;
 }
+
 .win_bid #tipDialog .info li p {
   font-size: .28rem;
   line-height: 1.4;
 }
+
 .win_bid #tipDialog .weui-dialog__btn_primary {
   color: #2cb7ca;
 }

src/web/staticres/wx_dataExport/js/additionWord.js

@@ -85,14 +85,14 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        $('.modify span').each(function(item){
-            $('.modify span')[0].contentEditable = true
-        })
-        keepLastIndex(e.target)
-        // console.log($(this).parent().siblings().find('span').text())
-        $(this).parent().hide()
-        $(this).parent().siblings().css('display','block')
-        $(".addKeyWord").hide()
+        let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
+        oSpan.focus();
+        setTimeout(() => {
+            keepLastIndex(oSpan)
+        }, 40);
+        $(this).parent().hide();
+        $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
+        $(".addKeyWord").hide();
     })
 
     // 编辑 删除

src/web/staticres/wx_dataExport/js/keyWord.js

@@ -220,10 +220,11 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        $('.modify span').each(function(item){
-            $('.modify span')[0].contentEditable = true
-        });
-        keepLastIndex(e.target);
+        let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
+        oSpan.focus();
+        setTimeout(() => {
+            keepLastIndex(oSpan)
+        }, 40);
         var keyWord = $(this).prev().children().find(".key").text();
         for(var i in keyWordArr){
             if(keyWordArr[i].keyWord === keyWord){
@@ -254,7 +255,7 @@ $(function(){
             }
         }
         $(this).parent().hide();
-        $(this).parent().siblings().css('display','block');
+        $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
         $(".addKeyWord").hide();
     });
 

src/web/templates/weixin/dataExport/dataExport_appended.html

@@ -292,14 +292,13 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                $('.modify span').each(function(item){
-                    $('.modify span')[0].contentEditable = true
-                });
-                keepLastIndex(e.target);
-                // console.log($(this).parent().siblings().find('span').text())
+                let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
+                oSpan.focus();
+                setTimeout(() => {
+                    keepLastIndex(oSpan)
+                }, 40);
                 $(this).parent().hide();
-                $(this).parent().siblings().css('display','block')
-                //
+                $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
                 $(".addKeyWord").hide();
             });
 

src/web/templates/weixin/dataExport/dataExport_buyerEdit.html

@@ -15,11 +15,15 @@
 	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style>
-	.keyWord .addKeyWord {
+	.addKeyWord i {
+		font-size: 1rem;
+		color: #2cb7ca;
+	}
+	.addKeyWord {
 		width: 100%;
 		position: fixed;
-		top: 100%;
 		text-align: center;
+		bottom: 10%;
 	}
 	.keyWord .enter .btn .save-btn {
 		float: right;
@@ -50,11 +54,11 @@
 
 		</ul>
 
-		<div class="addKeyWord">
-			<i class="iconfont icon-tianjia"></i>
-		</div>
 	</div>
 </div>
+<div class="addKeyWord">
+	<i class="iconfont icon-tianjia"></i>
+</div>
 <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js"></script>
 <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js"></script>
 <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}37"></script>

src/web/templates/weixin/dataExport/dataExport_exclude.html

@@ -291,13 +291,13 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                $('.modify span').each(function(item){
-                    $('.modify span')[0].contentEditable = true
-                });
-                keepLastIndex(e.target)
-                // console.log($(this).parent().siblings().find('span').text())
+                let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
+                oSpan.focus();
+                setTimeout(() => {
+                    keepLastIndex(oSpan)
+                }, 40);
                 $(this).parent().hide();
-                $(this).parent().siblings().css('display','block');
+                $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
                 $(".addKeyWord").hide();
             });
 

src/web/templates/weixin/dataExport/dataExport_subType.html

@@ -90,6 +90,10 @@
             position: relative;
             top: 0.08rem;
         }
+        .nijian{
+            display: flex;
+            display: -webkit-flex;
+        }
     </style>
 <body>
 
@@ -99,7 +103,7 @@
             <div class="list">
                 <ul>
                         <li>
-                            <dl>
+                            <dl class="nijian">
                                 <dt class="question" data-value="拟建">拟建项目</dt><i class="iconfont icon-wenhao q-mark"></i>
                             </dl>
                         </li>

src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

@@ -15,11 +15,15 @@
 	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 	</head>
 	<style>
-		.keyWord .addKeyWord {
+		.addKeyWord i {
+			font-size: 1rem;
+			color: #2cb7ca;
+		}
+		.addKeyWord {
 			width: 100%;
 			position: fixed;
-			top: 100%;
 			text-align: center;
+			bottom: 10%;
 		}
 		.keyWord .enter .btn .save-btn {
 			float: right;
@@ -32,30 +36,27 @@
 		}
 	</style>
 	<body>
-
 	<div class="keyWord">
-			<div class="enter addkeyWord">
+		<div class="enter addkeyWord">
 			<input type="text" class="enterOne" placeholder="中标单位名称" />
 			<div class="btn">
-			<button class="save-btn" disabled>确认</button>
-			<button class="close">取消</button>
-	</div>
-	</div>
-
-	<!-- 添加附加词显示列表 -->
-	<div class="showKeyWord">
+				<button class="save-btn" disabled>确认</button>
+				<button class="close">取消</button>
+			</div>
+		</div>
+		<!-- 添加附加词显示列表 -->
+		<div class="showKeyWord">
 			<ul>
 
 			</ul>
 
-			<div class="addKeyWord">
-			<i class="iconfont icon-tianjia"></i>
-			</div>
-
-			</div>
+		</div>
 
-			</div>
-			<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+	</div>
+	<div class="addKeyWord">
+		<i class="iconfont icon-tianjia"></i>
+	</div>
+	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
 	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 	<script>
 		initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
@@ -176,13 +177,13 @@
 
 			// 编辑
 			$(".showKeyWord").on('click', '.editKeyWord',function(e){
-				$('.modify span').each(function(item){
-					$('.modify span')[0].contentEditable = true
-				});
-				keepLastIndex(e.target)
-				// console.log($(this).parent().siblings().find('span').text())
+				let oSpan = e.target.parentNode.nextElementSibling.firstElementChild
+				oSpan.focus();
+				setTimeout(() => {
+					keepLastIndex(oSpan)
+				}, 40);
 				$(this).parent().hide();
-				$(this).parent().siblings().css('display','block')
+				$(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
 				$(".addKeyWord").hide();
 			});