新修改提交

@@ -179,7 +179,7 @@ App({
   },
   setPhone(mobile) {
     //  console.log(mobile);
-    var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/;
+    var myreg = /^1[3456789]\d{9}$/;
     if (mobile == '') {
       wx.showToast({
         title: '手机号不能为空',

 {
   "usingComponents": {
-    "tabs": "../../Components/tabs/tabs"
+    "tabs": "../../components/tabs/tabs"
   },
   "navigationBarTitleText": "服务订单"
 }
\ No newline at end of file

 {
   "usingComponents": {
-    "searchInput": "../../Components/searchInput/searchInput"
+    "searchInput": "../../components/searchInput/searchInput"
   },
   "navigationBarTitleText": "4S店",
   "navigationBarBackgroundColor": "#e8370f",

 {
   "usingComponents": {
      "van-count-down": "@vant/weapp/count-down/index",
-        "lfy-login":"../../Components/lfylogin"
+        "lfy-login":"../../components/lfylogin"
   },
   "navigationStyle": "custom",
   "navigationBarTextStyle": "white"

 
 {
   "usingComponents": {
-    "searchInput": "../../Components/searchInput/searchInput"
+    "searchInput": "../../components/searchInput/searchInput"
   },
   "navigationBarTitleText": "小象车孚",
   "navigationBarBackgroundColor": "#F53526",

@@ -74,7 +74,7 @@ Page({
       })
       return false;
     }
-    var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/;
+    var myreg = /^1[3456789]\d{9}$/;
     if (!myreg.test(obk)) {
       wx.showToast({
         title: '手机号有误！',

@@ -50,7 +50,7 @@ Page({
       })
       return false;
     }
-    var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/;
+    var myreg = /^1[3456789]\d{9}$/;
     if (!myreg.test(obk)) {
       wx.showToast({
         title: '手机号有误！',

@@ -46,7 +46,7 @@ Page({
       })
       return false;
     }
-    var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/;
+    var myreg = /^1[3456789]\d{9}$/;
     if (!myreg.test(obk)) {
       wx.showToast({
         title: '手机号有误！',

 {
   "usingComponents": {
-    "keyboard": "../../Components/keyboard/keyboard"
+    "keyboard": "../../components/keyboard/keyboard"
   },
   "navigationBarTitleText": "添加车辆"
 }
\ No newline at end of file

 {
   "usingComponents": {
-     "keyboard": "../../Components/keyboard/keyboard"
+     "keyboard": "../../components/keyboard/keyboard"
   },
   "navigationBarTitleText": "添加车辆"
 }
\ No newline at end of file

 {
   "usingComponents": {
-    "lfy-login":"../../Components/lfylogin"
+    "lfy-login":"../../components/lfylogin"
   },
   "navigationBarTitleText": "车型详情"
 }
\ No newline at end of file

 {
   "usingComponents": {
-    "searchInput": "../../Components/searchInput/searchInput"
+    "searchInput": "../../components/searchInput/searchInput"
   },
     "navigationStyle": "custom",
   "navigationBarTextStyle": "white"

 {
   "usingComponents": {
-      "lfy-login":"../../Components/lfylogin"
+      "lfy-login":"../../components/lfylogin"
   },
   "navigationBarTitleText": "商品详情"
 }
\ No newline at end of file

@@ -46,10 +46,17 @@ Page({
     let that = this
     console.log(options);
     let token = wx.getStorageSync('token')
-    that.setData({
-      id: options.id,
-      type: options.type,
-    })
+    if(options.scene) {
+      that.setData({
+        id: options.scene,
+        type: 2,
+      })
+    } else {
+      that.setData({
+        id: options.id,
+        type: options.type,
+      })
+    }
     if (!token) {
       wx.showModal({
         title: '提示',
@@ -165,10 +172,22 @@ Page({
       url: '/pages/distributionChanged/distributionChanged?id=' + id
     })
   },
+  GOcanvas() {
+    let id = this.data.id
+    let token = wx.getStorageSync("token")
+    if (token) {
+      wx.navigateTo({
+        url: '/pages/canvasA/canvasA?id=' + id + '&type=7'
+      })
+    } else {
+      this.getToken()
+    }
+
+  },
   formSubmit(e) {
     let phone = e.detail.value.phone
     let that = this
-    if (!(/^1[345789]\d{9}$/.test(phone))) {
+    if (!(/^1[3456789]\d{9}$/.test(phone))) {
       if (phone.length >= 11) {
         wx.showToast({
           title: '手机号有误',

 {
   "usingComponents": {
     "van-count-down": "@vant/weapp/count-down/index",
-       "lfy-login":"../../Components/lfylogin"
+       "lfy-login":"../../components/lfylogin"
   },
   "navigationBarTitleText": "商品详情"
 

@@ -245,6 +245,18 @@
         text-align: left;
 
       }
+      .s_btn {
+        width: 48rpx;
+        height: 48rpx;
+
+
+        image {
+          width: 100%;
+          flex: 0 auto;
+
+        }
+
+      }
 
       .share {
         width: 48rpx;

@@ -68,6 +68,9 @@
   <view class="details3">
     <view class="smalltitle">
       <view class="title">活动详情</view>
+      <view class="s_btn" catchtap="GOcanvas">
+        <image class="bents" src="{{imagesUrl}}assets/static/img/2_icon@2x.png"></image>
+      </view>
       <button open-type="share" class="buttonShare"></button>
       <view class="share">
         <image src="{{imagesUrl}}assets/static/img/1_icon@2x.png" />

@@ -197,9 +197,18 @@
   color: #06121e;
   text-align: left;
 }
+.container .details3 .smalltitle .s_btn {
+  width: 48rpx;
+  height: 48rpx;
+}
+.container .details3 .smalltitle .s_btn image {
+  width: 100%;
+  flex: 0 auto;
+}
 .container .details3 .smalltitle .share {
   width: 48rpx;
   height: 48rpx;
+  margin-left: 16rpx;
 }
 .container .details3 .smalltitle .share image {
   width: 100%;

@@ -109,7 +109,7 @@ Page({
     if (e.detail.value.phone != '' && e.detail.value.names != '') {
       let phone = e.detail.value.phone
       if (phone.length == 11) {
-        if (!(/^1[34578]\d{9}$/.test(phone))) {
+        if (!(/^1[3456789]\d{9}$/.test(phone))) {
           wx.showToast({
             title: '手机号有误',
             icon: 'none',
@@ -205,7 +205,7 @@ Page({
               }, 1500);
             }
           } else {
-            //  console.log(that.data.jump_img);
+             console.log(that.data.jump_img);
             if (that.data.jump_img != '') {
               that.showModal()
             } else {

@@ -3,7 +3,7 @@
     "van-button": "../../miniprogram_npm/@vant/weapp/button/index",
     "van-calendar": "../../miniprogram_npm/@vant/weapp/calendar/index",
     "van-cell": "../../miniprogram_npm/@vant/weapp/cell/index",
-      "keyboard": "../../Components/keyboard/keyboard"
+      "keyboard": "../../components/keyboard/keyboard"
   },
   "navigationBarTitleText": "编辑车辆"
 }
\ No newline at end of file

 {
   "usingComponents": {
-       "lfy-login":"../../Components/lfylogin"
+       "lfy-login":"../../components/lfylogin"
   },
   "navigationBarTitleText": "商品详情"
 }
\ No newline at end of file

@@ -100,7 +100,7 @@ Page({
   blurPhone: function (e) {
     var phone = e.detail.value;
     let that = this
-    if (!(/^1[34578]\d{9}$/.test(phone))) {
+    if (!(/^1[3456789]\d{9}$/.test(phone))) {
       that.setData({
         ajxtrue: false
       })

 {
   "usingComponents": {
       "van-count-down": "@vant/weapp/count-down/index",
-      "lfy-login":"../../Components/lfylogin"
+      "lfy-login":"../../components/lfylogin"
   },
   "navigationStyle": "custom",
   "navigationBarTextStyle": "white"

 {
   "usingComponents": {
-       "keyboard": "../../Components/keyboard/keyboard"
+       "keyboard": "../../components/keyboard/keyboard"
   },
   "navigationBarTitleText": "添加车辆"
 }
\ No newline at end of file

 {
   "usingComponents": {
-      "popup":"/Components/popup/popup"
+      "popup":"/components/popup/popup"
   },
     "navigationBarTitleText": "商品详情"
 }
\ No newline at end of file

 {
   "usingComponents": {
-      "lfy-login":"../../Components/lfylogin"
+      "lfy-login":"../../components/lfylogin"
   },
   "navigationBarTitleText": "商品详情"
 }
\ No newline at end of file

@@ -95,7 +95,7 @@ Page({
   blurPhone: function (e) {
     var phone = e.detail.value;
     let that = this
-    if (!(/^1[34578]\d{9}$/.test(phone))) {
+    if (!(/^1[3456789]\d{9}$/.test(phone))) {
 
       this.setData({
         ajxtrue: false

 {
   "usingComponents": {
-      "lfy-login":"../../Components/lfylogin"
+      "lfy-login":"../../components/lfylogin"
   },
   "navigationBarTitleText": "保养商品详情"
 }
\ No newline at end of file

@@ -4,36 +4,26 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": true,
+    "urlCheck": true,
+    "scopeDataCheck": false,
+    "coverView": true,
+    "es6": false,
     "postcss": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
     "preloadBackgroundData": false,
     "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": true,
     "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
+    "newFeature": false,
     "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
     "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
+    "useIsolateContext": true,
+    "nodeModules": false,
+    "enhance": true,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
     "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": false,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
+    "showShadowRootInWxmlPanel": true,
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true

@@ -11,7 +11,14 @@
       "list": []
     },
     "miniprogram": {
-      "list": []
+      "list": [
+        {
+          "name": "商品详情",
+          "pathName": "pages/details/details",
+          "query": "id=1&type=2",
+          "scene": null
+        }
+      ]
     }
   }
 }
\ No newline at end of file