许静 5 年之前
父節點
當前提交
a96f5e9b06
共有 4 個檔案被更改,包括 15 行新增12 行删除
  1. 1
    1
      project.config.json
  2. 1
    1
      src/app.js
  3. 10
    6
      src/pages/project/index.js
  4. 3
    4
      src/pages/toolKit/index.js

+ 1
- 1
project.config.json 查看文件

2
 	"miniprogramRoot": "dist/",
2
 	"miniprogramRoot": "dist/",
3
 	"projectname": "mini-chengjiao",
3
 	"projectname": "mini-chengjiao",
4
 	"description": "dev环境",
4
 	"description": "dev环境",
5
-	"appid": "wxd9ee3a9480a4e544",
5
+	"appid": "wxda1f84b79b3edeb3",
6
 	"setting": {
6
 	"setting": {
7
 		"urlCheck": false,
7
 		"urlCheck": false,
8
 		"es6": false,
8
 		"es6": false,

+ 1
- 1
src/app.js 查看文件

40
       }
40
       }
41
     },
41
     },
42
     pages: [
42
     pages: [
43
+      'pages/project/index',
43
       'pages/shop/index',
44
       'pages/shop/index',
44
       'pages/activity/activity',
45
       'pages/activity/activity',
45
       'pages/activity/myActivity',
46
       'pages/activity/myActivity',
46
-      'pages/project/index',
47
       'pages/person/index',
47
       'pages/person/index',
48
       'pages/person/profile/index',
48
       'pages/person/profile/index',
49
       'pages/person/profile/detail/index',
49
       'pages/person/profile/detail/index',

+ 10
- 6
src/pages/project/index.js 查看文件

210
     Taro.showLoading()
210
     Taro.showLoading()
211
     this.props.dispatchProjectList(payload).then(res => {
211
     this.props.dispatchProjectList(payload).then(res => {
212
       if (!this.state.loaded && res.records.length <= 0) {
212
       if (!this.state.loaded && res.records.length <= 0) {
213
-        let city = {
214
-          name: '南京市',
215
-          id: 320100
216
-        }
217
-        this.updateCity(city)
218
-        return
213
+        // let city = {
214
+        //   name: '南京市',
215
+        //   id: 320100
216
+        // }
217
+        // this.updateCity(city)
218
+        // return
219
+        Taro.showToast({
220
+          title: '当前城市暂无楼盘',
221
+          icon: 'none'
222
+        })
219
       }
223
       }
220
       Taro.hideLoading()
224
       Taro.hideLoading()
221
       this.setState({
225
       this.setState({

+ 3
- 4
src/pages/toolKit/index.js 查看文件

10
 		selector: ['10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%'],
10
 		selector: ['10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%'],
11
 		selectorChecked: '10%',
11
 		selectorChecked: '10%',
12
 		firstPay: 0,
12
 		firstPay: 0,
13
-		rateList: ['基准利率(4.85%)', '基准利率7折(3.395%)', '基准利率75折(‭3.6375‬%)', '基准利率8折(3.88%)', '基准利率85折(4.1225%)', '基准利率9折(4.365%)', '基准利率95折(4.6075%)', '基准利率1.05倍(5.0925%)', '基准利率1.1倍(5.335%)', '基准利率1.2倍(5.82%)', '基准利率1.3倍(6.305%)'],
13
+		rateList: ['基准利率(4.85%)', '基准利率7折(3.40%)', '基准利率75折(3.64%)', '基准利率8折(3.88%)', '基准利率85折(4.12%)', '基准利率9折(4.37%)', '基准利率95折(4.61%)', '基准利率1.05倍(5.09%)', '基准利率1.1倍(5.33%)', '基准利率1.2倍(5.82%)', '基准利率1.3倍(6.31%)'],
14
 		rate: '基准利率(4.85%)',
14
 		rate: '基准利率(4.85%)',
15
 		accumulationRateList: ['基准利率(3.25%)', '基准利率1.1倍(3.58%)', '基准利率1.2倍(3.90%)', '基准利率1.3倍(4.23%)'],
15
 		accumulationRateList: ['基准利率(3.25%)', '基准利率1.1倍(3.58%)', '基准利率1.2倍(3.90%)', '基准利率1.3倍(4.23%)'],
16
 		accumulationRate: '基准利率(3.25%)',
16
 		accumulationRate: '基准利率(3.25%)',
177
     }
177
     }
178
 
178
 
179
     
179
     
180
-		
181
-		var rate = (this.state.rate.slice(-6, -2)) / 100
180
+		var rate = (((this.state.rate).match(/\((.*)\%/))[1])/100
182
 		//			var lixi=calcute.singleDk(1,this.state.accumulation,this.state.time2,rate)
181
 		//			var lixi=calcute.singleDk(1,this.state.accumulation,this.state.time2,rate)
183
 
182
 
184
-    var shuju2 = this.state.shangPay + ',' + this.state.time1 + ',' + rate  //商贷数据
183
+    	var shuju2 = this.state.shangPay + ',' + this.state.time1 + ',' + rate  //商贷数据
185
 
184
 
186
 		console.log(shuju1 + '=' + shuju2)
185
 		console.log(shuju1 + '=' + shuju2)
187
 		
186