From b21139d050766eb772c9c7493d0ba27b106d9d24 Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Wed, 13 Apr 2022 18:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                               |  2 +-
 env/env.js                             | 12 ++++++++----
 pages/apply/index.wxss                 |  8 ++++----
 pages/apply/paymentTemplate/add/add.js |  1 +
 pages/handle/liist.js                  |  5 +++++
 pages/handle/liist.wxml                |  2 +-
 pages/index/index.wxml                 | 10 +++++-----
 pages/user/login/login.wxml            |  2 +-
 8 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/app.json b/app.json
index 295acc2..d99e9d4 100644
--- a/app.json
+++ b/app.json
@@ -21,7 +21,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationStyle": "custom",
-    "enablePullDownRefresh": true,
+    "enablePullDownRefresh": false,
     "navigationBarBackgroundColor": "#fff",
     "navigationBarTitleText": "农燊高科",
     "navigationBarTextStyle": "black"
diff --git a/env/env.js b/env/env.js
index d406330..45a8b43 100644
--- a/env/env.js
+++ b/env/env.js
@@ -1,14 +1,18 @@
 module.exports = {
     DEV: {
-          URL_PREFIX: 'http://192.168.31.178/api',
+          // URL_PREFIX: 'http://192.168.31.178/api',
+          URL_PREFIX: 'https://dazu.nongshen.net/api',
     },
     PRE: {
-          URL_PREFIX: 'http://192.168.31.178:8080/api',
+          // URL_PREFIX: 'http://192.168.31.178:8080/api',
+          URL_PREFIX: 'https://dazu.nongshen.net/api',
     },
     PROD: {
-          URL_PREFIX: 'http://192.168.31.178:8080/api',
+          // URL_PREFIX: 'http://192.168.31.178:8080/api',
+          URL_PREFIX: 'https://dazu.nongshen.net/api',
     },
     IMGURL: {
-          URL_PREFIX: 'http://192.168.31.178:8080',
+          // URL_PREFIX: 'http://192.168.31.178:8080',
+          URL_PREFIX: 'https://dazu.nongshen.net',
     }
   }
\ No newline at end of file
diff --git a/pages/apply/index.wxss b/pages/apply/index.wxss
index f61fe60..23eb025 100644
--- a/pages/apply/index.wxss
+++ b/pages/apply/index.wxss
@@ -42,19 +42,19 @@
 }
 
 .ICBC{
-  background:url('http://192.168.31.196:81/bj/bg_ICBC.png') no-repeat center;
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ICBC.png') no-repeat center;
   background-size: 100% 100%;
 }
 .ABC{
-  background:url('http://192.168.31.196:81/bj/bg_ABC.png') no-repeat center;
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ABC.png') no-repeat center;
   background-size: 100% 100%;
 }
 .CCB{
-  background:url('http://192.168.31.196:81/bj/bg_CCB.png') no-repeat center;
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_CCB.png') no-repeat center;
   background-size: 100% 100%;
 }
 .RCB{
-  background:url('http://192.168.31.196:81/bj/bg_RCB.png') no-repeat center;
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_RCB.png') no-repeat center;
   background-size: 100% 100%;
 }
 
diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js
index 2a24969..ce32952 100644
--- a/pages/apply/paymentTemplate/add/add.js
+++ b/pages/apply/paymentTemplate/add/add.js
@@ -113,6 +113,7 @@ Page({
    */
   onLoad(options) {
     var that = this;
+    console.log(options);
     if(options.id){
       setTimeout(function(){
         UTIL.httpRequest(API.URL_GET_APPROVALITEMS+options.id, {method:'GET'}, {
diff --git a/pages/handle/liist.js b/pages/handle/liist.js
index b4ab90d..4a92d05 100644
--- a/pages/handle/liist.js
+++ b/pages/handle/liist.js
@@ -199,6 +199,11 @@ Page({
       delta: 1
     })
   },
+  godetail:function(e){
+    wx.navigateTo({
+      url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id,
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/handle/liist.wxml b/pages/handle/liist.wxml
index 89d3478..7a81459 100644
--- a/pages/handle/liist.wxml
+++ b/pages/handle/liist.wxml
@@ -91,7 +91,7 @@
         
 </scroll-view>
 <scroll-view scroll-y="true" wx-if="{{active==4}}" style="height: {{wrokScrollHeight}}px;"> 
-    <view class="workflow"  wx:if="{{active=='4'}}" wx:for-item="item" wx:for="{{yzdList}}" wx:key="id">
+    <view class="workflow"  wx:if="{{active=='4'}}" wx:for-item="item" wx:for="{{yzdList}}" wx:key="id" data-id="{{item.id}}" bindtap="godetail">
             <!--1-->
             <view class="workflow_list">
                 <view class="process_intro">
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7d79f60..54cc24c 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,16 +1,16 @@
-<view class="container" style="background:url('../../image/index/header_bg.png') top center no-repeat; background-size: 100% auto;">
+<view class="container" style="background:url('https://dazu.nongshen.net/api/profile/wechat/header_bg.png') top center no-repeat; background-size: 100% auto;">
     
      <!--自定义 顶部标题样式和位置-->
     <view class="top_title" style="height:{{CustomMenuButton.bottom}}px;z-index: 7777;padding-top: {{CustomMenuButton.top}}px;"></view>
     <!--账户信息-->
     <view class="information_header">
-        <navigator url="{{'settle/index?item='+item}}" class="setup" style="background:url('../../image/index/setup.png') no-repeat; background-size: 100%  100%;"></navigator> 
+        <navigator url="{{'settle/index?item='+item}}" class="setup" style="background:url('https://dazu.nongshen.net/api/profile/wechat/setup.png') no-repeat; background-size: 100%  100%;"></navigator> 
         <view class="portrait_head"></view>
         <view class="information_main">
             <view class="name_wrap">
                 <text class="name">{{userInfoObj.nickName}}</text>
                 <view class="jobs">
-                    <view class="icon" style="background:url('../../image/index/header_job.png') no-repeat; background-size: 100% 100%;"></view>
+                    <view class="icon" style="background:url('https://dazu.nongshen.net/api/profile/wechat/header_job.png') no-repeat; background-size: 100% 100%;"></view>
                      {{userInfoObj.remark}}
                 </view>
             </view>
@@ -18,7 +18,7 @@
                 <view class="flex_block">
                    <!-- <view class="desc">未完成</view> -->
                     <view class="event" bindtap="pickAddress">
-                        <view class="icon" style="background:url('../../image/index/local.png') no-repeat; background-size: 100% 100%;"></view> 
+                        <view class="icon" style="background:url('https://dazu.nongshen.net/api/profile/wechat/local.png') no-repeat; background-size: 100% 100%;"></view> 
                         {{ region || "请选择" }}
                     </view>
                 </view>
@@ -29,7 +29,7 @@
                     <view class="event">
                         <picker bindchange="bindPickerChange" value="{{index}}" range-key="bookName" range="{{bookList}}">
                             <view class="picker">
-                                <view class="icon" style="background:url('../../image/index/dept.png') no-repeat; background-size: 100% 100%;"></view> 
+                                <view class="icon" style="background:url('https://dazu.nongshen.net/api/profile/wechat/dept.png') no-repeat; background-size: 100% 100%;"></view> 
                                 {{array[index]|| bookName}}
                             </view>
                         </picker>
diff --git a/pages/user/login/login.wxml b/pages/user/login/login.wxml
index 8595723..0bd7c94 100644
--- a/pages/user/login/login.wxml
+++ b/pages/user/login/login.wxml
@@ -1,7 +1,7 @@
 
 <import src="/templates/global/global"/>
 <template is="toast" data="{{...toastData}}"></template>
-<view class="container" style="background: url('../../../image/login/container_bg.jpg') center center  no-repeat; background-size: 100% auto;">    
+<view class="container" style="background: url('https://dazu.nongshen.net/api/profile/wechat/container_bg.jpg') center center  no-repeat; background-size: 100% auto;">    
     <view class="header"  >
         <view class="principal">农村事项审批与记账</view>
          <view class="instructions">报账简单，操作便捷</view>