Merge branch 'master' of http://jiyou-tech.com:3000/chenming/561_jiexin

src/App.vue

 <template>
-	<div id="app"  @touchstart="startEvent" @touchend="endEvent">
+	<div id="app" @touchstart="startEvent" @touchend="endEvent">
 		<transition name="fade">
 			<router-view/>
 		</transition>

src/utils/common.js

-import qs from 'qs';
-let httpRoot = 'http://news.envisioncn.com/api/web';//接口根路径
-// let httpRoot = 'http://www.jiyou-tech.com/2019/404/api/web/';//接口根路径
-/*
-* http方法
-* 参数：{
-*   url：接口路径
-*   params：传入的参数
-*   callback：回调函数
-*   thisArg：指向接口调用页面（接口调用页面的this）
-*   type：调用方式（post or get）
-* }
-*/
-function httpFun(url,params,callback, thisArg,uid,type) {
-    if(!type || type.toUpperCase() == "GET"){
-        this.axios.get(httpRoot+url,{params,
-            headers:{
-                uid:uid || ""
-            }
-        }).then((response)=>{
-            if (callback && thisArg) {
-                callback.call(thisArg,response.data);
-            }
-        }).catch((response)=>{
-            console.log(response);
-        })
-    }else{
-        this.axios.post(httpRoot+url,qs.stringify(params),{
-            headers:{
-                uid:uid || "",
-                "Content-Type":"application/x-www-form-urlencoded"
-            }
-        }).then((response)=>{
-            if (callback && thisArg) {
-                callback.call(thisArg,response.data);
-            }
-        }).catch((response)=>{
-            console.log(response);
-        })
-    }
-}
+
 function stopPullDown (){
     let that = this;
     let all = document.getElementById("app");
         }
     },false);
 }
-export {httpFun,stopPullDown};
+export {stopPullDown};

src/views/twoCart/compliance.vue

         <!-- 弹框 -->
         <div class="maskAll" v-if="showMask">
             <img class="mask1_1" src="../../assets/vehicle/maskCompliance.jpg" alt="">
-            <img @click="showMask=false" class="dele" src="../../assets/vehicle/dele.png" alt="">
+            <img @click="showMaskfn" class="dele" src="../../assets/vehicle/dele.png" alt="">
         </div>
         <Sidebar class="slide"></Sidebar>
     </div>
     },
     methods:{
       showMaskfn(e){
-        this.showMask = true;
+        this.showMask = !this.showMask;
+        this.$store.state.commonWin = !this.$store.state.commonWin;
       }
     }
   }

src/views/twoCart/criterion-money.vue

 		<div class="maskAll" v-if="showMask">
 			<img v-if="showMaskNum==1" class="mask1_1" src="../../assets/vehicle/mask1_1.jpg" alt="">
 			<img v-if="showMaskNum==2" class="mask1_1" src="../../assets/vehicle/mask1_2.jpg" alt="">
-			<img @click="showMask=false" class="dele" src="../../assets/vehicle/dele.png" alt="">
+			<img @click="maskFn" class="dele" src="../../assets/vehicle/dele.png" alt="">
 		</div>
 
 		<Sidebar class="slide"></Sidebar>
 
 <script>
 	import Sidebar from '../../components/sidebar'
-	// import {data,touchstart,touchend} from '../../plugins/slide'
+	import {data,touchstart,touchend} from '../../plugins/slide'
 	export default{
 		name:"criterionMoney",
 		components:{Sidebar},
 				}else{
 					this.showMaskNum = 2;
 				}
+				this.$store.state.commonWin = true
 			},
+			maskFn(){
+				this.showMask = false;
+				this.$store.state.commonWin = false
+			}
 		}
 	}
 </script>

src/views/twoCart/criterion-shop.vue

 			<img v-if="showMaskNum==1" class="mask1_1" src="../../assets/vehicle/mask1_5.jpg" alt="">
 			<img v-if="showMaskNum==2" class="mask1_1" src="../../assets/vehicle/mask1_6.jpg" alt="">
 			<img v-if="showMaskNum==3" class="mask1_1" src="../../assets/vehicle/mask1_7.jpg" alt="">
-			<img @click="showMask=false" class="dele" src="../../assets/vehicle/dele.png" alt="">
+			<img @click="maskFn" class="dele" src="../../assets/vehicle/dele.png" alt="">
 		</div>
 		<Sidebar class="slide"></Sidebar>
 	</div>
 				}else{
 					this.showMaskNum = 3;
 				}
+				this.$store.state.commonWin = true
 			},
+		maskFn(){
+			this.showMask = false;
+			this.$store.state.commonWin = false
+		}
 			// touchstart(e){
 			// 	this.touchstartY = e.changedTouches[0].clientY;
 			// },

src/views/twoCart/criterion-showarea.vue

 		<div class="maskAll" v-if="showMask">
 			<img v-if="showMaskNum==1" class="mask1_1" src="../../assets/vehicle/mask1_3.jpg" alt="">
 			<img v-if="showMaskNum==2" class="mask1_1" src="../../assets/vehicle/mask1_4.jpg" alt="">
-			<img @click="showMask=false" class="dele" src="../../assets/vehicle/dele.png" alt="">
+			<img @click="maskFn" class="dele" src="../../assets/vehicle/dele.png" alt="">
 		</div>
 		<Sidebar class="slide"></Sidebar>
 	</div>
 				}else{
 					this.showMaskNum = 2;
 				}
+				this.$store.state.commonWin = true
 			},
+			maskFn(){
+				this.showMask = false;
+				this.$store.state.commonWin = false
+			}
 
 		}
 	}

src/views/twoCart/high-money.vue

 		<!-- 弹框 -->
 		<div class="maskAll" v-if="showMask">
 			<img class="mask1_1" src="../../assets/vehicle/mask2_1.jpg" alt="">
-			<img @click="showMask=false" class="dele" src="../../assets/vehicle/dele.png" alt="">
+			<img @click="maskFn" class="dele" src="../../assets/vehicle/dele.png" alt="">
 		</div>
 		<Sidebar class="slide"></Sidebar>
 	</div>
 		methods:{
 			showMaskfn(e){
 				this.showMask = true;
+				this.$store.state.commonWin = true
+			},
+			maskFn(){
+				this.showMask = false;
+				this.$store.state.commonWin = false
 			}
 		}
 	}

src/views/twoCart/high-shop.vue

 			<img v-if="showMaskNum==1" class="mask1_1" src="../../assets/vehicle/mask2_5.jpg" alt="">
 			<img v-if="showMaskNum==2" class="mask1_1" src="../../assets/vehicle/mask2_6.jpg" alt="">
 			<img v-if="showMaskNum==3" class="mask1_1" src="../../assets/vehicle/mask2_7.jpg" alt="">
-			<img @click="showMask=false" class="dele" src="../../assets/vehicle/dele.png" alt="">
+			<img @click="maskFn" class="dele" src="../../assets/vehicle/dele.png" alt="">
 		</div>
 		<Sidebar class="slide"></Sidebar>
 	</div>
 				}else{
 					this.showMaskNum = 3;
 				}
+				this.$store.state.commonWin = true
+			},
+			maskFn(){
+				this.showMask = false;
+				this.$store.state.commonWin = false
 			}
 		}
 	}

src/views/twoCart/high-showarea.vue

 			<img v-if="showMaskNum==1" class="mask1_1" src="../../assets/vehicle/mask2_2.jpg" alt="">
 			<img v-if="showMaskNum==2" class="mask1_1" src="../../assets/vehicle/mask2_3.jpg" alt="">
 			<img v-if="showMaskNum==3" class="mask1_1" src="../../assets/vehicle/mask2_4.jpg" alt="">
-			<img @click="showMask=false" class="dele" src="../../assets/vehicle/dele.png" alt="">
+			<img @click="maskFn" class="dele" src="../../assets/vehicle/dele.png" alt="">
 		</div>
 		<Sidebar class="slide"></Sidebar>
 	</div>
 				}else{
 					this.showMaskNum = 3;
 				}
+				this.$store.state.commonWin = true
+			},
+			maskFn(){
+				this.showMask = false;
+				this.$store.state.commonWin = false
 			}
 		}
 	}