Merge branch 'master' of http://gitlab.oytour.com/huaguohao/flashman

pages/login/login.js

@@ -50,7 +50,6 @@ Page({
       loginState: loginState
     })
   },
-
   /**
    * 登录
    */
@@ -89,6 +88,10 @@ Page({
               wx.navigateBack({
                 delta: 1
               })
+              let formId = e.detail.formId
+              app.$apiSaveFormId('survey_post_SaveFormId', { formId: formId, customerId: res.id }).then(res => {
+
+              }).catch(err => { })
             }).catch(err => {
               if (err.resultCode === 10007) {
                 wx.navigateTo({

pages/login/login.wxml

@@ -30,7 +30,11 @@
         <navigator class='form_link_text' url='revisePwd/revisePwd'>修改密码</navigator>
       </view>
     </view>
-    <view class='login_btn {{loginState===true?"login_btn_true":""}}' bindtap='signIn'>登录</view>
+    <form bindsubmit="signIn" report-submit> 
+      <button hover-class="btn-hover" form-type="submit">
+        <view class='login_btn {{loginState===true?"login_btn_true":""}}'>登录</view>
+      </button>  
+    </form>
     <view class='login_wx' bindtap='signWx'>
       <image class='login_wx_image' src='../../../images/login/ico_wx.png' mode='widthFix'></image>
       <text class='login_wx_text'>微信手机号快捷登录</text>

pages/login/login.wxss

@@ -154,4 +154,17 @@
   font-size: 15px;
   color: #FFFFFF;
   white-space: nowrap;
+}
+button{
+  padding: 0;
+  font-size: 22rpx;
+  border: none;
+  background-color: transparent;
+  line-height: initial;
+}
+button::after{
+  border: none
+}
+.btn-hover{
+  background-color: transparent;
 }
\ No newline at end of file

pages/member/invesDetails/invesDetails.js

@@ -14,7 +14,7 @@ Page({
   onLoad: function (options) {
     console.log(options)
     this.setData({
-      url: "http://www.test.com:8084/html/invesDetails.html" + '?ID=' + options.ID + '&name=' + encodeURI(options.name) + '&MobilePhone=' + options.MobilePhone
+      url: "http://192.168.2.139:8084/html/invesDetails.html" + '?ID=' + options.ID + '&name=' + encodeURI(options.name) + '&MobilePhone=' + options.MobilePhone
     })
     console.log(this.data.url)
   },

pages/member/investigation/investigation.js

@@ -31,7 +31,6 @@ Page({
         let url = e.detail.target.dataset.url;
         let index = e.detail.target.dataset.index;
         let formId = e.detail.formId;
-        console.log(formId, code)
         app.$apiSaveFormId('survey_post_SaveFormId', { formId: formId, customerId: res.data.id }).then(res => {
           console.log(res)
         }).catch(err => { })

pages/member/nameList/nameList.js

@@ -21,7 +21,6 @@ Page({
         let url = e.detail.target.dataset.url;
         let index = e.detail.target.dataset.index;
         let formId = e.detail.formId
-        console.log(formId, code)
         app.$apiSaveFormId('survey_post_SaveFormId', { formId: formId, customerId: res.data.id }).then(res => {
           console.log(res)
         }).catch(err => { })

project.config.json

@@ -39,16 +39,8 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 5,
+			"current": 10,
 			"list": [
-				{
-					"id": 0,
-					"name": "产品跳详情",
-					"pathName": "pages/product/product",
-					"query": "jump=1&&id=213",
-					"scene": "1036",
-					"referrerInfo": {}
-				},
 				{
 					"id": -1,
 					"name": "产品",
@@ -64,33 +56,66 @@
 					"scene": "1036",
 					"referrerInfo": {}
 				},
+				{
+					"id": 5,
+					"name": "写游记",
+					"pathName": "pages/Voucher/write/write",
+					"query": "orderId='20914'&tcid='3037'",
+					"scene": null
+				},
 				{
 					"id": 3,
-					"name": "产品详情",
-					"pathName": "pages/product/productDetail/productDetail",
-					"query": "id=102",
-					"scene": "1036",
-					"referrerInfo": {}
+					"name": "调查",
+					"pathName": "pages/Voucher/Voucher",
+					"query": "tcid=4018",
+					"scene": null
 				},
 				{
-					"id": 4,
-					"name": "产品订单",
-					"pathName": "pages/product/productOrder/productOrder",
-					"query": "configId=102",
-					"scene": "1036",
-					"referrerInfo": {}
+					"id": 7,
+					"name": "个人中心",
+					"pathName": "pages/member/member",
+					"query": "",
+					"scene": null
 				},
 				{
-					"id": 5,
-					"name": "写游记",
-					"pathName": "pages/Voucher/write/write",
-					"query": "orderId='20914'&tcid='3037'",
+					"id": -1,
+					"name": "个人信息",
+					"pathName": "pages/member/memberInfo/memberInfo",
+					"query": "",
 					"scene": null
 				},
 				{
 					"id": -1,
-					"name": "调查",
-					"pathName": "pages/Voucher/VoucherDetails/VoucherDetails",
+					"name": "修改",
+					"pathName": "pages/member/memberInfoED/memberInfoED",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "订单中心",
+					"pathName": "pages/member/orderCenter/orderCenter",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 8,
+					"name": "getToken",
+					"pathName": "pages/login/login",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "意见调查",
+					"pathName": "pages/member/investigation/investigation",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "表格",
+					"pathName": "pages/member/invesDetails/invesDetails",
 					"query": "",
 					"scene": null
 				}