1227

mobile/src/assets/font/iconfont.css

@@ -1,13 +1,14 @@
 @font-face {
   font-family: 'iconfont';  /* project id 941679 */
-  src: url('//at.alicdn.com/t/font_941679_itececxzw5a.eot');
-  src: url('//at.alicdn.com/t/font_941679_itececxzw5a.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_941679_itececxzw5a.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_941679_itececxzw5a.woff') format('woff'),
-  url('//at.alicdn.com/t/font_941679_itececxzw5a.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_941679_itececxzw5a.svg#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/font_941679_b0onprhnhpc.eot');
+  src: url('//at.alicdn.com/t/font_941679_b0onprhnhpc.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_941679_b0onprhnhpc.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_941679_b0onprhnhpc.woff') format('woff'),
+  url('//at.alicdn.com/t/font_941679_b0onprhnhpc.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_941679_b0onprhnhpc.svg#iconfont') format('svg');
 }
 
+
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
@@ -96,6 +97,10 @@
   content: "\e634";
 }
 
+.icon-icon_cam_zengzhi:before {
+  content: "\e6a8";
+}
+
 .icon-industry_app:before {
   content: "\e635";
 }

mobile/src/components/Paging/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="layout">
     <a @click="clickHandle(index - 1)" ></a>
-    <a @click="clickHandle(1)" :class="{active: index === 1}"  v-if="current>=5">1</a><a class="more" @click="clickHandle(current - 3)" v-if="current>=5" >...</a><a
-      v-if="page!==maxPage"
+    <a @click="clickHandle(1)" :class="{active: index === 1}" >1</a><a class="more" @click="clickHandle(current - 3)" v-if="current>5" >...</a><a
+      v-if="page!==maxPage && page!==1"
       v-for="page in pages"
       :key="page"
       @click="clickHandle(page)"
       :class="{active: index === page}"
-      >{{page}}</a><a class="more" @click="clickHandle(pages[pages.length-1] + 2)" v-if="pages[pages.length-1]+2<=maxPage" >...</a><a @click="clickHandle(maxPage)" :class="{active: index === maxPage}" >{{maxPage}}</a><a @click="clickHandle(index + 1)"></a>
+      >{{page}}</a><a class="more" @click="clickHandle(pages[pages.length-1] + 2)" v-if="pages[pages.length-1]+2<=maxPage" >...</a><a @click="clickHandle(maxPage)" v-if="maxPage!==1" :class="{active: index === maxPage}" >{{maxPage}}</a>
       <i class="iconfont icon-youjiantou" @click="clickHandle(index + 1)" ></i>
   </div>
 </template>

mobile/src/components/browse/index.vue

@@ -3,7 +3,9 @@
     <swiper class="swiper-wrapper swiper-wrapper-n" :options="swiperOption">
       <swiper-slide class="swiper-slide" v-for="(item,index) in idata" :key="index">
         <div class="s-item" :style="{height:wh.width+'px'}" >
-          <video v-if="item.video" :src="`${$cdn}images/${floder}/${item.big}.mp4`" autoplay muted loop></video>
+          <video v-if="item.video" controls="controls" playsinline="playsinline" muted="muted" :poster="`${$cdn}images/${floder}/${item.video}.png`" >
+            <source :src="`${$cdn}images/${floder}/${item.big}.mp4`" type="video/mp4">
+          </video>
           <img v-else class="main-img" :src="`${$cdn}images/${floder}/${item.big}.png`">
         </div>
       </swiper-slide>

mobile/src/pages/account/manage/device/index.vue

@@ -4,7 +4,7 @@
       <template v-if="Number(tabActive)===4">
         <div class="d-item eight-item" v-for="(item,i) in mydevice.list" :key="i" >
           <template v-if="Number(tabActive)===4">
-            <div v-if="item.isExpire&&(item.usedSpace<item.totalSpace)" class="tag expire">{{langDevices.jijiang}}</div>
+            <div v-if="item.isExpire&&(item.usedSpace<=item.totalSpace)" class="tag expire">{{langDevices.jijiang}}</div>
             <div v-if="item.usedSpace>item.totalSpace" class="tag full">{{langDevices.rongliang}}</div>
           </template>
           <img @click="gotoScene(item)" :src="`${$cdn}images/banner_pro.png`">

mobile/src/pages/account/manage/index.vue

@@ -74,7 +74,7 @@ let recid = {
 }
 
 let recidEn = {
-  0: 'Expansion Records',
+  0: 'Billing Records',
   1: '充值记录',
   2: '增值发票'
 }
@@ -98,7 +98,7 @@ let consumpType = [
 
 let consumpTypeEn = [
   {
-    name: 'Expansion Records',
+    name: 'Billing Records',
     id: 0
   }
 ]

mobile/src/pages/account/manage/information/index.vue

@@ -142,9 +142,15 @@
             </span>
             <span style="font-size:12px;color:#000;" v-html="langAccount.isReceive"></span>
           </label>
-          <div @click="saveNickName" class="ant-btn ant-btn-primary">
-            <span>{{langAccount.save}}</span>
+          <div>
+            <div @click="saveNickName" class="ant-btn ant-btn-primary">
+              <span>{{langAccount.save}}</span>
+            </div>
+            <div @click="isShowInfo=true" class="ant-btn ant-btn-primary cancel">
+              <span>{{langAccount.cancel}}</span>
+            </div>
           </div>
+
         </div>
       </div>
     </div>

mobile/src/pages/account/manage/information/style.scss

@@ -271,6 +271,7 @@ input {
                 padding: 8px 0;
               }
               .ant-btn{
+                display: block;
                 height: 24px;
                 line-height: 24px;
                 position: relative;
@@ -428,10 +429,12 @@ input {
 }
 
 .ant-btn{
-  display: block;
+  display: inline-block;
   width: 65px;
   position: relative;
+  margin-right: 5px;
   span{
+    font-weight: normal;
     display: inline-block;
     position: absolute;
     left: 50%;
@@ -439,4 +442,8 @@ input {
     top: 50%;
     transform: translate(-50%,-50%);
   }
+}
+.cancel {
+  background: #e7e7e7 !important;
+  margin-left: 0;
 }

mobile/src/pages/account/manage/order/style.scss

@@ -80,12 +80,12 @@ $border-color: #e7e7e7;
       span {
         font-size: 12px;
         flex: 1;
-        &:first-child {
-          text-align: left;
-        }
         &:last-child{
           text-align: right;
         }
+        &:first-child {
+          text-align: left;
+        }
       }
     }
     .o-con{

mobile/src/pages/layout/header.vue

@@ -127,7 +127,7 @@ let titleNameEn = {
   'introduce': 'Expansion',
   'introtow': '点数充值',
   'consumpdetail': {
-    0: 'Expansion Records',
+    0: 'Billing Records',
     1: '充值记录',
     2: '增值发票'
   },
@@ -215,8 +215,8 @@ export default {
   },
   watch: {
     '$route.query': function (newVal) {
-      if (newVal.lang && newVal.lang === 'en') {
-        this.$store.commit('change_language', 'en')
+      if (newVal.lang) {
+        newVal.lang === 'en' ? this.$store.commit('change_language', 'en') : this.$store.commit('change_language', '中')
       }
       this.backHome = newVal.token
       // let lang = this.$route.query.lang

mobile/src/pages/pricedetail/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="pricedetail-layout">
     <div class="plate">
+      <p class="b-title">{{langPurchase.pricename}}</p>
       <priceTable />
       <ul class="qa-con">
         <li>
@@ -40,14 +41,14 @@ export default {
   .plate {
     width: 100%;
     margin: 0 auto;
-    padding: 40px 0;
+    padding: 20px 0 40px;
     text-align: center;
     .b-title {
       font-weight: 700;
-      font-size: 28px;
+      font-size: 22px;
       color: rgba(0, 0, 0, 0.7);
       line-height: 44px;
-      margin: 0 auto 30px;
+      margin: 0 auto 20px;
     }
     .price-txt {
       text-align: left;

mobile/src/pages/purchase/index.vue

@@ -19,7 +19,8 @@
           </div>
           <div class="attr">{{langPurchase.service.key}}</div>
           <div class="box service">
-            <i class="iconfont icon-yuandian">{{langPurchase.service.type}}</i><span @click="scrollTo('rlgz')">{{langPurchase.why}}</span>
+            <i class="iconfont icon-yuandian">{{langPurchase.service.type}}</i>
+            <!-- <span @click="scrollTo('rlgz')">{{langPurchase.why}}</span> -->
             <ul>
               <li v-for="(item,i) in langPurchase.service.val" :key="i" v-html="item"></li>
             </ul>
@@ -60,7 +61,7 @@
         </div>
       </div>
     </div>
-    <div class="plate03" ref="rlgz">
+    <!-- <div class="plate03" ref="rlgz">
       <div class="p03">
         <div class="b-title">{{langPurchase.pricename}}</div>
         <priceTable/>
@@ -75,7 +76,7 @@
           <span style="width:calc(100% - 24px);margin-left:1%;">{{langPurchase.view}}</span>
         </p>
       </div>
-    </div>
+    </div> -->
     <div class="hover-btns">
       <div class="h-price">
        {{language!=='en'? `RMB ${selectParts?count*(9800 + 899):count*9800}`:'USD 1499'}}
@@ -114,7 +115,7 @@ export default {
       {
         small: 'small-0',
         big: 'big-0',
-        video: true
+        video: 'pro-post'
       }, {
         small: 'small-1',
         big: 'big-1'

mobile/src/pages/purchasezhijia/index.vue

@@ -118,7 +118,7 @@ export default {
       {
         small: 'small-0',
         big: 'big-0',
-        video: true
+        video: 'zhijia-post'
       }, {
         small: 'small-1',
         big: 'big-1'
@@ -164,7 +164,7 @@ export default {
         return this.$router.push({path: '/login'})
       }
       if (this.language === 'en') {
-        return window.open('https://www.alibaba.com/product-detail/4DKanKan-Pro-3D-camera-3D-space_62183626283.html?spm=a2700.icbuShop.74.1.66b35b10I4miJd')
+        return window.open('https://www.alibaba.com/product-detail/4DKanKan-Pro-Tripod-Set_62431649408.html?spm=a2700.icbuShop.41413.11.339877f3TUXWiN')
       }
       let zhijia = {
         goodsId: 7,

mobile/src/store/language/en/manage.js

@@ -217,7 +217,7 @@ export default{
   Spending: {
     tabList: [
       {
-        name: 'Expansion Records'
+        name: 'Billing Records'
       }
     ],
     placeholder: {

mobile/src/store/language/home_cn.js

@@ -38,6 +38,11 @@ export default {
             icon: 'icon-jingxiaoshang',
             fix: true,
             to: {name: 'agent'}
+          },
+          {
+            name: '增值服务',
+            icon: 'icon-icon_cam_zengzhi',
+            to: {name: 'pricedetail'}
           } ]
       },
       {

mobile/src/store/language/home_en.js

@@ -38,6 +38,11 @@ export default {
             icon: 'icon-jingxiaoshang',
             fix: true,
             to: {name: 'agent'}
+          },
+          {
+            name: 'Value-added service',
+            icon: 'icon-icon_cam_zengzhi',
+            to: {name: 'pricedetail'}
           }
         ]
       },

mobile/src/util/index.js

@@ -14,7 +14,7 @@ module.exports = {
   reg: {
     idCard: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|[xX])$/,
     phone: /^1(?:3\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\d|9\d)\d{8}$/,
-    email: /^([a-zA-Z0-9]+[_|_|.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|_|.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/,
+    email: /^[A-Za-z\d]+([_.-][A-Za-z\d]+)*@([A-Za-z\d]+[-.])+[A-Za-z\d]{2,4}$/,
     guhua: /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/
 
   },

pc/src/assets/font/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 941679 */
-  src: url('//at.alicdn.com/t/font_941679_itececxzw5a.eot');
-  src: url('//at.alicdn.com/t/font_941679_itececxzw5a.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_941679_itececxzw5a.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_941679_itececxzw5a.woff') format('woff'),
-  url('//at.alicdn.com/t/font_941679_itececxzw5a.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_941679_itececxzw5a.svg#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/font_941679_b0onprhnhpc.eot');
+  src: url('//at.alicdn.com/t/font_941679_b0onprhnhpc.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_941679_b0onprhnhpc.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_941679_b0onprhnhpc.woff') format('woff'),
+  url('//at.alicdn.com/t/font_941679_b0onprhnhpc.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_941679_b0onprhnhpc.svg#iconfont') format('svg');
 }
 
 .iconfont {
@@ -96,6 +96,10 @@
   content: "\e634";
 }
 
+.icon-icon_cam_zengzhi:before {
+  content: "\e6a8";
+}
+
 .icon-industry_app:before {
   content: "\e635";
 }

pc/src/components/Paging/index.vue

@@ -1,13 +1,14 @@
 <template>
   <div class="layout">
     <a @click="clickHandle(index - 1)" ></a>
-    <a @click="clickHandle(1)" :class="{active: index === 1}" >1</a><a class="more" @click="clickHandle(current - 3)" v-if="current>=5" >...</a><a
+    <a @click="clickHandle(1)" :class="{active: index === 1}" >1</a><a class="more" @click="clickHandle(current - 3)" v-if="current>5" >...</a><a
       v-if="page!==maxPage && page!==1"
       v-for="page in pages"
       :key="page"
       @click="clickHandle(page)"
       :class="{active: index === page}"
-      >{{page}}</a><a class="more" @click="clickHandle(pages[pages.length-1] + 2)" v-if="pages[pages.length-1]+2<=maxPage" >...</a><a @click="clickHandle(maxPage)" v-if="maxPage!==1" :class="{active: index === maxPage}" >{{maxPage}}</a><a @click="clickHandle(index + 1)"></a>
+      >{{page}}</a><a class="more" @click="clickHandle(pages[pages.length-1] + 2)" v-if="pages[pages.length-1]+2<=maxPage" >...</a><a @click="clickHandle(maxPage)" v-if="maxPage!==1" :class="{active: index === maxPage}" >{{maxPage}}</a>
+      <a @click="clickHandle(index + 1)"></a>
   </div>
 </template>
 

pc/src/components/browse/style.scss

@@ -1,6 +1,7 @@
 
 
 .brow-layout{
+  text-align: center;
   .product-img{
     width: 500px;
     height: 500px;
@@ -18,13 +19,14 @@
     }
   }
   ul{
-    display: flex;
-    justify-content: space-between;
+    display: inline-block;
     align-items: center;
     margin: 0 auto;
     li{
+      display: inline-block;
       width: 80px;
       height: 80px;
+      margin: 0 15px;
       text-align: center;
       background: #e7e7e7;
       flex-shrink: 0;

pc/src/components/editInvoice/edit.vue

@@ -56,9 +56,7 @@
       </div>
     </div>
     <div @click="saveInvoice(invoice)" class="btn parmary">{{langOrders.save}}</div>
-
     <div @click="$bus.$emit('isOrderInvoice', true)" class="btn">{{langOrders.cancal1}}</div>
-
   </div>
 </template>
 <script>

pc/src/page/manage/index.vue

@@ -5,7 +5,7 @@
         <template v-if="!deviceLogin">
           <div class="info">
             <div class="member">
-              <p>{{content.nickName||'--'}}</p>
+              <p>{{info.nickName||content.nickName||'--'}}</p>
               <p>{{langMain.sn}}
                 <span class="child-name" ref="selectMenu" :class="{sanjiao:isSelect,'tab-active':selectActive}" @click="selectChange">
                   {{isSelect?(activeCamera.snCode||(activeCamera.childName&&activeCamera.childName.replace('4DKKPRO_',''))):'--'}}

pc/src/page/manage/temp/consumption.vue

@@ -107,7 +107,7 @@ let statusEn = {
 let tabList = [
   {
     name: '扩容记录',
-    enName: 'Expansion Records'
+    enName: 'Billing Records'
   }, {
     name: '充值记录',
     enName: 'Top-up Records'
@@ -121,7 +121,7 @@ let tabList = [
 let tabListEn = [
   {
     name: '扩容记录',
-    enName: 'Expansion Records'
+    enName: 'Billing Records'
   }
 ]
 

pc/src/page/manage/temp/device.vue

@@ -25,7 +25,7 @@
       <template v-if="!loading" >
         <div class="d-item item" :style="{padding:language==='en'?'10px 16px':'10px 24px 10px 30px'}" v-for="(item,i) in mydevice.list" :key="i">
           <template v-if="tabActive===4">
-            <div v-if="item.isExpire&&(item.usedSpace<item.totalSpace)" class="tag expire">{{langDevices.jijiang}}</div>
+            <div v-if="item.isExpire&&(item.usedSpace<=item.totalSpace)" class="tag expire">{{langDevices.jijiang}}</div>
             <div v-if="item.usedSpace>item.totalSpace" class="tag full">{{langDevices.rongliang}}</div>
           </template>
           <div class="i-left" :style="{marginTop:tabActive===4?'15px':'25px'}">

pc/src/page/manage/temp/information.vue

@@ -471,12 +471,15 @@ export default {
   }
   .choose {
     background-color: #ddd;
-    color: #fff;
+    color: #2d2d2d;
     width: 100px;
     line-height: 26px;
     height: 26px;
     font-size: 12px;
     margin: 12px 0 20px;
+    &:hover{
+      background: #1fe4dc;
+    }
   }
   .info,
   .address,

pc/src/page/manage/temp/order.vue

@@ -367,13 +367,15 @@ $border-color: #e7e7e7;
       span {
         display: inline-block;
         vertical-align: middle;
-        &:first-child {
-          flex: 1;
-        }
         &:last-child{
           transform: translateX(11px);
           cursor: pointer;
         }
+        &:first-child {
+          flex: 1;
+          transform: translateX(0);
+          text-align: left;
+        }
       }
     }
     .o-invoice{

pc/src/page/manage/temp/scene.vue

@@ -71,7 +71,7 @@
           <div class="t-label">{{langScenes.share.shareto}}</div>
           <div class="img-share" v-for="(item,i) in imgs" :key="i">
             <div v-if="item.id === 0" class="trangle"></div>
-            <img v-if="item.id === 0 && num" class="qrcode" :src="`https://pro.4dkankan.com/sceneQRcode/${num}.png`" alt="">
+            <img v-if="item.id === 0 && num" class="qrcode" :src="`/sceneQRcode/${num}.png?rnd=${rnd}`" alt="">
             <img class="share-logo" :src="item.img" @click="toShare(item)" :alt="langScenes.share.share">
           </div>
           <p class="t-label">{{langScenes.share.qianru}}</p>
@@ -130,6 +130,7 @@ export default {
       showShare: false,
       imgs,
       num: '',
+      rnd: Math.random(),
       lwidth: 853,
       lheight: 480,
       url: 'https://pro.4dkankan.com/showProPC.html?m=KcMeJlOr8',
@@ -235,6 +236,7 @@ export default {
     handleShare (item) {
       this.url = item.webSite.replace('http://', 'https://')
       this.num = item.num
+      this.rnd = Math.random()
       this.item = item
       this.showShare = true
     },

pc/src/page/purchase/index.vue

@@ -29,7 +29,8 @@
             </div>
             <p class="title">{{langPurchase.service.key}}</p>
             <div class="detail-box sceond-box">
-              <i class="iconfont icon-yuandian">{{langPurchase.service.type}}</i> <span @click="scrollTo('rlgz')">{{langPurchase.why}}</span>
+              <i class="iconfont icon-yuandian">{{langPurchase.service.type}}</i>
+              <!-- <span @click="scrollTo('rlgz')">{{langPurchase.why}}</span> -->
               <ul>
                 <li v-for="(item, i) in langPurchase.service.val" :key="i">{{item}}</li>
               </ul>
@@ -89,7 +90,7 @@
         </div>
       </div>
     </div>
-    <div class="plate03" ref="rlgz">
+    <!-- <div class="plate03" ref="rlgz">
       <div class="p03">
         <div class="b-title">{{langPurchase.pricename}}</div>
         <priceTable/>
@@ -105,7 +106,7 @@
           <span>{{langPurchase.view}}</span>
         </p>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 

pc/src/page/purchasezhijia/index.vue

@@ -248,7 +248,6 @@ export default {
       this.count = data
     },
     gobuy () {
-      this.language === 'en' ? window.open('https://www.alibaba.com/product-detail/4DKanKan-Pro-3D-camera-3D-space_62183626283.html?spm=a2700.icbuShop.74.1.66b35b10I4miJd') : this.$router.push({name: 'purchase'})
     },
     async addcart () {
       if (!this.token) {
@@ -264,8 +263,7 @@ export default {
     },
     pay () {
       if (this.language === 'en') {
-        return
-        // return window.open('https://www.alibaba.com/product-detail/4DKanKan-Pro-3D-camera-3D-space_62183626283.html?spm=a2700.icbuShop.74.1.66b35b10I4miJd')
+        return window.open('https://www.alibaba.com/product-detail/4DKanKan-Pro-Tripod-Set_62431649408.html?spm=a2700.icbuShop.41413.11.339877f3TUXWiN')
       }
       let params = {
         type: 'detail',

pc/src/page/purchasezhijia/style.scss

@@ -49,7 +49,7 @@
   }
   .layout{
     width: 540px;
-    margin-top: 105px;
+    margin-top: 60px;
     margin-left: 8%;
     display: inline-block;
     vertical-align: top;
@@ -245,7 +245,7 @@
       .right-line {
         width: 100%;
         height: 1px;
-        background: #95979B;
+        background: #e2e2e2;
         margin-top: 15px;
       }
       .p-sub {
@@ -387,7 +387,6 @@
       margin: 0 0 0 3%!important;
     }
     .layout{
-      margin-top: 148px;
       margin-left:3%;
     }
   }

pc/src/store/language/en/manage.js

@@ -199,7 +199,7 @@ export default{
   Spending: {
     tabList: [
       {
-        name: 'Expansion Records'
+        name: 'Billing Records'
       }
     ],
     placeholder: {

pc/src/store/language/home_cn.js

@@ -44,6 +44,11 @@ export default {
           icon: 'icon-jingxiaoshang',
           name: '成为经销商<br/>&nbsp;',
           to: {name: 'agent'}
+        },
+        {
+          icon: 'icon-icon_cam_zengzhi',
+          name: '增值服务<br/>&nbsp;',
+          to: {name: 'pricedetail'}
         }
       ],
       'service_overview': [

pc/src/store/language/home_en.js

@@ -44,6 +44,11 @@ export default {
           icon: 'icon-jingxiaoshang',
           name: 'Be Our Distributor',
           to: {name: 'agent'}
+        },
+        {
+          icon: 'icon-icon_cam_zengzhi',
+          name: 'Value-added service',
+          to: {name: 'pricedetail'}
         }
       ],
       'service_overview': [

pc/src/util/index.js

@@ -16,7 +16,7 @@ module.exports = {
   reg: {
     idCard: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|[xX])$/,
     phone: /^1(?:3\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\d|9\d)\d{8}$/,
-    email: /^([a-zA-Z0-9]+[_|_|.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|_|.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/,
+    email: /^[A-Za-z\d]+([_.-][A-Za-z\d]+)*@([A-Za-z\d]+[-.])+[A-Za-z\d]{2,4}$/,
     guhua: /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/
   },
   isEmptyObject: function (obj) {