From 5656daeb79c6d4d3f9fc78f981c7faf96582d2f1 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 11 八月 2022 14:24:29 +0800
Subject: [PATCH] 登录注册模块、
---
pages/promise/promise.js | 3
pages/module_user/userlogin/userlogin.json | 3
pages/module_consult/consulthome/consulthome.wxss | 10
pages/module_user/userloginpw/userloginpw.wxml | 29 +
pages/module_user/userregistertype/userregistertype.js | 35 ++
pages/module_user/userregistergov/userregistergov.wxss | 1
pages/promise/promise.wxss | 7
service/promiseservice.js | 21 +
res/icons/re_company.png | 0
pages/module_user/userregistergov/userregistergov.json | 3
pages/module_user/userlogin/userlogin.wxss | 22 +
service/baserequest.js | 8
pages/promisefile/promisefile.wxml | 5
res/icons/re_manage.png | 0
pages/module_consult/consultresult/consultresult.js | 20 -
pages/module_consult/consultdetail/consultdetail.wxml | 3
component/inputcell/inputcell.wxml | 2
pages/module_user/userregistertype/userregistertype.json | 4
project.private.config.json | 3
pages/module_consult/consultresult/consultresult.wxss | 10
pages/module_user/userregistercompany/userregistercompany.wxml | 27 +
pages/promisesign/promisesign.wxml | 5
pages/module_user/userregistertype/userregistertype.wxss | 28 +
pages/promisefile/promisefile.json | 1
project.config.json | 7
pages/home/home.js | 6
pages/assessment/assessment.js | 4
app.wxss | 9
pages/module_consult/consulthome/consulthome.wxml | 14
pages/module_user/userloginpw/userloginpw.json | 4
pages/module_user/userregistergov/userregistergov.wxml | 2
pages/promise/promise.wxml | 5
pages/module_user/userlogin/userlogin.wxml | 9
pages/module_user/userregistergov/userregistergov.js | 66 +++
pages/module_user/userloginpw/userloginpw.wxss | 70 ++++
pages/module_user/userlogin/userlogin.js | 48 ++
pages/promisesign/promisesign.js | 7
pages/module_consult/consultdetail/consultdetail.wxss | 1
pages/module_user/userregistercompany/userregistercompany.json | 11
service/consultservice.js | 10
pages/module_consult/consultsearch/consultsearch.js | 10
component/cell/cell.wxss | 2
pages/module_consult/consultresult/consultresult.wxml | 2
pages/module_user/userregistercompany/userregistercompany.js | 150 ++++++++
pages/promiseinfo/promiseinfo.wxss | 2
app.json | 7
/dev/null | 28 -
pages/promisesign/promisesign.wxss | 4
pages/module_consult/consultdetail/consultdetail.js | 48 ++
pages/module_user/userloginpw/userloginpw.js | 125 +++++++
pages/module_user/userregistertype/userregistertype.wxml | 13
pages/module_consult/consulthome/consulthome.js | 6
pages/module_user/userregistercompany/userregistercompany.wxss | 43 ++
pages/promiseresult/promiseresult.js | 4
54 files changed, 866 insertions(+), 101 deletions(-)
diff --git a/app.json b/app.json
index 5dabcce..f19c5ce 100644
--- a/app.json
+++ b/app.json
@@ -1,5 +1,6 @@
{
"pages": [
+ "pages/module_user/userlogin/userlogin",
"pages/login/login",
"pages/home/home",
"pages/text/text",
@@ -21,7 +22,11 @@
"pages/module_consult/consultresult/consultresult",
"pages/module_consult/consultdetail/consultdetail",
"pages/module_ledger/ledgerhome/ledgerhome",
- "pages/module_ledger/ledgerupload/ledgerupload"
+ "pages/module_ledger/ledgerupload/ledgerupload",
+ "pages/module_user/userloginpw/userloginpw",
+ "pages/module_user/userregistertype/userregistertype",
+ "pages/module_user/userregistergov/userregistergov",
+ "pages/module_user/userregistercompany/userregistercompany"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/app.wxss b/app.wxss
index 628e0a5..a96fbbe 100644
--- a/app.wxss
+++ b/app.wxss
@@ -71,6 +71,11 @@
margin: 8px;
color: white;
padding: 8px;
+ text-align: center;
+}
+
+.submit:active {
+ background-color: var(--fyui-BG-COLOR-ACTIVE);
}
/********************************** 閫氱敤-end ***********************************/
@@ -250,7 +255,7 @@
width: 100%;
height: auto;
border-radius: 0px;
- font-size: medium;
+ font-size: large;
font-weight: 600;
/* background-color: greenyellow; */
}
@@ -268,7 +273,7 @@
.fyui-box__text .fyui-box__bd .fyui-box__content {
color: var(--fyui-text-color_3);
- font-size: x-small;
+ font-size: medium;
}
.fyui-box__text .fyui-box__bd .fyui-box__tag {
diff --git a/component/cell/cell.wxss b/component/cell/cell.wxss
index b9d1319..1dce7fc 100644
--- a/component/cell/cell.wxss
+++ b/component/cell/cell.wxss
@@ -4,5 +4,5 @@
.weui-cell {
padding: 10px 0px;
- font-size: 14px;
+ font-size: 16px;
}
\ No newline at end of file
diff --git a/component/inputcell/inputcell.wxml b/component/inputcell/inputcell.wxml
index 52e6cb5..61ee1f0 100644
--- a/component/inputcell/inputcell.wxml
+++ b/component/inputcell/inputcell.wxml
@@ -8,7 +8,7 @@
<input wx:if="{{item.input}}" type="{{item.type?item.type:'text'}}"
maxlength="{{item.maxLength?item.maxLength:'-1'}}" id="{{item.id?item.id:''}}"
placeholder-style="color:{{item.noValue?'red':'#B2B2B2'}};" class="weui-up-input {{inputClass}} {{alignLeft?'':'input-right'}}"
- bindinput="changeV" value="{{item.value}}" placeholder="璇疯緭鍏{item.name}}" />
+ bindinput="changeV" value="{{item.value}}" placeholder="{{item.placeholder ? item.placeholder : '璇疯緭鍏�' + item.name}} " />
<view wx:else="{{text}}" class="weui-up-input {{inputClass}} {{alignLeft?'':'input-right'}}">{{item.value}}</view>
<view class="unit">{{item.unit}}</view>
</view>
diff --git a/component/sign/sign.js b/component/sign/sign.js
deleted file mode 100644
index 2c2e26f..0000000
--- a/component/sign/sign.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// component/sign/sign.js
-Component({
- options: {
- addGlobalClass: true
- },
- /**
- * 缁勪欢鐨勫睘鎬у垪琛�
- */
- properties: {
- show: {
- type: Boolean,
- value: false
- },
- title: {
- type: String,
- value: "鎵嬪啓绛惧悕"
- },
- yes: {
- type: String,
- value: "纭畾"
- },
- no: {
- type: String,
- value: "鍙栨秷"
- },
- showBtn: {
- type: Boolean,
- value: true
- }
- },
-
- /**
- * 缁勪欢鐨勫垵濮嬫暟鎹�
- */
- data: {
-
- },
-
- //鍐冲畾鏄惁缁樺埗鐨勬渶灏忓儚绱犺窛绂�
- TOUCH_TOLERANCE: 4,
-
- // pageLifetimes: {
- // show: function () {
- // this.init()
- // }
- // },
-
- onReady: function () {
- this.init()
- },
-
- /**
- * 缁勪欢鐨勬柟娉曞垪琛�
- */
- methods: {
- init: function () {
- wx.createSelectorQuery().in(this)
- .select('.sign-canvas')
- .fields({ node: true, size: true })
- .exec((res) => {
- //Canvas 瀵硅薄
- const canvas = res[0].node
- //娓叉煋涓婁笅鏂�
- const ctx = canvas.getContext('2d')
-
- //Canvas鐢诲竷鐨勫疄闄呯粯鍒堕珮搴�
- this.width = res[0].width
- this.height = res[0].height
-
- //鍒濆鍖栫敾甯冨ぇ灏�
- const dpr = wx.getWindowInfo().pixelRatio
- canvas.width = this.width * dpr
- canvas.height = this.height * dpr
- ctx.scale(dpr, dpr)
-
- this.canvas = canvas
- this.ctx = ctx
- })
- },
- touchStart(e) {
- if (this.canvas && e.touches.length > 0) {
- var t = e.touches[0];
- this.ctx.moveTo(t.x, t.y)
- this.tempX = t.x
- this.tempY = t.y
- }
- },
- touchMove(e) {
- if (this.canvas && e.touches.length > 0) {
- var t = e.touches[0];
- var dx = Math.abs(t.x - this.tempX)
- var dy = Math.abs(t.y - this.tempY)
- if (dx >= this.TOUCH_TOLERANCE || dy >= this.TOUCH_TOLERANCE) {
- this.ctx.lineTo(t.x, t.y)
- this.ctx.stroke()
- this.tempX = t.x
- this.tempY = t.y
- }
- }
- },
- touchEnd(e) {
- if (this.canvas && e.touches.length > 0) {
- var t = e.touches[0];
- this.ctx.lineTo(t.x, t.y)
- this.ctx.stroke()
- }
- },
- onClose(e) {
- this.setData({
- show: false
- })
- this.ctx.clearRect(0, 0, this.width, this.height)
- this.triggerEvent('close')
- },
- onCancel(e) {
- this.ctx.clearRect(0, 0, this.width, this.height)
- },
- onConfirm(e) {
- this.ctx.closePath()
- wx.canvasToTempFilePath({
- canvas: this.canvas,
- success(res) {
- this.triggerEvent('confirm', {
- path: res
- })
- },
- fail(res) {
-
- },
- complete(res) {
-
- }
- })
- }
- }
-})
\ No newline at end of file
diff --git a/component/sign/sign.json b/component/sign/sign.json
deleted file mode 100644
index 68ffa25..0000000
--- a/component/sign/sign.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "component": true,
- "usingComponents": {
- "mp-icon": "../icon/icon"
- }
-}
\ No newline at end of file
diff --git a/component/sign/sign.wxml b/component/sign/sign.wxml
deleted file mode 100644
index 0aa2a08..0000000
--- a/component/sign/sign.wxml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--component/sign/sign.wxml-->
-<view class="" wx:if="{{show}}">
- <view class="weui-mask"></view>
- <view class="weui-dialog">
- <!-- <mp-icon bindtap="onClose" class="top-right" type="field" icon="close2" color="gray" size="{{25}}"></mp-icon> -->
- <view class="weui-dialog__hd">
- <strong class="weui-dialog__title">
- {{title}}
- <slot name="title"></slot>
- </strong>
- </view>
- <view class="weui-dialog__bd">
- <canvas id="signCanvas" type="2d" class="sign-canvas" bindtouchstart="touchStart" bindtouchmove="touchMove"
- bindtouchend="touchEnd"></canvas>
- <slot></slot>
- </view>
- <view wx:if="{{showBtn}}" class="weui-dialog__ft">
- <a class="weui-dialog__btn weui-dialog__btn_default" bindtap="onCancel">{{no}}</a>
- <a class="weui-dialog__btn weui-dialog__btn_primary" bindtap="onConfirm">{{yes}}</a>
- </view>
- </view>
-</view>
\ No newline at end of file
diff --git a/component/sign/sign.wxss b/component/sign/sign.wxss
deleted file mode 100644
index f999eac..0000000
--- a/component/sign/sign.wxss
+++ /dev/null
@@ -1,28 +0,0 @@
-/* component/sign/sign.wxss */
-.ffui-dialog-btn {
- background-color: #0963F5;
- color: white;
-}
-
-.weui-dialog__bd {
- color: black;
- font-size: var(--ffui-font-size-2);
-}
-
-.weui-dialog__btn:active {
- background-color: #4d91ff
-}
-
-.sign-canvas {
- border: 1px solid;
- width: 300px;
- height: 150px;
-}
-
-.top-right {
- position: fixed;
- right: 0;
- top: 0;
- margin-top: 6px;
- margin-right: 6px;
-}
\ No newline at end of file
diff --git a/pages/assessment/assessment.js b/pages/assessment/assessment.js
index 938a09d..d9e9cfd 100644
--- a/pages/assessment/assessment.js
+++ b/pages/assessment/assessment.js
@@ -46,8 +46,8 @@
grid: {
x: 30,
y: 30,
- x2: 35,
- y2: 53
+ x2: 37,
+ y2: 60
},
series: [{
diff --git a/pages/home/home.js b/pages/home/home.js
index c8044e1..d77d1db 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -154,11 +154,15 @@
// url = "/pages/text/text"
let bodyUrl = e.currentTarget.dataset.url
let fileType = e.currentTarget.dataset.filetype
+ wx.showLoading({
+ title: ' 鏂囦欢涓嬭浇涓�',
+ mask: true,
+ })
wx.downloadFile({
url: bodyUrl,
success: function (res) {
+ wx.hideLoading()
const filePath = res.tempFilePath
- var t = filePath.split('.')[filePath.split('.').length - 1]
wx.openDocument({
filePath: filePath,
success: function (res) {
diff --git a/pages/module_consult/consultdetail/consultdetail.js b/pages/module_consult/consultdetail/consultdetail.js
index f1ab91e..692712d 100644
--- a/pages/module_consult/consultdetail/consultdetail.js
+++ b/pages/module_consult/consultdetail/consultdetail.js
@@ -18,14 +18,14 @@
*/
onLoad(options) {
var that = this
- // this.getOpenerEventChannel().on('acceptDataFromOpenerPage', function (data) {
- // that.setData({
- // fileId: data.fileId
- // })
+ this.getOpenerEventChannel().on('acceptDataFromOpenerPage', function (data) {
+ that.setData({
+ fileId: data.fileId
+ })
- // that.getFile()
- // })
- that.getFile()
+ that.getFile()
+ })
+ // that.getFile()
},
/**
@@ -75,5 +75,39 @@
} else {
return undefined
}
+ },
+
+ openFile () {
+ let content = this.data.content
+ if (content.mfFileUrl == undefined || content.mfFileUrl == null || content.mfFileUrl.length == 0) {
+ wx.showToast({
+ title: '鏂囦欢鏆傛椂鏃犳硶璁块棶',
+ duration: 1000,
+ icon: 'none',
+ mask: true,
+ })
+ return
+ }
+ console.log(content.mfFileUrl);
+ wx.showLoading({
+ title: ' 鏂囦欢涓嬭浇涓�',
+ mask: true,
+ })
+ wx.downloadFile({
+ url: content.mfFileUrl,
+ success: function (res) {
+ wx.hideLoading()
+ const filePath = res.tempFilePath
+ wx.openDocument({
+ filePath: filePath,
+ success: function (res) {
+ console.log('鎵撳紑鏂囨。鎴愬姛')
+ },
+ fail (error) {
+ console.log(error);
+ }
+ })
+ }
+ })
}
})
\ No newline at end of file
diff --git a/pages/module_consult/consultdetail/consultdetail.wxml b/pages/module_consult/consultdetail/consultdetail.wxml
index acbb0ff..a716e97 100644
--- a/pages/module_consult/consultdetail/consultdetail.wxml
+++ b/pages/module_consult/consultdetail/consultdetail.wxml
@@ -23,12 +23,13 @@
</view>
<view class="fyui-panel">
<view>鏂囦欢绫诲埆锛歿{content.mfFileType}}</view>
- <view>鏂囦欢涓嬭浇</view>
+ <!-- <view>鏂囦欢涓嬭浇</view> -->
</view>
<view class="fyui-panel">
<view>鍏抽敭璇嶏細{{content.mfKeywordLv1}}</view>
</view>
</view>
<view class="page__ft">
+ <view class="submit" bindtap="openFile">鏌ョ湅鏂囦欢</view>
</view>
</view>
\ No newline at end of file
diff --git a/pages/module_consult/consultdetail/consultdetail.wxss b/pages/module_consult/consultdetail/consultdetail.wxss
index 1f71df5..83a0019 100644
--- a/pages/module_consult/consultdetail/consultdetail.wxss
+++ b/pages/module_consult/consultdetail/consultdetail.wxss
@@ -13,6 +13,7 @@
font-size: 12px;
color: var(--fyui-text-color_2);
text-align: end;
+ margin-bottom: 16px;
}
.f-summary {
diff --git a/pages/module_consult/consulthome/consulthome.js b/pages/module_consult/consulthome/consulthome.js
index 27ce796..0495b25 100644
--- a/pages/module_consult/consulthome/consulthome.js
+++ b/pages/module_consult/consulthome/consulthome.js
@@ -42,6 +42,12 @@
},
+ gotoSearch () {
+ wx.navigateTo({
+ url: "/pages/module_consult/consultsearch/consultsearch"
+ })
+ },
+
goto (e) {
var url = ""
var index = e.currentTarget.dataset.index
diff --git a/pages/module_consult/consulthome/consulthome.wxml b/pages/module_consult/consulthome/consulthome.wxml
index f6cb68b..bcc321b 100644
--- a/pages/module_consult/consulthome/consulthome.wxml
+++ b/pages/module_consult/consulthome/consulthome.wxml
@@ -1,7 +1,7 @@
<!--pages/module_consult/consulthome/consulthome.wxml-->
<view class="page">
<view class="page__hd">
- <view class="search-bar" bindtap="search">
+ <view class="search-bar" bindtap="gotoSearch">
<mp-icon icon="search" size="15" color="black"></mp-icon>
<text>{{searchTips}}</text>
</view>
@@ -9,21 +9,21 @@
<view class="page__bd">
<view class="flex-h">
<view class="card" bindtap="goto" data-index="0">
- <image src="/res/icons/con_pro_bg.png" class="card-bg" mode="scaleToFill"/>
+ <image src="/res/icons/con_pro_bg.png" class="card-bg" mode="scaleToFill" />
<view class="card-title">甯歌闂</view>
<view class="card-abstract">甯歌浼佷笟鐜繚闂</view>
<image src="/res/icons/con_pro.png" mode="aspectFit" class="icon"></image>
</view>
<view class="divider"></view>
<view class="card middle" bindtap="goto" data-index="1">
- <image src="/res/icons/con_lib_bg.png" class="card-bg" mode="scaleToFill"/>
+ <image src="/res/icons/con_lib_bg.png" class="card-bg" mode="scaleToFill" />
<view class="card-title">鐜繚鐭ヨ瘑搴�</view>
<view class="card-abstract">鐜繚娉曞緥娉曡</view>
<image src="/res/icons/con_lib.png" mode="aspectFit" class="icon"></image>
</view>
<view class="divider"></view>
<view class="card" bindtap="goto" data-index="2">
- <image src="/res/icons/con_qa_bg.png" class="card-bg" mode="scaleToFill"/>
+ <image src="/res/icons/con_qa_bg.png" class="card-bg" mode="scaleToFill" />
<view class="card-title">鏅鸿兘鍜ㄨ</view>
<view class="card-abstract">鐜繚涓撳 鍦ㄧ嚎鍜ㄨ</view>
<image src="/res/icons/con_qa.png" mode="aspectFit" class="icon"></image>
@@ -55,11 +55,13 @@
</view>
<view class="fyui-box__bd">
<view class="fyui-box__content tag">鐩稿叧琛屼笟 -> {{item.fileIndustry}}</view>
- <view class="fyui-box__content">{{item.des}}</view>
+ <view class="fyui-box__content des">{{item.des}}</view>
</view>
<view class="fyui-box__ft">
<text class="keyword">鍏抽敭璇嶏細</text>
- <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i" >{{word}}</text></view>
+ <view class="keyword-item">
+ <text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text>
+ </view>
</view>
</view>
</view>
diff --git a/pages/module_consult/consulthome/consulthome.wxss b/pages/module_consult/consulthome/consulthome.wxss
index 4d97642..d86da21 100644
--- a/pages/module_consult/consulthome/consulthome.wxss
+++ b/pages/module_consult/consulthome/consulthome.wxss
@@ -62,6 +62,7 @@
white-space: nowrap;
}
.keyword-item {
+ display: flex;
justify-content: flex-start;
flex-wrap: wrap;
}
@@ -73,6 +74,15 @@
color: #2c7064;
}
+.des {
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 4;
+ width: 100%;
+ overflow: hidden;
+ /* text-overflow: ellipsis; */
+}
+
.tag {
margin-bottom: 8px;
}
\ No newline at end of file
diff --git a/pages/module_consult/consultresult/consultresult.js b/pages/module_consult/consultresult/consultresult.js
index 72ddddb..05c2a12 100644
--- a/pages/module_consult/consultresult/consultresult.js
+++ b/pages/module_consult/consultresult/consultresult.js
@@ -9,25 +9,7 @@
*/
data: {
keyword: 'asdad',
- result: [{
- id: '',
- name: '娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡',
- des: '娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡',
- fileIndustry: '鐢熸�佺幆澧�',
- itemType: '澶ф皵',
- fileUrl: '',
- keywords: ['鐢熸�佺幆澧�', '澶ф皵', '鐢熸�佺幆澧�', '澶ф皵澶�', '澶ф皵', '澶ф皵', '澶ф皵澶ф皵澶ф皵澶ф皵澶ф皵澶ф皵'],
- time: ''
- },{
- id: '',
- name: '娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡',
- des: '娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡娉曞緥娉曡',
- fileIndustry: '鐢熸�佺幆澧�',
- itemType: '澶ф皵',
- fileUrl: '',
- keywords: ['鐢熸�佺幆澧�', '澶ф皵', '鐢熸�佺幆澧�', '澶ф皵澶�', '澶ф皵', '澶ф皵', '澶ф皵澶ф皵澶ф皵澶ф皵澶ф皵澶ф皵'],
- time: ''
- }]
+ result: []
},
/**
diff --git a/pages/module_consult/consultresult/consultresult.wxml b/pages/module_consult/consultresult/consultresult.wxml
index de9172c..78e8d38 100644
--- a/pages/module_consult/consultresult/consultresult.wxml
+++ b/pages/module_consult/consultresult/consultresult.wxml
@@ -12,7 +12,7 @@
</view>
<view class="fyui-box__bd">
<view class="fyui-box__content tag">鐩稿叧琛屼笟 -> {{item.fileIndustry}}</view>
- <view class="fyui-box__content">{{item.des}}</view>
+ <view class="fyui-box__content des">{{item.des}}</view>
</view>
<view class="fyui-box__ft">
<text class="keyword">鍏抽敭璇嶏細</text>
diff --git a/pages/module_consult/consultresult/consultresult.wxss b/pages/module_consult/consultresult/consultresult.wxss
index a3fe791..bd08e33 100644
--- a/pages/module_consult/consultresult/consultresult.wxss
+++ b/pages/module_consult/consultresult/consultresult.wxss
@@ -3,6 +3,7 @@
white-space: nowrap;
}
.keyword-item {
+ display: flex;
justify-content: flex-start;
flex-wrap: wrap;
}
@@ -14,6 +15,15 @@
color: #2c7064;
}
+.des {
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 4;
+ width: 100%;
+ overflow: hidden;
+ /* text-overflow: ellipsis; */
+}
+
.tag {
margin-bottom: 8px;
}
\ No newline at end of file
diff --git a/pages/module_consult/consultsearch/consultsearch.js b/pages/module_consult/consultsearch/consultsearch.js
index d1008e3..cfe3cbe 100644
--- a/pages/module_consult/consultsearch/consultsearch.js
+++ b/pages/module_consult/consultsearch/consultsearch.js
@@ -11,15 +11,9 @@
placeholder: '鎼滅储',
value: '',
- history: ['a', 'b'],
+ history: [],
- hotTopic: [{
- name: '鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬鐑棬'
- },{
- name: 't2'
- },{
- name: 't3'
- }],
+ hotTopic: [],
},
/**
diff --git a/pages/module_user/userlogin/userlogin.js b/pages/module_user/userlogin/userlogin.js
new file mode 100644
index 0000000..3c122d1
--- /dev/null
+++ b/pages/module_user/userlogin/userlogin.js
@@ -0,0 +1,48 @@
+// pages/module_user/userlogin/userlogin.js
+const $f = require("../../../service//baserequest")
+const userservice = require("../../../service/userservice")
+const app = getApp()
+
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ bgPath: $f.baseIconUrl + 'userlogin-1.png'
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow: function () {
+
+ },
+
+ loginWx() {
+
+ },
+
+ gotoLogin() {
+ wx.navigateTo({
+ url: '/pages/module_user/userloginpw/userloginpw',
+ success: (result) => {},
+ fail: (res) => {},
+ complete: (res) => {},
+ })
+ }
+})
\ No newline at end of file
diff --git a/pages/module_user/userlogin/userlogin.json b/pages/module_user/userlogin/userlogin.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/module_user/userlogin/userlogin.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/module_user/userlogin/userlogin.wxml b/pages/module_user/userlogin/userlogin.wxml
new file mode 100644
index 0000000..51dc1ad
--- /dev/null
+++ b/pages/module_user/userlogin/userlogin.wxml
@@ -0,0 +1,9 @@
+<!--pages/module_user/userlogin/userlogin.wxml-->
+<view>
+ <image class="banner-bg" src="{{bgPath}}"></image>
+ <view class="login-btn">
+ <view class="submit" bindtap="loginWx">寰俊鐢ㄦ埛涓�閿櫥褰�</view>
+ <view class="login-btn_text" bindtap="gotoLogin">璐﹀彿瀵嗙爜鐧诲綍/娉ㄥ唽</view>
+ </view>
+
+</view>
\ No newline at end of file
diff --git a/pages/module_user/userlogin/userlogin.wxss b/pages/module_user/userlogin/userlogin.wxss
new file mode 100644
index 0000000..ba9cc32
--- /dev/null
+++ b/pages/module_user/userlogin/userlogin.wxss
@@ -0,0 +1,22 @@
+/* pages/module_user/userlogin/userlogin.wxss */
+.banner-bg {
+ z-index: -1;
+ position: fixed;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ /* background-color: aqua; */
+}
+
+.login-btn {
+ margin-top: 50vh;
+ text-align: center;
+}
+
+.login-btn_text {
+ color: #2F655B;
+}
+
+.login-btn_text:active {
+ color: #2f655b71;
+}
\ No newline at end of file
diff --git a/pages/module_user/userloginpw/userloginpw.js b/pages/module_user/userloginpw/userloginpw.js
new file mode 100644
index 0000000..2399e05
--- /dev/null
+++ b/pages/module_user/userloginpw/userloginpw.js
@@ -0,0 +1,125 @@
+// pages/module_user/userloginpw/userloginpw.js
+const userservice = require("../../../service/userservice")
+const app = getApp()
+
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ userName: "",
+ password: "",
+ loading: false
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+
+ onReady() {
+ var that = this
+ //鑾峰彇缂撳瓨鐨勭敤鎴疯处鎴峰瘑鐮�
+ wx.getStorage({
+ key: 'accessToken',
+ success(res) {
+ app.globalData.accessToken = res.data
+ that.setData({
+ userName: res.data.userName,
+ password: res.data.password
+ })
+ },
+ })
+ },
+
+ inputUserName (e) {
+ this.setData({
+ userName: e.detail.value
+ });
+ },
+
+ inputPassword (e) {
+ this.setData({
+ password: e.detail.value
+ });
+ },
+
+ login() {
+ if (this.data.userName == '') {
+ wx.showToast({
+ title: '璇疯緭鍏ヨ处鎴�',
+ icon: 'none'
+ })
+ return
+ }
+ if (this.data.password == '') {
+ wx.showToast({
+ title: '璇疯緭鍏ュ瘑鐮�',
+ icon: 'none'
+ })
+ return
+ }
+ var that = this
+ this.setData({
+ loading: true
+ })
+ userservice.login(this.data.userName, this.data.password, {
+ success (data) {
+ if (data.success) {
+ app.globalData.accessToken = {
+ userName: that.data.userName,
+ password: that.data.password,
+ userId: data.userId,
+ suserId: data.suserId,
+ }
+ wx.setStorage({
+ key: 'accessToken',
+ data: app.globalData.accessToken,
+ })
+ that.getUserInfo()
+ } else {
+ wx.showToast({
+ title: '璐︽埛鎴栧瘑鐮侀敊璇�',
+ duration: 1000,
+ icon: 'none',
+ })
+ }
+ },
+ complete () {
+ that.setData({
+ loading: false
+ })
+ }
+ })
+ },
+
+ getUserInfo() {
+ var that = this
+ userservice.getUserInfo(app.globalData.accessToken.userId, {
+ success(data) {
+ app.globalData.userInfo = data
+ wx.setStorage({
+ key: 'userInfo',
+ data: data,
+ success: (result) => {
+ wx.switchTab({
+ url: '/pages/home/home',
+ })
+ }
+ })
+ }
+ })
+ },
+
+ gotoRegister() {
+ wx.navigateTo({
+ url: '/pages/module_user/userregistertype/userregistertype',
+ success: (result) => {},
+ fail: (res) => {},
+ complete: (res) => {},
+ })
+ }
+})
\ No newline at end of file
diff --git a/pages/module_user/userloginpw/userloginpw.json b/pages/module_user/userloginpw/userloginpw.json
new file mode 100644
index 0000000..e301e43
--- /dev/null
+++ b/pages/module_user/userloginpw/userloginpw.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "鐧诲綍",
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/module_user/userloginpw/userloginpw.wxml b/pages/module_user/userloginpw/userloginpw.wxml
new file mode 100644
index 0000000..fe7cb7b
--- /dev/null
+++ b/pages/module_user/userloginpw/userloginpw.wxml
@@ -0,0 +1,29 @@
+<!--pages/module_user/userloginpw/userloginpw.wxml-->
+<view class="page">
+ <view class="login-container">
+ <view class="user-info">
+ <view class="user-info_item">
+ <text>璐﹀彿锛�</text>
+ <input type="text" placeholder="璇疯緭鍏ヨ处鍙�" value="{{userName}}" bindinput="inputUserName" />
+ </view>
+ <view class="user-info_item">
+ <text>瀵嗙爜锛�</text>
+ <input type="password" placeholder="璇疯緭鍏ュ瘑鐮�" value="{{password}}" bindinput="inputPassword" />
+ </view>
+ </view>
+ <button class="bottom-btn {{password.length > 0 ? 'bottom-btn_active' : ''}}" bindtap="login" loading="{{loading}}" disabled="{{password.length == 0}}">
+ 鐧诲綍
+ </button>
+ <view class="login-btn_text" bindtap="gotoRegister">鍘绘敞鍐�</view>
+ <!-- <view>
+ <label class="weui-agree" bindtap="checkboxChange">
+ <checkbox class="weui-agree__checkbox-check" value="agree" checked="{{agree}}"/>
+ <span class="weui-agree__checkbox"></span>
+ <span class="weui-agree__text">闃呰骞跺悓鎰忎互涓嬭鏄�</span>
+ </label>
+ </view>
+ <view>
+ <view class="agree-text">鏈皬绋嬪簭鐢ㄤ簬浼佷笟姹℃按鎶借繍璁板綍涓婃姤锛岃鐢ㄦ埛鐭ユ倝</view>
+ </view> -->
+ </view>
+</view>
\ No newline at end of file
diff --git a/pages/module_user/userloginpw/userloginpw.wxss b/pages/module_user/userloginpw/userloginpw.wxss
new file mode 100644
index 0000000..43131f9
--- /dev/null
+++ b/pages/module_user/userloginpw/userloginpw.wxss
@@ -0,0 +1,70 @@
+/* pages/module_user/userloginpw/userloginpw.wxss */
+.login-container{
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ align-items: center;
+ height: 100vh;
+ z-index: 1;
+ background-color: white;
+}
+
+.bottom-btn{
+ width: 90% !important;
+ color: #828282;
+ background-color: #EEEEEE;
+ margin-top: 80px;
+}
+
+.bottom-btn_active {
+ color: white;
+ background: linear-gradient(to right, #6DF1A9, #62EBCF);
+}
+
+
+.agree-text {
+ width: 70vw;
+ text-align: center;
+ font-size: 12px;
+ color: #b8b8b8;
+ margin-top: 12rpx;
+}
+
+.user-info {
+ font-size: 20px;
+ width: 100%;
+ /* background-color: burlywood; */
+ margin-top: 30px;
+}
+.user-info_item {
+ display: flex;
+ justify-content: flex-start;
+ align-items: flex-start;
+ margin-bottom: 8px;
+ padding: 8px 30px;
+}
+
+.user-info_item>text{
+ color: var(--fyui-text-color_1);
+ line-height: 30px;
+ white-space: nowrap;
+ font-weight: 600;
+}
+
+.user-info_item>input{
+ height: 30px;
+ line-height: 30px;
+ width: 100%;
+ border-bottom: #929292 1px solid;
+ background-color: white;
+ font-size: medium;
+}
+
+.login-btn_text {
+ margin-top: 24px;
+ color: #2F655B;
+}
+
+.login-btn_text:active {
+ color: #2f655b71;
+}
\ No newline at end of file
diff --git a/pages/module_user/userregistercompany/userregistercompany.js b/pages/module_user/userregistercompany/userregistercompany.js
new file mode 100644
index 0000000..ad1417c
--- /dev/null
+++ b/pages/module_user/userregistercompany/userregistercompany.js
@@ -0,0 +1,150 @@
+// pages/module_user/userregistercompany/userregistercompany.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ sceneTypes: [
+ {value: '1', name: '椁愰ギ'},
+ {value: '2', name: '宸ュ湴'},
+ {value: '3', name: '鐮佸ご'},
+ {value: '4', name: '鍫嗗満'},
+ {value: '5', name: '鎼呮媽绔�' },
+ {value: '6', name: '宸ヤ笟浼佷笟' },
+ {value: '7', name: '姹戒慨'},
+ ],
+ sceneTypeIndex: 0,
+
+ imgFiles: [],
+
+ msg: [{
+ name: "璐﹀彿",
+ id: "username",
+ input: true,
+ value: "",
+ noValue: false
+ },
+ {
+ name: "瀵嗙爜",
+ id: "password",
+ input: true,
+ type: 'password',
+ placeholder: '璇疯緭鍏ュ瘑鐮侊紙鏈�澶�20浣嶏級',
+ maxLength: 20,
+ value: "",
+ noValue: false
+ },
+ {
+ name: "纭瀵嗙爜",
+ id: "number",
+ input: true,
+ type: 'password',
+ placeholder: '璇峰啀娆＄‘璁ゅ瘑鐮�',
+ maxLength: 20,
+ value: "",
+ noValue: false,
+ },
+ {
+ name: "鍏徃鍚嶇О",
+ id: "department",
+ input: true,
+ value: '',
+ noValue: false,
+ required: false
+ },
+ {
+ name: "淇＄敤浠ｇ爜",
+ id: "code",
+ input: true,
+ value: "",
+ noValue: false,
+ required: false
+ },
+ ],
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+
+ changeSceneType(e) {
+ let i = e.detail.value
+ this.setData({
+ sceneTypeIndex: i
+ })
+ },
+
+ changeMsg(e) {
+ let id = e.detail.params.id
+ let value = e.detail.params.value
+ let msg = this.data.msg
+ let msgLength = msg.length
+ for (let i = 0; i < msgLength; i++) {
+ if (msg[i].id === id) {
+ let path = "msg[" + i + "].value"
+ let nPath = "msg[" + i + "].noValue"
+ this.setData({
+ [path]: value,
+ [nPath]: false
+ })
+ }
+ }
+ },
+
+ uploadFile(file) {
+ let data = file.detail.newFiles
+ data.forEach(element => {
+ element.loading = false
+ });
+ this.setData({
+ imgFiles: data
+ })
+ },
+
+ onSubmit: function () {
+ if (!this.submitCheck()) return
+
+
+ },
+
+ /**
+ * 淇℃伅瀹屾暣搴︽鏌�
+ */
+ submitCheck() {
+ let msg = this.data.msg
+ let msgLength = msg.length
+ //纭淇℃伅瀹屾暣搴�
+ for (let i = 0; i < msgLength; i++) {
+ if (msg[i].required != false && msg[i].value === "") {
+ let error = msg[i].name + "涓嶅彲涓虹┖"
+ let path = "msg[" + i + "].noValue"
+ this.setData({
+ errorMsg: error,
+ [path]: true
+ })
+
+ wx.pageScrollTo({
+ duration: 300,
+ scrollTop: 0,
+ // selector:"#" + msg[i].id,
+ })
+ return false
+ }
+ }
+
+ //瀵嗙爜涓�鑷存�х‘璁�
+ if (msg[1].value != msg[2].value) {
+ let error = "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�"
+ this.setData({
+ errorMsg: error,
+ })
+ return false
+ }
+
+ return true
+ }
+})
\ No newline at end of file
diff --git a/pages/module_user/userregistercompany/userregistercompany.json b/pages/module_user/userregistercompany/userregistercompany.json
new file mode 100644
index 0000000..6ea54dc
--- /dev/null
+++ b/pages/module_user/userregistercompany/userregistercompany.json
@@ -0,0 +1,11 @@
+{
+ "navigationBarTitleText": "浼佷笟璐︽埛娉ㄥ唽",
+ "usingComponents": {
+ "mp-cells":"/component/cells/cells",
+ "mp-cell":"/component/cell/cell",
+ "input-cell":"/component/inputcell/inputcell",
+ "mp-toptips":"/component/toptips/toptips",
+ "mp-icon": "/component/icon/icon",
+ "mp-upload":"/component/uploader/uploader"
+ }
+}
\ No newline at end of file
diff --git a/pages/module_user/userregistercompany/userregistercompany.wxml b/pages/module_user/userregistercompany/userregistercompany.wxml
new file mode 100644
index 0000000..77224d3
--- /dev/null
+++ b/pages/module_user/userregistercompany/userregistercompany.wxml
@@ -0,0 +1,27 @@
+<!--pages/module_user/userregistercompany/userregistercompany.wxml-->
+<view class="page">
+ <mp-toptips type="error" msg="{{errorMsg}}" show="{{errorMsg}}" delay="2000"></mp-toptips>
+
+ <view class="page__bd">
+ <view class="top-card">
+ <view class="tag">浼佷笟绫诲瀷</view>
+ <picker mode="selector" bindchange="changeSceneType" value="{{sceneTypeIndex}}" range="{{sceneTypes}}" range-key="name" class="value">
+ <view>{{sceneTypes[sceneTypeIndex].name}}</view>
+ </picker>
+ <mp-icon icon="arrow" color="#7F7F7F" size="{{10}}"></mp-icon>
+ </view>
+
+ <view class="items">
+ <mp-cells>
+ <input-cell wx:for="{{msg}}" wx:key="id" item="{{item}}" bindpassValue="changeMsg"></input-cell>
+ </mp-cells>
+ </view>
+
+ <view class="weui-upload-view">
+ <mp-upload title="涓婁紶钀ヤ笟鎵х収" titleClass="upload-title-class" max-count="1" files="{{imgFiles}}" binduploadImg="uploadFile" binddelete="delImg"></mp-upload>
+ </view>
+ </view>
+ <view class="page__ft">
+ <view class="submit" bindtap="onSubmit">鎻愪氦</view>
+ </view>
+</view>
\ No newline at end of file
diff --git a/pages/module_user/userregistercompany/userregistercompany.wxss b/pages/module_user/userregistercompany/userregistercompany.wxss
new file mode 100644
index 0000000..fb01949
--- /dev/null
+++ b/pages/module_user/userregistercompany/userregistercompany.wxss
@@ -0,0 +1,43 @@
+/* pages/module_user/userregistercompany/userregistercompany.wxss */
+.top-card {
+ /* position: relative; */
+ display: flex;
+ flex-direction: row;
+ background-color: white;
+ border-radius: 4px;
+ /* margin: 0px 8px 8px 8px; */
+ margin-top: 8px;
+ padding: 8px;
+ font-size: 16px;
+}
+
+.items {
+ padding: 0 8px;
+ background-color: white;
+}
+
+.top-card .tag {
+ /* display: inline-block; */
+ width: 105px;
+ white-space: nowrap;
+}
+
+.top-card .value {
+ flex-grow: 1;
+}
+
+.top-card .value view {
+ max-width: 200px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.weui-upload-view {
+ background-color: white;
+ padding: 8px;
+}
+
+.page__ft {
+ background-color: white;
+}
\ No newline at end of file
diff --git a/pages/module_user/userregistergov/userregistergov.js b/pages/module_user/userregistergov/userregistergov.js
new file mode 100644
index 0000000..35fcbdb
--- /dev/null
+++ b/pages/module_user/userregistergov/userregistergov.js
@@ -0,0 +1,66 @@
+// pages/module_user/userregistergov/userregistergov.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/module_user/userregistergov/userregistergov.json b/pages/module_user/userregistergov/userregistergov.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/module_user/userregistergov/userregistergov.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/module_user/userregistergov/userregistergov.wxml b/pages/module_user/userregistergov/userregistergov.wxml
new file mode 100644
index 0000000..b2482e6
--- /dev/null
+++ b/pages/module_user/userregistergov/userregistergov.wxml
@@ -0,0 +1,2 @@
+<!--pages/module_user/userregistergov/userregistergov.wxml-->
+<text>pages/module_user/userregistergov/userregistergov.wxml</text>
diff --git a/pages/module_user/userregistergov/userregistergov.wxss b/pages/module_user/userregistergov/userregistergov.wxss
new file mode 100644
index 0000000..c33620c
--- /dev/null
+++ b/pages/module_user/userregistergov/userregistergov.wxss
@@ -0,0 +1 @@
+/* pages/module_user/userregistergov/userregistergov.wxss */
\ No newline at end of file
diff --git a/pages/module_user/userregistertype/userregistertype.js b/pages/module_user/userregistertype/userregistertype.js
new file mode 100644
index 0000000..e070ea6
--- /dev/null
+++ b/pages/module_user/userregistertype/userregistertype.js
@@ -0,0 +1,35 @@
+// pages/module_user/userregistertype/userregistertype.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+
+ gotoRegisterInfo(e) {
+ let index = e.currentTarget.dataset.index
+ let url = ""
+ switch(index) {
+ case "0":
+ url = `/pages/module_user/userregistercompany/userregistercompany`
+ break;
+ case "1":
+ url = `/pages/module_user/userregistergov/userregistergov`
+ break;
+ }
+ if (url != "") {
+ wx.navigateTo({
+ url: url
+ })
+ }
+ }
+})
\ No newline at end of file
diff --git a/pages/module_user/userregistertype/userregistertype.json b/pages/module_user/userregistertype/userregistertype.json
new file mode 100644
index 0000000..05f88e1
--- /dev/null
+++ b/pages/module_user/userregistertype/userregistertype.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "閫夋嫨娉ㄥ唽绫诲瀷",
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/module_user/userregistertype/userregistertype.wxml b/pages/module_user/userregistertype/userregistertype.wxml
new file mode 100644
index 0000000..c403e3b
--- /dev/null
+++ b/pages/module_user/userregistertype/userregistertype.wxml
@@ -0,0 +1,13 @@
+<!--pages/module_user/userregistertype/userregistertype.wxml-->
+<view>
+ <view class="text-1">鎮ㄨ娉ㄥ唽锛�</view>
+ <view class="re-type" bindtap="gotoRegisterInfo" data-index="0">
+ <image src="/res/icons/re_company.png"></image>
+ <view>浼佷笟璐︽埛</view>
+ </view>
+ <view class="divider"></view>
+ <view class="re-type" bindtap="gotoRegisterInfo" data-index="0">
+ <image src="/res/icons/re_manage.png"></image>
+ <view>绠＄悊璐︽埛</view>
+ </view>
+</view>
\ No newline at end of file
diff --git a/pages/module_user/userregistertype/userregistertype.wxss b/pages/module_user/userregistertype/userregistertype.wxss
new file mode 100644
index 0000000..f2e21ea
--- /dev/null
+++ b/pages/module_user/userregistertype/userregistertype.wxss
@@ -0,0 +1,28 @@
+/* pages/module_user/userregistertype/userregistertype.wxss */
+.text-1 {
+ text-align: center;
+ color: var(--fyui-text-color_1);
+ font-weight: 600;
+ font-size: 18px;
+}
+
+.re-type {
+ text-align: center;
+ margin: 60px;
+}
+
+.re-type:active {
+ color: var(--fyui-text-color_3);
+}
+
+.re-type>image {
+ width: 120px;
+ height: 120px;
+}
+
+.divider {
+ margin: 20px;
+ width: auto;
+ height: 1px;
+ background-color: var(--fyui-BG_1);
+}
\ No newline at end of file
diff --git a/pages/promise/promise.js b/pages/promise/promise.js
index 39c70af..6ad099e 100644
--- a/pages/promise/promise.js
+++ b/pages/promise/promise.js
@@ -29,13 +29,14 @@
*/
onLoad: function (options) {
this._initPlanYear()
-
+ // this.getCommitment()
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow: function () {
+ console.log("promise: onshow");
this.getCommitment()
},
diff --git a/pages/promise/promise.wxml b/pages/promise/promise.wxml
index 9232b43..659c39d 100644
--- a/pages/promise/promise.wxml
+++ b/pages/promise/promise.wxml
@@ -6,8 +6,11 @@
<view>
<view class="title">{{text1}}</view>
<view class="tag">{{deadline}}</view>
+ <view class="btn" bindtap="gotoPromise" data-status="{{status}}">{{text3}}</view>
</view>
- <view class="btn" bindtap="gotoPromise" data-status="{{status}}">{{text3}}</view>
+ <view wx:if="{{status == 1}}" bindtap="gotoPromise" data-status="{{status}}">
+ <image class="file" src="{{promise[0].picPath}}"></image>
+ </view>
</view>
<view class="page__bd">
<view class="fyui-cell fyui-cell_select title">
diff --git a/pages/promise/promise.wxss b/pages/promise/promise.wxss
index acbaba6..6752da5 100644
--- a/pages/promise/promise.wxss
+++ b/pages/promise/promise.wxss
@@ -8,6 +8,8 @@
.page__hd {
background: linear-gradient(to bottom, #57E4CB, #bbf3eb);
height: 30vh;
+ display: flex;
+ justify-content: space-between;
}
.page__hd .title {
@@ -33,6 +35,11 @@
margin-top: 50px;
}
+.page__hd .file {
+ width: 40vw;
+ margin-bottom: 2px;
+}
+
.p-cell{
position: relative;
padding: 8px;
diff --git a/pages/promisefile/promisefile.json b/pages/promisefile/promisefile.json
index cff2b41..53e208b 100644
--- a/pages/promisefile/promisefile.json
+++ b/pages/promisefile/promisefile.json
@@ -1,7 +1,6 @@
{
"usingComponents": {
"mp-upload":"/component/uploader/uploader",
- "sign-dialog": "/component/sign/sign",
"mp-icon": "/component/icon/icon",
"c-dialog": "/component/commondialog/commondialog"
},
diff --git a/pages/promisefile/promisefile.wxml b/pages/promisefile/promisefile.wxml
index 169cd4c..4fa31c9 100644
--- a/pages/promisefile/promisefile.wxml
+++ b/pages/promisefile/promisefile.wxml
@@ -22,7 +22,7 @@
<view wx:if="{{imgFiles.length == 0}}" class="">
<view class="top-right" bindtap="startSign">
<view class="sign-btn">
- <mp-icon bindtap="startSign" type="field" icon="add" color="gray" size="{{60}}"></mp-icon>
+ <mp-icon type="field" icon="add" color="gray" size="{{60}}"></mp-icon>
</view>
</view>
</view>
@@ -42,7 +42,4 @@
<view class="page__ft">
<view class="submit" bindtap="onSubmit">纭鎵胯</view>
</view>
- <!-- <sign-dialog id="sign-dialog" show="{{showDialog}}" bindconfirm="signOver"></sign-dialog>
- <c-dialog show="{{showDialog2}}" yes="鏌ョ湅鎶ュ憡" bindconfirm="gotoReport" bindclose="goBack" no="杩斿洖" showBtn="{{!startCalculate}}">
- </c-dialog> -->
</view>
\ No newline at end of file
diff --git a/pages/promiseinfo/promiseinfo.wxss b/pages/promiseinfo/promiseinfo.wxss
index 26dc8b3..03ddef0 100644
--- a/pages/promiseinfo/promiseinfo.wxss
+++ b/pages/promiseinfo/promiseinfo.wxss
@@ -1,6 +1,6 @@
/* pages/promiseinfo/promiseinfo.wxss */
.page__bd {
- font-size: 14px;
+ font-size: 16px;
}
.banner-bg {
position: fixed;
diff --git a/pages/promiseresult/promiseresult.js b/pages/promiseresult/promiseresult.js
index 786fa3b..f2afc6b 100644
--- a/pages/promiseresult/promiseresult.js
+++ b/pages/promiseresult/promiseresult.js
@@ -20,8 +20,8 @@
var that = this
this.getOpenerEventChannel().on('acceptDataFromOpenerPage', function (data) {
console.log(data);
- data.promise.picPath = $f.basePicUrl + data.promise.picPath
- data.promise.pdfPath = $f.basePicUrl + data.promise.pdfPath
+ // data.promise.picPath = $f.basePicUrl + data.promise.picPath
+ // data.promise.pdfPath = $f.basePicUrl + data.promise.pdfPath
that.setData({
promise: data.promise
})
diff --git a/pages/promisesign/promisesign.js b/pages/promisesign/promisesign.js
index 1987ee7..17c7c09 100644
--- a/pages/promisesign/promisesign.js
+++ b/pages/promisesign/promisesign.js
@@ -6,6 +6,9 @@
*/
data: {
isDrawed: false,
+
+ width: '1px',
+ height: '1px'
},
//鍐冲畾鏄惁缁樺埗鐨勬渶灏忓儚绱犺窛绂�
@@ -166,6 +169,10 @@
//this.ctxH -->鎵�缁樺埗canvas鐨刪eight
rotateCanvas.width = that.canvas.height;
rotateCanvas.height = that.canvas.width;
+ that.setData({
+ width: rotateCanvas.width,
+ height: rotateCanvas.height,
+ })
wx.canvasToTempFilePath({
canvas: that.canvas,
success(res) {
diff --git a/pages/promisesign/promisesign.wxml b/pages/promisesign/promisesign.wxml
index 89f3932..4363b53 100644
--- a/pages/promisesign/promisesign.wxml
+++ b/pages/promisesign/promisesign.wxml
@@ -2,13 +2,12 @@
<view class="page">
<view class="canvas">
<canvas id="signCanvas" type="2d" class="sign-canvas" bindtouchstart="touchStart"
- bindtouchmove="touchMove" bindtouchend="touchEnd"></canvas>
+ bindtouchmove="touchMove" bindtouchend="touchEnd" disable-scroll="true"></canvas>
<view class="tips">璇锋棆杞睆骞曡嚦姝ゆ柟鍚戠鍚�</view>
</view>
<view class="btn-group">
<view class="cancel" bindtap="onCancel">鍙栨秷</view>
<view class="submit" bindtap="onSubmit">纭</view>
</view>
- <canvas id="handWriting2" type="2d" style="display: none;width:100%;height:100%;" bindtouchstart="touchStart"
- bindtouchmove="touchMove" bindtouchend="touchEnd"></canvas>
+ <canvas id="handWriting2" type="2d" style="position: absolute; z-index: -1; width:{{width}};height:{{height}};"></canvas>
</view>
\ No newline at end of file
diff --git a/pages/promisesign/promisesign.wxss b/pages/promisesign/promisesign.wxss
index 97ff033..f2b5db8 100644
--- a/pages/promisesign/promisesign.wxss
+++ b/pages/promisesign/promisesign.wxss
@@ -1,4 +1,8 @@
/* pages/test2/test2.wxss */
+.page {
+ overflow: hidden;
+}
+
.canvas {
display: flex;
margin-top: 4px;
diff --git a/project.config.json b/project.config.json
index eec38e8..4086af7 100644
--- a/project.config.json
+++ b/project.config.json
@@ -22,7 +22,7 @@
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
- "useMultiFrameRuntime": false,
+ "useMultiFrameRuntime": true,
"useApiHook": true,
"babelSetting": {
"ignore": [],
@@ -44,10 +44,11 @@
"showES6CompileOption": false,
"useCompilerPlugins": false,
"ignoreUploadUnusedFiles": true,
- "useStaticServer": true
+ "useStaticServer": true,
+ "minifyWXML": true
},
"compileType": "miniprogram",
- "libVersion": "2.21.3",
+ "libVersion": "2.25.2",
"appid": "wxffd1438dd373fcf6",
"projectname": "ep-law-abiding",
"editorSetting": {
diff --git a/project.private.config.json b/project.private.config.json
index d26294d..e86baf5 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -3,5 +3,6 @@
"urlCheck": false,
"compileHotReLoad": true
},
- "description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+ "description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+ "projectname": "ep-law-abiding"
}
\ No newline at end of file
diff --git a/res/icons/re_company.png b/res/icons/re_company.png
new file mode 100644
index 0000000..4040552
--- /dev/null
+++ b/res/icons/re_company.png
Binary files differ
diff --git a/res/icons/re_manage.png b/res/icons/re_manage.png
new file mode 100644
index 0000000..f761769
--- /dev/null
+++ b/res/icons/re_manage.png
Binary files differ
diff --git a/service/baserequest.js b/service/baserequest.js
index b924990..cd2c8db 100644
--- a/service/baserequest.js
+++ b/service/baserequest.js
@@ -11,10 +11,11 @@
const originProperties = ['url', 'data', 'header', 'method', 'success', 'fail', 'complete'];
// const baseUrl = "http://127.0.0.1:8080"
-const baseUrl = "http://192.168.0.117:8080"
-// const baseUrl = "https://fyami.com.cn:447"
+// const baseUrl = "http://192.168.0.117:8080"
+const baseUrl = "https://fyami.com.cn:447"
// const basePicUrl = baseUrl + "/images/"
const basePicUrl = "https://fyami.com.cn:447/images/"
+const baseIconUrl = "https://fyami.com.cn:447/images/weixin/eplaw/"
const baseFileUrl = baseUrl + "/meeting/file/"
function request(fun) {
@@ -76,5 +77,6 @@
},
basePicUrl:basePicUrl,
baseUrl:baseUrl,
- baseFileUrl:baseFileUrl
+ baseFileUrl:baseFileUrl,
+ baseIconUrl: baseIconUrl
}
\ No newline at end of file
diff --git a/service/consultservice.js b/service/consultservice.js
index e5abfd5..5932e20 100644
--- a/service/consultservice.js
+++ b/service/consultservice.js
@@ -1,4 +1,5 @@
const $f = require('./baserequest')
+const util = require('../utils/util')
module.exports = {
//鏍规嵁鍏抽敭瀛楁悳绱㈡硶寰嬫硶瑙�
@@ -36,6 +37,13 @@
},
}
Object.assign(cb, fun)
- $f.get(cb)
+
+ let fun1 = util.deepCopy(cb)
+ fun1.success = function (res) {
+ res.mfFileUrl = $f.baseFileUrl + res.mfFileUrl
+ cb.success(res)
+ }
+
+ $f.get(fun1)
},
}
\ No newline at end of file
diff --git a/service/promiseservice.js b/service/promiseservice.js
index 9ec808a..4b2d32f 100644
--- a/service/promiseservice.js
+++ b/service/promiseservice.js
@@ -1,4 +1,5 @@
const $f = require("./baserequest")
+const util = require('../utils/util')
module.exports = {
//鐢熸垚鎵胯涔�
@@ -12,7 +13,13 @@
userId: userId,
coVo: JSON.stringify(commitmentVo)
},
- success: (result) => {fun.success(JSON.parse(result.data))},
+ success: (result) => {
+ let res = JSON.parse(result.data)
+ res.data = res.data.map((value, index) => {
+ return $f.basePicUrl + value
+ })
+ fun.success(res)
+ },
fail: (res) => {fun.fail(res)},
complete: (res) => {fun.complete(res)},
})
@@ -29,6 +36,16 @@
},
}
Object.assign(cb, fun)
- $f.get(cb)
+
+ let fun1 = util.deepCopy(cb)
+ fun1.success = function (res) {
+ res.forEach(r => {
+ r.cmUrl = $f.basePicUrl + r.cmUrl
+ r.cmPdfUrl = $f.basePicUrl + r.cmPdfUrl
+ });
+ cb.success(res)
+ }
+
+ $f.get(fun1)
}
}
\ No newline at end of file
--
Gitblit v1.9.3