zhangzl
/
nsgk_wechat
1
0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_wechat 

# Conflicts:
#	pages/index/index.wxml
master
yujk 3 år sedan
förälder
05bbd59cf7 b21139d050
incheckning
7dc01eda7c
11 ändrade filer med 54 tillägg och 33 borttagningar
Delad Vy
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      app.json
  2. +8
    -4
      env/env.js
  3. +4
    -4
      pages/apply/index.wxss
  4. +13
    -5
      pages/apply/paymentTemplate/add/add.js
  5. +14
    -11
      pages/apply/paymentTemplate/paymentTemplate.js
  6. +5
    -0
      pages/handle/liist.js
  7. +1
    -1
      pages/handle/liist.wxml
  8. +5
    -5
      pages/index/index.wxml
  9. +1
    -1
      pages/index/index.wxss
  10. +1
    -0
      pages/user/login/login.js
  11. +1
    -1
      pages/user/login/login.wxml

+ 1
- 1
app.json Visa fil

@@ -21,7 +21,7 @@
"window": {
"backgroundTextStyle": "light",
"navigationStyle": "custom",
"enablePullDownRefresh": true,
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "农燊高科",
"navigationBarTextStyle": "black"


+ 8
- 4
env/env.js Visa fil

@@ -1,14 +1,18 @@
module.exports = {
DEV: {
URL_PREFIX: 'http://192.168.31.178/api',
// URL_PREFIX: 'http://192.168.31.228',
URL_PREFIX: 'http://192.168.31.228:8080',
},
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',
}
}

+ 4
- 4
pages/apply/index.wxss Visa fil

@@ -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%;
}



+ 13
- 5
pages/apply/paymentTemplate/add/add.js Visa fil

@@ -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'}, {
@@ -674,6 +675,7 @@ Page({
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
for (let j = 0; j < res.data.transfers.length; j++) {
if(that.data.form.transfers[j].fileForm == undefined){continue;}
for (let i = 0; i < that.data.form.transfers[j].fileForm.length; i++) {
that.data.form.transfers[j].fileForm[i].tableId = res.data.transfers[j].id
const element = that.data.form.transfers[j].fileForm[i];
@@ -689,11 +691,7 @@ Page({
formData:element,
success (response){
console.log(res);
if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type == 0){
wx.navigateTo({
url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id,
})
}
},
fail(res){
console.log(res)
@@ -701,6 +699,16 @@ Page({
})
}
}

if(e.currentTarget.dataset.type == 0){
wx.navigateTo({
url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId,
})
}
if(e.currentTarget.dataset.type != 0){
UTIL.showToastNoneIcon('操作成功！');
that.back();
}
}
}
})


+ 14
- 11
pages/apply/paymentTemplate/paymentTemplate.js Visa fil

@@ -54,7 +54,9 @@ Page({
UTIL.httpRequest(API.URL_GET_SAVE, that.data.form, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
console.log(that.data.form);
for (let j = 0; j < res.data.transfers.length; j++) {
if(that.data.form.transfers[j].fileForm == undefined){continue;}
for (let i = 0; i < that.data.form.transfers[j].fileForm.length; i++) {
that.data.form.transfers[j].fileForm[i].tableId = res.data.transfers[j].id
const element = that.data.form.transfers[j].fileForm[i];
@@ -70,23 +72,24 @@ Page({
formData:element,
success (response){
console.log(res);
if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type == 0){
wx.navigateTo({
url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id,
})
}
if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type != 0){
UTIL.showToastNoneIcon('操作成功！');
that.back();
}
},
fail(res){
console.log(res)
}
})
}
}
}

if(e.currentTarget.dataset.type == 0){
wx.navigateTo({
url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId,
})
}
if(e.currentTarget.dataset.type != 0){
UTIL.showToastNoneIcon('操作成功！');
that.back();
}
}
}
})


+ 5
- 0
pages/handle/liist.js Visa fil

@@ -199,6 +199,11 @@ Page({
delta: 1
})
},
godetail:function(e){
wx.navigateTo({
url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id,
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/


+ 1
- 1
pages/handle/liist.wxml Visa fil

@@ -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">


+ 5
- 5
pages/index/index.wxml Visa fil

@@ -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.roles.length>0?userInfoObj.roles[0].roleName:""}}
</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>


+ 1
- 1
pages/index/index.wxss Visa fil

@@ -209,7 +209,7 @@
position: absolute;
line-height: 30rpx;
padding:0 10rpx;
border-radius: 50%;
border-radius: 50px;
top: -10rpx;
right: -10rpx;
}


+ 1
- 0
pages/user/login/login.js Visa fil

@@ -134,6 +134,7 @@ Page({
openId:STORAGE.getOpenId(),
phonenumber:phone
}
console.log(STORAGE.getOpenId());
UTIL.httpRequestNoneDetal(API.URL_POST_USERBAND, sendData,"POST",{
success: (res) => {
if (res.code == API.SUCCESS_CODE) {


+ 1
- 1
pages/user/login/login.wxml Visa fil

@@ -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>


Skriv Förhandsgranska
Laddar…
Avbryt
Spara