From 65f8691ebf4f5de4a7fe2cef4fd9345b26372e55 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 01 九月 2025 18:34:12 +0800
Subject: [PATCH] 前端
---
small-program/pages/packaging-worker/packaging-worker.vue | 4
small-program/pages/demand-hall/demand-hall.vue | 41 ++
server/services/src/main/java/com/doumee/dao/dto/ConfirmFeeOrderDTO.java | 30 ++
/dev/null | 305 -------------------------
small-program/pages/mine/mine.vue | 39 +-
small-program/main.js | 4
small-program/manifest.json | 16
server/web/src/main/java/com/doumee/api/web/OrdersApi.java | 11
server/services/src/main/java/com/doumee/core/constants/Constants.java | 6
small-program/pages.json | 108 ++++----
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 13 +
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 2
small-program/pages/index/index.vue | 4
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 81 ++++++
small-program/pages/freight/freight.vue | 4
15 files changed, 264 insertions(+), 404 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index ea8fd78..bde9912 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -143,6 +143,12 @@
}
return d.longValue();
}
+ public static BigDecimal formatBigDecimal(BigDecimal d) {
+ if (d == null) {
+ new BigDecimal(0);
+ }
+ return d;
+ }
/**
* Job甯搁噺
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index 7f9156c..206604b 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -97,6 +97,12 @@
@ApiModelProperty(value = "璁′环鏁伴噺2(鍒嗘嫞宸�/鍖呰宸� 浜烘暟)", example = "1")
private Integer priceNum2;
+ @ApiModelProperty(value = "锛堝彂鍗曟柟璁剧疆锛夎浠锋暟閲�1((閲嶉噺/浜烘暟/锛堝ぉ鏁�/灏忔椂/閲嶉噺锛�/锛堝ぉ鏁�/娆℃暟锛�/鐢ㄩ澶╂暟)", example = "1")
+ private Integer originPriceNum1;
+
+ @ApiModelProperty(value = "锛堝彂鍗曟柟璁剧疆锛夎浠锋暟閲�2(鍒嗘嫞宸�/鍖呰宸� 浜烘暟)", example = "1")
+ private Integer originPriceNum2;
+
@ApiModelProperty(value = "闇�姹傝ˉ鍏�")
private String supplement;
@@ -105,6 +111,13 @@
@ApiModelProperty(value = "棰勪及璐圭敤", example = "1")
private Long estimatedAccount;
+ @ApiModelProperty(value = "鎺ュ崟鏂圭‘璁ゅ叾浠栬垂鐢紙鍒嗭級", example = "1")
+ private Long confirmOtherFee;
+ @ApiModelProperty(value = "鎺ュ崟鏂圭‘璁よ垂鐢ㄥ娉�", example = "1")
+ private String confirmFeeRemark;
+
+ @ApiModelProperty(value = "(鍙戝崟鏂硅缃級棰勪及璐圭敤", example = "1")
+ private Long originEstimatedAccount;
@ApiModelProperty(value = "瀹為檯鏀粯璐圭敤", example = "1")
private Long payAccount;
diff --git a/server/services/src/main/java/com/doumee/dao/dto/ConfirmFeeOrderDTO.java b/server/services/src/main/java/com/doumee/dao/dto/ConfirmFeeOrderDTO.java
new file mode 100644
index 0000000..9088524
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/dto/ConfirmFeeOrderDTO.java
@@ -0,0 +1,30 @@
+package com.doumee.dao.dto;
+
+import com.doumee.dao.business.model.Member;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dm
+ * @since 2025/03/31 16:44
+ */
+@Data
+@ApiModel("纭璁㈠崟璐圭敤淇℃伅")
+public class ConfirmFeeOrderDTO {
+
+ @ApiModelProperty(value = "璁㈠崟涓婚敭")
+ private Integer orderId;
+
+ @ApiModelProperty(value = "璁′环鏁伴噺1((閲嶉噺/浜烘暟/锛堝ぉ鏁�/灏忔椂/閲嶉噺锛�/锛堝ぉ鏁�/娆℃暟锛�/鐢ㄩ澶╂暟)", example = "1")
+ private Integer priceNum1;
+
+ @ApiModelProperty(value = "璁′环鏁伴噺2(鍒嗘嫞宸�/鍖呰宸� 浜烘暟)", example = "1")
+ private Integer priceNum2;
+ @ApiModelProperty(value = "鎺ュ崟鏂圭‘璁ゅ叾浠栬垂鐢紙鍒嗭級", example = "1")
+ private Long confirmOtherFee;
+ @ApiModelProperty(value = "鎺ュ崟鏂圭‘璁よ垂鐢ㄥ娉�" )
+ private String confirmFeeRemark;
+ @ApiModelProperty(hidden = true)
+ private Member member;
+}
diff --git a/server/services/src/main/java/com/doumee/service/business/OrdersService.java b/server/services/src/main/java/com/doumee/service/business/OrdersService.java
index b8db34d..1cb3f2b 100644
--- a/server/services/src/main/java/com/doumee/service/business/OrdersService.java
+++ b/server/services/src/main/java/com/doumee/service/business/OrdersService.java
@@ -150,4 +150,6 @@
void initializeCode();
OrderReleaseVO reusePay(ReusePayDTO reusePayDTO);
+
+ void confirmFee(ConfirmFeeOrderDTO orders);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index e1599db..3f78ca2 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -46,6 +46,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -147,6 +148,10 @@
}else{
orders.setStatus(Constants.ordersStatus.wait.getKey());
}
+ orders.setOriginPriceNum1(orders.getPriceNum1());
+ orders.setOriginPriceNum2(orders.getPriceNum2());
+ orders.setOriginEstimatedAccount(orders.getOriginEstimatedAccount());
+ orders.setConfirmOtherFee(0l);
ordersMapper.insert(orders);
orderReleaseVO.setId(orders.getId());
@@ -382,7 +387,8 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟宸蹭慨鏀癸紝寰呮帴鍗曟柟纭锛屾棤娉曡繘琛岃鎿嶄綔");
}
if(!Constants.equalsInteger(model.getType(),Constants.TWO)){
- if(Constants.equalsInteger(model.getStatus(),Constants.ZERO)||Constants.equalsInteger(model.getStatus(),Constants.ONE)){
+ if(Constants.equalsInteger(model.getStatus(),Constants.ZERO)
+ ||Constants.equalsInteger(model.getStatus(),Constants.ONE)){
this.updateById(orders);
}else if(Constants.equalsInteger(model.getStatus(),Constants.TWO)){
this.updOrderData(orders,model);
@@ -439,6 +445,10 @@
}
multifileMapper.insert(multifileList);
}
+ orders.setOriginPriceNum1(orders.getPriceNum1());
+ orders.setOriginPriceNum2(orders.getPriceNum2());
+ orders.setOriginEstimatedAccount(orders.getOriginEstimatedAccount());
+ orders.setConfirmOtherFee(0l);
ordersMapper.updateById(orders);
}
@@ -794,6 +804,7 @@
.set(Orders::getIsUpdateTime,new Date())
.set(Orders::getUpdateTime,new Date())
.set(Orders::getEstimatedAccount,total)
+ .set(Orders::getOriginEstimatedAccount,total)
.eq(Orders::getId,orders.getId())
);
//鍒涘缓鎿嶄綔鏃ュ織
@@ -848,6 +859,72 @@
return bigDecimalPrice.divide(new BigDecimal("1"),0,BigDecimal.ROUND_HALF_UP).longValue();//orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2();
}
+
+ /**
+ * 鎺ュ崟鏂圭‘璁よ鍗曡垂鐢�
+ */
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void confirmFee(ConfirmFeeOrderDTO confirmUpdOrderDTO){
+ if(Objects.isNull(confirmUpdOrderDTO)
+ || Objects.isNull(confirmUpdOrderDTO.getOrderId())
+ || Objects.isNull(confirmUpdOrderDTO.getPriceNum1())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Orders orders = ordersMapper.selectById(confirmUpdOrderDTO.getOrderId());
+ if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(orders.getAcceptMemberId(),confirmUpdOrderDTO.getMember().getId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勮鍗曟棤娉曡繘琛岃鎿嶄綔");
+ }
+ if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
+ }
+ //绫诲瀷:0=鐢ㄥ伐锛�1=杩愯揣锛�2=璁㈤
+ if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
+ //鐢ㄥ伐绫诲瀷:0=閲囨憳宸ワ紱1=鍒嗘嫞宸ワ紱2=鍖呰宸ワ紱锛堢敤宸ヨ鍗曪級
+ if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
+ //1=鍒嗘嫞宸�
+ if( Objects.isNull(confirmUpdOrderDTO.getPriceNum2())){//蹇呴』鏈夌敤宸ユ暟閲忥紙浜猴級
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ }else if(Constants.equalsInteger(orders.getWorkType(),Constants.TWO)){
+ //鍖呰宸� 鐢ㄨ溅绫诲瀷(鐢ㄥ伐鍖呰/杩愯揣浣跨敤):0=澶�;1=娆�/灏忔椂;2=閲嶉噺
+ if( !Constants.equalsInteger(orders.getCarType(),Constants.TWO)
+ && Objects.isNull(confirmUpdOrderDTO.getPriceNum2())){
+ //涓嶆槸鎸夐噸閲忚璐圭殑锛屽繀椤绘湁鐢ㄥ伐鏁伴噺锛堜汉锛�
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ }
+ }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
+ //杩愯揣璁㈠崟
+
+ }else{
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ヨ鍗曚笉鏀寔璇ユ搷浣滐紝璇疯繑鍥炲埛鏂伴噸璇曪紒");
+ }
+ orders.setPriceNum1(confirmUpdOrderDTO.getPriceNum1());
+ orders.setPriceNum2(confirmUpdOrderDTO.getPriceNum2());
+ Long totalFee = this.getTotal(orders);//閲嶆柊璁＄畻璐圭敤
+ Long payFee = totalFee+Constants.formatLongNum(confirmUpdOrderDTO.getConfirmOtherFee());//閲嶆柊璁＄畻璐圭敤
+ BigDecimal recFee = new BigDecimal(payFee).multiply((new BigDecimal(1).subtract(Constants.formatBigDecimal(orders.getPlatformRata())))).setScale(0, RoundingMode.HALF_UP) ;
+ ordersMapper.update(new UpdateWrapper<Orders>().lambda()
+ .set(Orders::getPriceNum1,confirmUpdOrderDTO.getPriceNum1())
+ .set(Orders::getPriceNum2,confirmUpdOrderDTO.getPriceNum2())
+ .set(Orders::getConfirmFeeRemark,confirmUpdOrderDTO.getConfirmFeeRemark())
+ .set(Orders::getConfirmOtherFee,confirmUpdOrderDTO.getConfirmOtherFee())
+ .set(Orders::getEstimatedAccount,totalFee)
+ .set(Orders::getPayAccount,payFee)
+ .set(Orders::getReceiveAccount,recFee.longValue())
+ .set(Orders::getUpdateTime,new Date())
+ .eq(Orders::getId,orders.getId())
+ );
+ //璁板綍鍚屾剰淇敼鐨勬棩蹇�
+ Constants.OrdersLog ordersLog = Constants.OrdersLog.UPD_AGREE;
+ this.saveOrderLog(orders,ordersLog,
+ ordersLog.getInfo(),confirmUpdOrderDTO.getMember().getId(),null);
+
+ }
/**
* 鎺ュ崟鏂瑰鐞嗚鍗曚慨鏀�
@@ -1158,7 +1235,7 @@
if(!Constants.equalsInteger(orders.getType(),Constants.TWO)){
orders.setPayAccount(doneOrderDTO.getAmount());
//鎻愭垚閲戦
- Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue());
+ Long tcje = (new BigDecimal(orders.getPayAccount().toString()).multiply(Constants.formatBigDecimal(orders.getPlatformRata())).setScale(0,RoundingMode.HALF_UP).longValue());
orders.setReceiveAccount(orders.getPayAccount() - tcje);
orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
ordersMapper.updateById(orders);
diff --git a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
index 8fc10ce..6a3aee3 100644
--- a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
@@ -65,6 +65,17 @@
ordersService.update(orders);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @LoginRequired
+ @ApiOperation(value = "鎺ュ崟鏂圭‘璁よ鍗曡垂鐢� - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
+ @PostMapping("/confirmFee")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse confirmFee(@RequestBody ConfirmFeeOrderDTO orders) {
+ orders.setMember(this.getMemberResponse());
+ ordersService.confirmFee(orders);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
// @LoginRequired
diff --git a/small-program/main.js b/small-program/main.js
index 118ee2f..5674b6d 100644
--- a/small-program/main.js
+++ b/small-program/main.js
@@ -15,10 +15,10 @@
})
// Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'
-Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'
+// Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'
// Vue.prototype.$baseUrl = 'https://test.doumee.cn/jinkuai_web/'
-// Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/'
+Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/'
const app = new Vue({
store,
diff --git a/small-program/manifest.json b/small-program/manifest.json
index 7813cd1..33c2472 100644
--- a/small-program/manifest.json
+++ b/small-program/manifest.json
@@ -50,15 +50,21 @@
/* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
"quickapp" : {},
/* 灏忕▼搴忕壒鏈夌浉鍏� */
+ "optimization" :{"subPackages":true},
"mp-weixin" : {
"appid" : "wx332441ae5b12be7d",
"setting" : {
"urlCheck" : false,
- "es6" : true,
- "postcss" : true,
- "minified" : true
- },
- "usingComponents" : true,
+ "es6": true,
+ "postcss": true,
+ "minified": true
+ },
+ "optimization":{
+ "subPackages": true
+ },
+ "usingComponents": true,
+ "runmode": "liberate",
+ "lazyCodeLoading": "requiredComponents" ,// 鍚敤鎸夐渶娉ㄥ叆
"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
"permission" : {
"scope.userLocation" : {
diff --git a/small-program/pages.json b/small-program/pages.json
index 5328f8e..6b9adf1 100644
--- a/small-program/pages.json
+++ b/small-program/pages.json
@@ -87,24 +87,10 @@
}
},
{
- "path" : "pages/set-up/set-up",
- "style" :
- {
- "navigationBarTitleText" : "璁剧疆"
- }
- },
- {
"path" : "pages/login/login",
"style" :
{
"navigationBarTitleText" : "鐧诲綍椤�"
- }
- },
- {
- "path" : "pages/withdrawal/withdrawal",
- "style" :
- {
- "navigationBarTitleText" : "鎻愮幇"
}
},
{
@@ -113,49 +99,8 @@
{
"navigationBarTitleText" : "浣欓鏄庣粏"
}
- },
- {
- "path" : "pages/withdrawal-successful/withdrawal-successful",
- "style" :
- {
- "navigationBarTitleText" : "鎻愮幇鎴愬姛"
- }
- },
- {
- "path" : "pages/employment-certification/employment-certification",
- "style" :
- {
- "navigationBarTitleText" : "鐢ㄥ伐璁よ瘉"
- }
- },
- {
- "path" : "pages/freight-certification/freight-certification",
- "style" :
- {
- "navigationBarTitleText" : "杩愯揣璁よ瘉"
- }
- },
- {
- "path" : "pages/catering-certification/catering-certification",
- "style" :
- {
- "navigationBarTitleText" : "渚涢璁よ瘉"
- }
- },
- {
- "path" : "pages/certification-successful/certification-successful",
- "style" :
- {
- "navigationBarTitleText" : "璁よ瘉鎴愬姛"
- }
- },
- {
- "path" : "pages/certification-results/certification-results",
- "style" :
- {
- "navigationBarTitleText" : "璁よ瘉缁撴灉"
- }
- },
+ },
+
{
"path" : "pages/rich-text-page/rich-text-page",
"style" :
@@ -163,7 +108,54 @@
"navigationBarTitleText" : "瀵屾枃鏈〉闈�"
}
}
- ],
+ ],
+ "subPackages": [{
+ "root": "packageA", // 鍒嗗寘鐨勬牴鐩綍
+ "name": "packageA", // 鍒嗗寘鐨勬牴鐩綍
+ "pages":[
+ {
+ "path" : "pages/withdrawal/withdrawal",
+ "style" :
+ {
+ "navigationBarTitleText" : "鎻愮幇"
+ }
+ },
+ {
+ "path" : "pages/withdrawal-successful/withdrawal-successful",
+ "style" :
+ {
+ "navigationBarTitleText" : "鎻愮幇鎴愬姛"
+ }
+ },
+ {
+ "path" : "pages/set-up/set-up",
+ "style" :
+ {
+ "navigationBarTitleText" : "璁剧疆"
+ }
+ },
+ {
+ "path" : "pages/employment-certification/employment-certification",
+ "style" :
+ {
+ "navigationBarTitleText" : "鐢ㄥ伐璁よ瘉"
+ }
+ },
+ {
+ "path" : "pages/certification-results/certification-results",
+ "style" :
+ {
+ "navigationBarTitleText" : "璁よ瘉缁撴灉"
+ }
+ }
+ ]
+ }],
+ "preloadRule":{
+ "pages/mine/mine":{
+ "network": "all",
+ "packages": ["packageA"]
+ }
+ },
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
diff --git a/small-program/pages/catering-certification/catering-certification.vue b/small-program/pages/catering-certification/catering-certification.vue
deleted file mode 100644
index eb37dca..0000000
--- a/small-program/pages/catering-certification/catering-certification.vue
+++ /dev/null
@@ -1,313 +0,0 @@
-<template>
- <view class="box">
- <view class="box-head" :style="{ backgroundImage: 'url(' + bgImg + ')' }">
- <view class="box-head-info">
- <text>渚涢璁よ瘉</text>
- <text>璇锋寜瑕佹眰濉啓璁よ瘉淇℃伅</text>
- </view>
- <view class="box-head-content">
- <view class="item">
- <view class="item-label">
- <text>璁よ瘉绫诲瀷</text>
- <text>*</text>
- </view>
- <view class="item-cate">
- <view class="item-cate-row active">涓汉</view>
- <view class="item-cate-row">浼佷笟</view>
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>鑱旂郴浜�</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <input type="text" placeholder="璇疯緭鍏ョ湡瀹炲鍚�" />
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>鍗曚綅鍚嶇О</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <input type="text" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" />
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>鎵嬫満鍙�</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <text>鐐瑰嚮鑾峰彇</text>
- <button open-type="getPhoneNumber">鑾峰彇鎵嬫満鍙�</button>
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>鎺ュ崟浣嶇疆</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <text>璇烽�夋嫨</text>
- <u-icon name="arrow-right" color="#111111" size="18"></u-icon>
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>璁よ瘉璧勬枡</text>
- <text>*</text>
- </view>
- <view class="item-upload">
- <view class="item-upload-item">
- <view class="image">
- <image src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>钀ヤ笟鎵х収</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item">
- <view class="image">
- <image src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>椋熷搧缁忚惀璁稿彲璇�</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item">
- <view class="image">
- <image src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>浠庝笟浜哄憳鍋ュ悍璇�</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item">
- <view class="image">
- <image src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>鍏跺畠璁よ瘉璧勬枡</text>
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class="box-head-botton">鎻愪氦璁よ瘉</view>
- <view style="width: 100%; height: calc(30rpx + env(safe-area-inset-bottom));"></view>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- bgImg: require('@/static/image/bg_renzheng_gongcan@2x.png')
- };
- }
- }
-</script>
-
-<style>
- page {
- background-color: #F7F7F7;
- }
-</style>
-
-<style lang="scss" scoped>
- .box {
- width: 100%;
- .box-head {
- width: 100%;
- height: 300rpx;
- padding: 34rpx 40rpx 0 40rpx;
- box-sizing: border-box;
- background-repeat: no-repeat;
- background-size: 100% 100%;
- .box-head-botton {
- width: 100%;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- font-weight: 500;
- font-size: 32rpx;
- color: #FFFFFF;
- background: #00BC12;
- border-radius: 44rpx;
- margin-top: 30rpx;
- }
- .box-head-info {
- width: 100%;
- display: flex;
- flex-direction: column;
- text {
- &:nth-child(1) {
- font-weight: bold;
- font-size: 48rpx;
- color: #FFFFFF;
- }
- &:nth-child(2) {
- font-weight: 400;
- font-size: 26rpx;
- color: rgba(255,255,255,0.8);
- margin-top: 14rpx;
- }
- }
- }
- .box-head-content {
- width: 100%;
- padding: 40rpx 30rpx;
- box-sizing: border-box;
- background-color: #FFFFFF;
- border-radius: 20rpx;
- margin-top: 30rpx;
- .item {
- width: 100%;
- display: flex;
- flex-direction: column;
- margin-bottom: 30rpx;
- &:last-child {
- margin: 0 !important;
- }
- .item-cate {
- width: 100%;
- display: flex;
- align-items: center;
- padding: 30rpx 0;
- box-sizing: border-box;
- border-bottom: 1rpx solid #E5E5E5;
- .active {
- background: #00BC12 !important;
- color: #FFFFFF !important;
- }
- .item-cate-row {
- width: 208rpx;
- height: 72rpx;
- line-height: 72rpx;
- text-align: center;
- background: #EEEEEE;
- border-radius: 36rpx;
- margin-right: 20rpx;
- &:last-child {
- margin: 0 !important;
- }
- }
- }
- .item-label {
- display: flex;
- align-items: center;
- text {
- &:nth-child(1) {
- font-weight: 500;
- font-size: 32rpx;
- color: #222222;
- }
- &:nth-child(2) {
- font-weight: 500;
- font-size: 32rpx;
- color: #FF0000;
- }
- }
- }
- .item-upload {
- width: 100%;
- padding: 30rpx 0;
- box-sizing: border-box;
- display: flex;
- align-items: center;
- justify-content: space-between;
- flex-wrap: wrap;
- .item-upload-item {
- width: 300rpx;
- margin-bottom: 40rpx;
- &:nth-child(3) {
- margin: 0 !important;
- }
- &:nth-child(4) {
- margin: 0 !important;
- }
- .image {
- width: 100%;
- height: 196rpx;
- background: #F7F7F7;
- border-radius: 16rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- image {
- width: 48rpx;
- height: 48rpx;
- }
- text {
- font-weight: 400;
- font-size: 28rpx;
- color: #666666;
- margin-top: 12rpx;
- }
- }
- .info {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: 16rpx;
- text {
- &:nth-child(1) {
- font-weight: 400;
- font-size: 26rpx;
- color: #333333;
- }
- &:nth-child(2) {
- font-weight: 400;
- font-size: 26rpx;
- color: #FF0000;
- }
- }
- }
- }
- }
- .item-val {
- width: 100%;
- padding: 30rpx 0;
- box-sizing: border-box;
- position: relative;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
- input {
- width: 100%;
- font-weight: 400;
- font-size: 30rpx;
- color: #222222;
- }
- text {
- font-weight: 400;
- font-size: 30rpx;
- color: #666666;
- }
- button {
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- opacity: 0;
- }
- }
- }
- }
- }
- }
-</style>
diff --git a/small-program/pages/certification-results/certification-results.vue b/small-program/pages/certification-results/certification-results.vue
deleted file mode 100644
index 5f8d16d..0000000
--- a/small-program/pages/certification-results/certification-results.vue
+++ /dev/null
@@ -1,373 +0,0 @@
-<template>
- <view class="box">
- <view class="box-head" v-if="info && info.auditStatus ==2">
- <image src="/static/icon/ic_pass@2x.png" mode="widthFix"></image>
- <text >{{typeName}}宸查�氳繃</text>
- </view>
- <view class="box-error" v-if="info && info.auditStatus ==3">
- <view class="box-error-top">
- <image src="/static/icon/ic_fail@2x.png" mode="widthFix"></image>
- <text>{{typeName}}宸叉嫆缁�</text>
- </view>
- <view class="box-error-info">{{info.auditRemark}}</view>
- </view>
- <view class="box-ing" v-if="info && (info.auditStatus||1) ==1">
- <view class="box-ing-top">
- <image src="/static/icon/ic_renzhengzhong@2x.png" mode="widthFix"></image>
- <text>璁よ瘉涓�</text>
- </view>
- <view class="box-ing-info">璁よ瘉缁撴灉灏嗛�氳繃鐭俊/璁㈤槄娑堟伅閫氱煡鎮�</view>
- </view>
- <view class="box-error" v-if="!info">
- <view class="box-error-top">
- <image src="/static/icon/ic_fail@2x.png" mode="widthFix"></image>
- <text>鏈煡璇㈠埌鐢宠璁板綍</text>
- </view>
- </view>
- <view class="box-list">
- <view class="box-list-item">
- <view class="box-list-item-label">璁よ瘉绫诲瀷</view>
- <view class="box-list-item-val">
- <text>{{info.authType == 1?'浼佷笟':'涓汉'}}</text>
- </view>
- </view>
- <view class="box-list-item">
- <view class="box-list-item-label">鑱旂郴浜�</view>
- <view class="box-list-item-val">
- <text>{{info.linkName}}</text>
- </view>
- </view>
- <view class="box-list-item">
- <view class="box-list-item-label">鎵嬫満鍙�</view>
- <view class="box-list-item-val">
- <text>{{info.telephone}}</text>
- </view>
- </view>
- <view class="box-list-item">
- <view class="box-list-item-label">鎺ュ崟浣嶇疆</view>
- <view class="box-list-item-val">
- <text>{{info.location}}</text>
- <view class="box-list-item-val-edit" v-if="info && info.auditStatus ==2" @click="goEditAddr">淇敼</view>
- </view>
- </view>
- <view class="box-list-info" >
- <view class="box-list-info-label">{{info.authType==1?'璁よ瘉璧勬枡':'韬唤淇℃伅'}}</view>
- <view class="box-list-info-list">
- <view class="box-list-info-list-image" v-for="item in info.imgList">
- <image :src="item" @click="previemImg(item)" mode="widthFix"></image>
- </view>
- </view>
- </view>
- </view>
- <view class="box-footer" v-if="info &&info.auditStatus ==3">
- <view class="box-footer-btn" @click="goRenzheng">閲嶆柊璁よ瘉</view>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- title: '鐢ㄦ埛璁よ瘉鐢宠',
- typeName: '鐢ㄦ埛璁よ瘉',
- flag: null,
- loading:false,
- info: {},
- };
- },
- onLoad(options) {
- console.log(options)
- var flag = options.flag
- this.flag = flag
- this.getApplyData()
- switch(flag){
- case '1':
- this.title = '璐ц繍璁よ瘉鐢宠'
- this.typeName='璐ц繍璁よ瘉'
- break;
- case '2':
- this.title = '渚涢璁よ瘉鐢宠'
- this.typeName='渚涢璁よ瘉'
- break;
- default:
- this.title = '鐢ㄥ伐璁よ瘉鐢宠'
- this.typeName='鐢ㄥ伐璁よ瘉'
- break;
- }
- uni.setNavigationBarTitle({
- title:this.title
- })
- },
- methods:{
- goRenzheng(){
- uni.navigateTo({
- url: '/pages/employment-certification/employment-certification?flag='+this.flag
- })
- },
- getApplyData(){
- var that = this
- var param ={ type:that.flag}
- this.$u.api.getIdentityInfo(param).then(res =>{
- if(res.code ===200){
- that.info = res.data
- }
- })
- },
- previemImg(src){
- uni.previewImage({
- current: src, // 褰撳墠鏄剧ず鍥剧墖鐨刪ttp閾炬帴
- urls: [src] // 闇�瑕侀瑙堢殑鍥剧墖http閾炬帴鍒楄〃
- });
- },
- goEditAddr(){
- var that =this
- uni.chooseLocation({
- success:(res)=> {
- console.log(res);
- var param ={
- id:that.info.id,
- lat:res.latitude,
- location:res.name || res.address,
- lgt:res.longitude
- }
- that.$u.api.updateLocation(param).then(res1 =>{
- if(res1.code ===200){
- uni.showToast({
- title: '淇敼鎴愬姛 ',
- icon: "none",
- duration: 2000
- });
- that.info.location=param.location
- that.info.lat=param.lat
- that.info.lgt=param.lgt
- }
- })
- },
- fail:()=>{
- // 濡傛灉鐢╱ni.chooseLocation娌℃湁鑾峰彇鍒板湴鐞嗕綅缃紝鍒欓渶瑕佽幏鍙栧綋鍓嶇殑鎺堟潈淇℃伅锛屽垽鏂槸鍚︽湁鍦扮悊鎺堟潈淇℃伅
- uni.getSetting({
- success: (res) => {
- console.log(res);
- var status = res.authSetting;
- if(!status['scope.userLocation']){
- // 濡傛灉鎺堟潈淇℃伅涓病鏈夊湴鐞嗕綅缃殑鎺堟潈锛屽垯闇�瑕佸脊绐楁彁绀虹敤鎴烽渶瑕佹巿鏉冨湴鐞嗕俊鎭�
- uni.showModal({
- title:"鏄惁鎺堟潈褰撳墠浣嶇疆",
- content:"闇�瑕佽幏鍙栨偍鐨勫湴鐞嗕綅缃紝璇风‘璁ゆ巿鏉冿紝鍚﹀垯鍦板浘鍔熻兘灏嗘棤娉曚娇鐢�",
- success:(tip)=>{
- if(tip.confirm){
- // 濡傛灉鐢ㄦ埛鍚屾剰鎺堟潈鍦扮悊淇℃伅锛屽垯鎵撳紑鎺堟潈璁剧疆椤甸潰锛屽垽鏂敤鎴风殑鎿嶄綔
- uni.openSetting({
- success:(data)=>{
- // 濡傛灉鐢ㄦ埛鎺堟潈浜嗗湴鐞嗕俊鎭湪锛屽垯鎻愮ず鎺堟潈鎴愬姛
- if(data.authSetting['scope.userLocation']===true){
- uni.showToast({
- title:"鎺堟潈鎴愬姛",
- icon:"success",
- duration:1000
- })
- // 鎺堟潈鎴愬姛鍚庯紝鐒跺悗鍐嶆chooseLocation鑾峰彇淇℃伅
- uni.chooseLocation({
- success: (res) => {
- console.log("璇︾粏鍦板潃",res);
- // this.getRegionFn(res);
- }
- })
- }else{
- uni.showToast({
- title:"鎺堟潈澶辫触",
- icon:"none",
- duration:1000
- })
- }
- }
- })
- }
- }
- })
- }
- },
- fail: (res) => {
- uni.showToast({
- title:"璋冪敤鎺堟潈绐楀彛澶辫触",
- icon:"none",
- duration:1000
- })
- }
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .box {
- width: 100%;
- .box-footer {
- width: 100%;
- padding: 0 30rpx;
- box-sizing: border-box;
- margin-top: 60rpx;
- .box-footer-btn {
- width: 100%;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- background: #00BC12;
- border-radius: 44rpx;
- font-weight: 500;
- font-size: 32rpx;
- color: #FFFFFF;
- }
- }
- .box-error {
- width: 100%;
- height: 248rpx;
- background: rgba(190,56,56,0.1);
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- .box-error-top {
- display: flex;
- align-items: center;
- justify-content: center;
- image {
- width: 60rpx;
- height: 60rpx;
- margin-right: 24rpx;
- }
- text {
- font-weight: 600;
- font-size: 40rpx;
- color: #FF0000;
- }
- }
- .box-error-info {
- font-weight: 400;
- font-size: 28rpx;
- color: #333333;
- margin-top: 32rpx;
- }
- }
-
- .box-ing {
- width: 100%;
- height: 248rpx;
- background: rgba(255, 114, 0, 0.10);
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- .box-ing-top {
- display: flex;
- align-items: center;
- justify-content: center;
- image {
- width: 60rpx;
- height: 60rpx;
- margin-right: 24rpx;
- }
- text {
- font-weight: 600;
- font-size: 40rpx;
- color: #FF7200;
- }
- }
- .box-ing-info {
- font-weight: 400;
- font-size: 28rpx;
- color: #333333;
- margin-top: 32rpx;
- }
- }
- .box-head {
- width: 100%;
- height: 172rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- background: rgba(91,190,56,0.1);
- image {
- width: 60rpx;
- height: 60rpx;
- margin-right: 24rpx;
- }
- text {
- font-weight: 600;
- font-size: 40rpx;
- color: #00BC12;
- }
- }
- .box-list {
- width: 100%;
- padding: 0 30rpx;
- box-sizing: border-box;
- .box-list-info {
- width: 100%;
- margin-top: 30rpx;
- .box-list-info-label {
- font-weight: 400;
- font-size: 30rpx;
- color: #777777;
- margin-bottom: 30rpx;
- }
- .box-list-info-list {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- flex-wrap: wrap;
- .box-list-info-list-image {
- width: 314rpx;
- height: 216rpx;
- margin: 10rpx;
- border-radius: 16rpx;
- overflow: hidden;
- display: flex;
- align-items: center;
- justify-content: center;
- image {
- width: 100%;
- }
- }
- }
- }
- .box-list-item {
- width: 100%;
- box-sizing: border-box;
- padding: 30rpx 0;
- display: flex;
- align-items: start;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
- .box-list-item-label {
- font-weight: 400;
- font-size: 30rpx;
- color: #777777;
- flex-shrink: 0;
- margin-right: 50rpx;
- }
- .box-list-item-val {
- display: flex;
- align-items: start;
- text {
- font-weight: 400;
- font-size: 30rpx;
- color: #222222;
- }
- .box-list-item-val-edit {
- flex-shrink: 0;
- font-weight: 400;
- font-size: 30rpx;
- color: #00BC12;
- margin-left: 20rpx;
- }
- }
- }
- }
- }
-</style>
diff --git a/small-program/pages/certification-successful/certification-successful.vue b/small-program/pages/certification-successful/certification-successful.vue
deleted file mode 100644
index 5dd2147..0000000
--- a/small-program/pages/certification-successful/certification-successful.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
- <view class="success">
- <image src="/static/icon/ic_success@2x.png" mode="widthFix"></image>
- <text class="success-a">渚涢璁よ瘉鎻愪氦鎴愬姛</text>
- <text class="success-b">璇疯�愬績绛夊緟瀹℃牳</text>
- <view class="success-footer">
- <view class="success-footer-btn">鍥炲埌棣栭〉</view>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
-
- };
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .success {
- width: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- image {
- width: 180rpx;
- height: 180rpx;
- margin-top: 180rpx;
- margin-bottom: 40rpx;
- }
- .success-a {
- font-weight: 500;
- font-size: 36rpx;
- color: #111111;
- margin-bottom: 20rpx;
- }
- .success-b {
- font-weight: 400;
- font-size: 26rpx;
- color: #999999;
- margin-bottom: 94rpx;
- }
- .success-footer {
- display: flex;
- align-items: center;
- justify-content: center;
- .success-footer-btn {
- width: 200rpx;
- height: 72rpx;
- line-height: 72rpx;
- text-align: center;
- border-radius: 36rpx;
- border: 1rpx solid #00BC12;
- font-weight: 400;
- font-size: 28rpx;
- color: #00BC12;
- }
- }
- }
-</style>
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index bc61c15..f5c1ca0 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -18,8 +18,8 @@
<template v-else>
<!-- 鍙戝崟鏂� -->
<view class="index-labs" v-if="typeViewId === 0" :style="{ top: statusbarHeight + navHeight + 'px' }">
- <scroll-view scroll-x class="scroll-view_H">
- <view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list1" :key="index" @click="clickOrderType(item.id)">
+ <scroll-view scroll-x class="scroll-view_H" :scroll-into-view="'view'+status">
+ <view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list1" :id="'view'+item.id" :key="item.id" @click="clickOrderType(item.id)">
{{item.name}}
<view class="index-labs-row-x" v-if="item.id === status"></view>
</view>
@@ -27,8 +27,8 @@
</view>
<!-- 鎺ュ崟鏂� -->
<view class="index-labs" v-if="typeViewId === 1" :style="{ top: statusbarHeight + navHeight + 'px' }">
- <scroll-view scroll-x class="scroll-view_H">
- <view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list" :key="index" @click="clickOrderType(item.id)">
+ <scroll-view scroll-x class="scroll-view_H" :scroll-into-view="'view'+status">
+ <view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list" :id="'view'+item.id" :key="item.id" @click="clickOrderType(item.id)">
{{item.name}}
<view class="index-labs-row-x" v-if="item.id === status"></view>
</view>
@@ -210,11 +210,33 @@
computed: {
...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid', 'latitude', 'longitude'])
},
- onShow(options) {
+ async onShow(options) {
+ var flag = getApp().globalData.orderStatus
+ console.log(getApp().globalData,"=====================================")
+ this.status = ''
+ this.commentStatus=''
+ // status: this.status === 5 ? 4 : this.status,
+ // commentStatus: this.status === 5 ? 0 : '',
+ if(flag =='1'){//鍙戝崟鏂瑰緟鎺ュ崟
+ this.status = 1
+ }else if(flag =='2'){//鍙戝崟鏂硅繘琛屼腑
+ this.status = 3
+ }else if(flag =='3'){//鍙戝崟鏂瑰緟璇勪环
+ this.status = 5
+ }else if(flag =='4'){//鎺ュ崟鏂瑰凡鎺ュ崟
+ this.status =2
+ }else if(flag =='5'){//鎺ュ崟鏂硅繘琛屼腑
+ this.status =3
+ }else if(flag =='6'){//鎺ュ崟鏂瑰凡瀹屾垚
+ this.status =4
+ }
this.typeViewId = 0
if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
console.log('宸茬櫥闄�')
this.isLogin = true
+ if (this.userInfo && this.userInfo.useIdentity == 1) {
+ this.typeViewId = 1
+ }
if (!this.isOnce) {
this.commentStatus = ''
this.orderList = []
@@ -225,9 +247,6 @@
} else {
this.isLogin = false
console.log('鏈櫥闄�')
- }
- if (this.userInfo && this.userInfo.useIdentity == 1) {
- this.typeViewId = 1
}
},
data() {
@@ -707,7 +726,7 @@
.active {
font-weight: 500 !important;
font-size: 32rpx !important;
- color: #222222 !important;
+ color: #00BC12 !important;
}
.index-labs-row {
display: inline-block;
@@ -717,7 +736,7 @@
font-size: 30rpx;
color: #666666;
position: relative;
- margin-right: 62rpx;
+ margin-right: 50rpx;
&:last-child {
margin: 0 !important;
}
@@ -726,7 +745,7 @@
bottom: 0;
left: 50%;
width: 40rpx;
- height: 2rpx;
+ height: 4rpx;
background-color: #00BC12;
transform: translate(-50%, 0);
}
diff --git a/small-program/pages/employment-certification/employment-certification.vue b/small-program/pages/employment-certification/employment-certification.vue
deleted file mode 100644
index b0b3a56..0000000
--- a/small-program/pages/employment-certification/employment-certification.vue
+++ /dev/null
@@ -1,818 +0,0 @@
-<template>
- <view class="box">
- <view class="box-head">
- <!-- 鐢ㄥ伐 -->
- <image class="box-head-bg" src="@/static/image/bg_renzheng_yonggong@2x.png" mode="widthFix" v-if="title === '鐢ㄥ伐璁よ瘉'"></image>
- <!-- 璐ц繍 -->
- <image class="box-head-bg" src="@/static/image/bg_renzheng_huoyun@2x.png" mode="widthFix" v-if="title === '璐ц繍璁よ瘉'"></image>
- <!-- 鐢ㄩ -->
- <image class="box-head-bg" src="@/static/image/bg_renzheng_gongcan@2x.png" mode="widthFix" v-if="title === '渚涢璁よ瘉'"></image>
- <view class="box-head-info">
- <text>{{title}}</text>
- <text>璇锋寜瑕佹眰濉啓璁よ瘉淇℃伅</text>
- </view>
- <view class="box-head-content">
- <view class="item">
- <view class="item-label">
- <text>璁よ瘉绫诲瀷</text>
- <text>*</text>
- </view>
- <view class="item-cate">
- <view :class="'item-cate-row '+ (!isCompany?'active':'')" @click="changeIsCompany">涓汉</view>
- <view :class="'item-cate-row '+(isCompany?'active':'')" @click="changeIsCompany">浼佷笟</view>
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>鑱旂郴浜�</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <input type="text" v-model="form.linkName" placeholder="璇疯緭鍏ョ湡瀹炲鍚�" />
- </view>
- </view>
- <view class="item" v-if="isCompany">
- <view class="item-label">
- <text>鍗曚綅鍚嶇О</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <input type="text" v-model="form.companyName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" />
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>鎵嬫満鍙�</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <input type="text" v-model="form.telephone" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" />
- </view>
- </view>
- <view class="item" @click="chooseMPLoaction">
- <view class="item-label">
- <text>鎺ュ崟浣嶇疆</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <text>{{form.location || '鍘婚�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#111111" size="18"></u-icon>
- </view>
- </view>
- <view class="item" v-if="!isCompany">
- <view class="item-label">
- <text>韬唤璇佷俊鎭�</text>
- <text>*</text>
- </view>
- <view class="item-upload">
- <view class="item-upload-item" @click="uploadImg(11)">
- <image v-if="form.img11Full && form.img11Full !=''" :src="form.img11Full" mode="widthFix">
- </image>
- <image v-else src="/static/image/btn_renxiang@2x.png" mode="widthFix"></image>
- </view>
- <view class="item-upload-item" @click="uploadImg(21)">
- <image v-if="form.img21Full && form.img21Full !=''" :src="form.img21Full" mode="widthFix">
- </image>
- <image v-else src="/static/image/btn_guohui@2x.png" mode="widthFix"></image>
- </view>
- </view>
- </view>
- <view class="item" v-if="isCompany">
- <view class="item-label">
- <text>璁よ瘉璧勬枡</text>
- <text>*</text>
- </view>
- <view class="item-upload" v-if="flag==0">
- <view class="item-upload-item1" @click="uploadImg(1)">
- <view class="image":style="form.img1Full?'background-image:url('+form.img1Full+') ;background-size: 100% 100%;':''">
- <image v-if="1==2&&form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
- </image>
- <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>1.钀ヤ笟鎵х収</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item1" @click="uploadImg(2)">
- <view class="image":style="form.img2Full?'background-image:url('+form.img2Full+') ;background-size: 100% 100%;':''">
- <image v-if="1==2&&form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
- </image>
- <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>2.鍏跺畠璁よ瘉璧勬枡</text>
- </view>
- </view>
- </view>
- <view class="item-upload" v-if="flag==1">
- <view class="item-upload-item1" @click="uploadImg(1)">
- <view class="image" :style="form.img1Full?'background-image:url('+form.img1Full+') ;background-size: 100% 100%;':''">
- <image v-if="1==2&&form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
- </image>
- <image src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>1.钀ヤ笟鎵х収</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item1" @click="uploadImg(2)">
- <view class="image" :style="form.img2Full?'background-image:url('+form.img2Full+') ;background-size: 100% 100%;':''">
- <image v-if="1==2&&form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
- </image>
- <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>2.閬撹矾杩愯緭缁忚惀璁稿彲璇�</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item1" @click="uploadImg(3)">
- <view class="image":style="form.img3Full?'background-image:url('+form.img3Full+') ;background-size: 100% 100%;':''">
- <image v-if="1==2&&form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix">
- </image>
- <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>3.鍏跺畠璁よ瘉璧勬枡</text>
- </view>
- </view>
- </view>
- <view class="item-upload" v-if="flag==2">
- <view class="item-upload-item1" @click="uploadImg(1)">
- <view class="image":style="form.img1Full?'background-image:url('+form.img1Full+') ;background-size: 100% 100%;':''">
- <image v-if="1==2&&form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
- </image>
- <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>1.钀ヤ笟鎵х収</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item1" @click="uploadImg(2)">
- <view class="image":style="form.img2Full?'background-image:url('+form.img2Full+') ;background-size: 100% 100%;':''">
- <image v-if="1==2&&form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
- </image>
- <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>2.椋熷搧缁忚惀璁稿彲璇�</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item1" @click="uploadImg(3)">
- <view class="image":style="form.img3Full?'background-image:url('+form.img3Full+') ;background-size: 100% 100%;':''">
- <image v-if="1==2&&form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix">
- </image>
- <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>3.浠庝笟浜哄憳鍋ュ悍璇�</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item1" @click="uploadImg(4)">
- <view class="image":style="form.img4Full?'background-image:url('+form.img4Full+') ;background-size: 100% 100%;':''">
- <image v-if="1==2&&form.img4Full && form.img4Full !=''" :src=" form.img4Full" mode="widthFix">
- </image>
- <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>4.鍏跺畠璁よ瘉璧勬枡</text>
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class="box-head-botton" @click="applySubmit">鎻愪氦璁よ瘉</view>
- <view style="width: 100%; height: calc(30rpx + env(safe-area-inset-bottom));"></view>
- </view>
- </view>
-</template>
-
-<script>
- import {
- mapState
- } from 'vuex'
- export default {
- computed: {
- ...mapState(['userInfo'])
- },
- data() {
- return {
- bgImg: null,
- title: '鐢ㄦ埛璁よ瘉',
- flag: null,
-
- isCompany:false,
- loading:false,
- info: {},
- form: {
- "companyName": "",
- authType: 0,
- "img1": "",
- "img2": "",
- "img11": "",
- "img21": "",
- "img3": "",
- "img4": "",
- "img1Full": "",
- "img2Full": "",
- "img11Full": "",
- "img21Full": "",
- "img3Full": "",
- "img4Full": "",
- "location": "",
- "lat": null,
- "lgt": null,
- "linkName": "",
- "location": "",
- "telephone": "",
- "type": 1
- }
- };
- },
- onLoad(options) {
- console.log(options)
- var flag = options.flag
- this.flag = flag
- this.initFormData()
- this.getApplyData()
- switch(flag){
- case '1':
- this.title = '璐ц繍璁よ瘉'
- this.bgImg = require('@/static/image/bg_renzheng_huoyun@2x.png')
- break;
- case '2':
- this.title = '渚涢璁よ瘉'
- this.bgImg = require('@/static/image/bg_renzheng_gongcan@2x.png')
- break;
- default:
- this.bgImg = require('@/static/image/bg_renzheng_yonggong@2x.png'),
- this.title = '鐢ㄥ伐璁よ瘉'
- break;
- }
- uni.setNavigationBarTitle({
- title: this.title
- })
- },
- methods: {
- changeIsCompany() {
- this.isCompany = !this.isCompany
- this.form.authType = this.isCompany ? 1 : 0
- },
- inNullParam(param) {
- if (!param) {
- return true
- }
- if (param == '') {
- return true
- }
- return false
- },
- applySubmit() {
- console.log(this.loading)
- if (this.loading) {
- return
- }
- console.log('琛ㄥ崟鍙傛暟锛�', this.form)
- this.loading = true
- if (this.inNullParam(this.form.linkName) ||
- this.inNullParam(this.form.lat) ||
- this.inNullParam(this.form.lgt) ||
- this.inNullParam(this.form.location) ||
- this.inNullParam(this.form.telephone)) {
-
- uni.showToast({
- title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅1锛�',
- icon: "none",
- duration: 2000
- });
- this.loading = false
- return
- }
- if (this.form.authType == 0) {
- if (this.inNullParam(this.form.img11) || this.inNullParam(this.form.img21)) {
- uni.showToast({
- title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅3锛�',
- icon: "none",
- duration: 2000
- });
- this.loading = false
- return
- }
- } else {
- if (this.inNullParam(this.form.img1) || this.inNullParam(this.form.companyName)) {
- uni.showToast({
- title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅4锛�',
- icon: "none",
- duration: 2000
- });
- this.loading = false
- return
- }
- }
- if (this.form.type != 0 && this.form.authType == 1 && this.inNullParam(this.form.img2)) {
- uni.showToast({
- title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅锛�',
- icon: "none",
- duration: 2000
- });
- this.loading = false
- return
- }
- if (this.form.type == 1 && this.form.authType == 1 && this.inNullParam(this.form.img2)) {
- uni.showToast({
- title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅5锛�',
- icon: "none",
- duration: 2000
- });
- this.loading = false
- return
- }
- var that = this
- var param = this.form;
- if (this.form.authType == 0) {
- param.img1 = this.form.img11,
- param.img2 = this.form.img21
- }
- uni.requestSubscribeMessage({
- tmplIds: ['VJho7-lf-4_WZFfOzenDndgwNDIA0EvCiE6vqBnExpQ'],
- success(res) {
- console.log('鎻愪氦鍙傛暟锛�', param)
- that.$u.api.applyForIdentity(param).then(res => {
- if (res.code === 200) {
- uni.showToast({
- title: res.message || '鐢宠鎴愬姛 ',
- icon: "none",
- duration: 2000
- });
- uni.switchTab({
- url:'/pages/mine/mine'
- });
- }
- }).finally(() => {
- that.loading = false
- })
- },
- fail(err) {
- console.log(err)
- }
- })
- },
- chooseMPLoaction() {
- var that = this
- uni.chooseLocation({
- success: (res) => {
- console.log(res);
- this.form.location = res.name || res.address
- this.form.lat = res.latitude
- this.form.lgt = res.longitude
- },
- fail: () => {
- // 濡傛灉鐢╱ni.chooseLocation娌℃湁鑾峰彇鍒板湴鐞嗕綅缃紝鍒欓渶瑕佽幏鍙栧綋鍓嶇殑鎺堟潈淇℃伅锛屽垽鏂槸鍚︽湁鍦扮悊鎺堟潈淇℃伅
- uni.getSetting({
- success: (res) => {
- console.log(res);
- var status = res.authSetting;
- if (!status['scope.userLocation']) {
- // 濡傛灉鎺堟潈淇℃伅涓病鏈夊湴鐞嗕綅缃殑鎺堟潈锛屽垯闇�瑕佸脊绐楁彁绀虹敤鎴烽渶瑕佹巿鏉冨湴鐞嗕俊鎭�
- uni.showModal({
- title: "鏄惁鎺堟潈褰撳墠浣嶇疆",
- content: "闇�瑕佽幏鍙栨偍鐨勫湴鐞嗕綅缃紝璇风‘璁ゆ巿鏉冿紝鍚﹀垯鍦板浘鍔熻兘灏嗘棤娉曚娇鐢�",
- success: (tip) => {
- if (tip.confirm) {
- // 濡傛灉鐢ㄦ埛鍚屾剰鎺堟潈鍦扮悊淇℃伅锛屽垯鎵撳紑鎺堟潈璁剧疆椤甸潰锛屽垽鏂敤鎴风殑鎿嶄綔
- uni.openSetting({
- success: (data) => {
- // 濡傛灉鐢ㄦ埛鎺堟潈浜嗗湴鐞嗕俊鎭湪锛屽垯鎻愮ず鎺堟潈鎴愬姛
- if (data
- .authSetting[
- 'scope.userLocation'
- ] === true
- ) {
- uni.showToast({
- title: "鎺堟潈鎴愬姛",
- icon: "success",
- duration: 1000
- })
- // 鎺堟潈鎴愬姛鍚庯紝鐒跺悗鍐嶆chooseLocation鑾峰彇淇℃伅
- uni.chooseLocation({
- success: (
- res
- ) => {
- console
- .log(
- "璇︾粏鍦板潃",
- res
- );
- // this.getRegionFn(res);
- }
- })
- } else {
- uni.showToast({
- title: "鎺堟潈澶辫触",
- icon: "none",
- duration: 1000
- })
- }
- }
- })
- }
- }
- })
- }
- },
- fail: (res) => {
- uni.showToast({
- title: "璋冪敤鎺堟潈绐楀彛澶辫触",
- icon: "none",
- duration: 1000
- })
- }
- })
- }
- })
- },
- getApplyData(){
- var that = this
- var param ={ type:that.flag}
- this.$u.api.getIdentityInfo(param).then(res =>{
- if(res.code ===200){
- if(res.data && res.data.id){
- that.info = res.data
- for (const key in that.form) {
- that.form[key] = that.info[key]
- }
- if(that.info.authType == 1){
- that.form.img1Full = that.info.imgList.length>0?that.info.imgList[0]:null
- that.form.img2Full = that.info.imgList.length>1?that.info.imgList[1]:null
- that.form.img3Full = that.info.imgList.length>2?that.info.imgList[2]:null
- that.form.img4Full = that.info.imgList.length>3?that.info.imgList[3]:null
- }else{
- that.form.img1= null
- that.form.img1 = null
- that.form.img2 = null
- that.form.img2Full = null
- that.form.img11 = that.info.img1
- that.form.img11Full = that.info.imgList.length>0?that.info.imgList[0]:null
- that.form.img21 = that.info.img2
- that.form.img21Full = that.info.imgList.length>1?that.info.imgList[1]:null
- }
- }
- }
- })
- },
- uploadImg(index){
- var that =this
- uni.chooseImage({
- count: 1, // 榛樿9
- sizeType: ['original', 'compressed'],
- sourceType: ['album', 'camera'], //['album','camera'],
- mediaType: ['image'], //['image', 'video'],
- success: function(res1) {
- const tempFiles = res1.tempFiles //鍖呭惈鍥剧墖澶у皬鐨勬暟缁�
- if (tempFiles[0].size > 20 * 1024 * 1024) {
- uni.showToast({
- title: '涓婁紶鍥剧墖涓嶈兘澶т簬20M!',
- duration: 2000,
- icon: "none"
- });
- return
- }
-
- uni.uploadFile({
- url: that.$baseUrl + 'web/public/upload',
- filePath: res1.tempFilePaths[0],
- name: 'file',
- formData: {
- 'folder': 'identity',
- 'flag': index
- },
- success: (data) => {
- uni.showToast({
- title: '涓婁紶鎴愬姛',
- duration: 2000,
- icon: "none"
- });
- const res = JSON.parse(data.data)
-
- console.log(res)
- if (res.data.flag == '11') {
- that.form.img11 = res.data.imgaddr
- that.form.img11Full = res.data.url
- } else if (res.data.flag == '21') {
- that.form.img21 = res.data.imgaddr
- that.form.img21Full = res.data.url
- console.log(21, that.form.img21Full)
- } else if (res.data.flag == '1') {
- that.form.img1 = res.data.imgaddr
- that.form.img1Full = res.data.url
- } else if (res.data.flag == '2') {
- that.form.img2 = res.data.imgaddr
- that.form.img2Full = res.data.url
- } else if (res.data.flag == '3') {
- that.form.img3 = res.data.imgaddr
- that.form.img3Full = res.data.url
- } else if (res.data.flag == '4') {
- that.form.img4 = res.data.imgaddr
- that.form.img4Full = res.data.url
- }
- },
- fail: (e) => {
- uni.showToast({
- title: '涓婁紶澶辫触',
- duration: 2000,
- icon: "none"
- });
- }
- })
- },
- fail: function(err) {
- hideLoading()
- reject("閫夋嫨鏂囦欢澶辫触", err)
- }
- })
- },
- initFormData() {
- this.form = {
- "companyName": "",
- authType: 0,
- "img1": "",
- "img2": "",
- "img11": "",
- "img21": "",
- "img3": "",
- "img4": "",
- "img1Full": "",
- "img2Full": "",
- "img11Full": "",
- "img21Full": "",
- "img3Full": "",
- "img4Full": "",
- "location": "",
- "lat": null,
- "lgt": null,
- "linkName": this.userInfo.name,
- "location": "",
- "telephone": this.userInfo.telephone,
- "type": this.flag
- }
- }
- }
- }
-</script>
-
-<style>
- page {
- background-color: #F7F7F7;
- }
-</style>
-
-<style lang="scss" scoped>
- .box {
- width: 100%;
-
- .box-head {
- width: 100%;
- height: 300rpx;
- padding: 34rpx 40rpx 0 40rpx;
- box-sizing: border-box;
- // background-repeat: no-repeat;
- // background-size: 100% 100%;
- position: relative;
-
- .box-head-bg {
- width: 100%;
- height: 300rpx;
- position: absolute;
- top: 0;
- left: 0;
- z-index: -1;
- }
-
- .box-head-botton {
- width: 100%;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- font-weight: 500;
- font-size: 32rpx;
- color: #FFFFFF;
- background: #00BC12;
- border-radius: 44rpx;
- margin-top: 30rpx;
- }
-
- .box-head-info {
- width: 100%;
- display: flex;
- flex-direction: column;
-
- text {
- &:nth-child(1) {
- font-weight: bold;
- font-size: 48rpx;
- color: #FFFFFF;
- }
-
- &:nth-child(2) {
- font-weight: 400;
- font-size: 26rpx;
- color: rgba(255, 255, 255, 0.8);
- margin-top: 14rpx;
- }
- }
- }
-
- .box-head-content {
- width: 100%;
- padding: 40rpx 30rpx;
- box-sizing: border-box;
- background-color: #FFFFFF;
- border-radius: 20rpx;
- margin-top: 30rpx;
-
- .item {
- width: 100%;
- display: flex;
- flex-direction: column;
- margin-bottom: 30rpx;
-
- &:last-child {
- margin: 0 !important;
- }
-
- .item-cate {
- width: 100%;
- display: flex;
- align-items: center;
- padding: 30rpx 0;
- box-sizing: border-box;
- border-bottom: 1rpx solid #E5E5E5;
-
- .active {
- background: #00BC12 !important;
- color: #FFFFFF !important;
- }
-
- .item-cate-row {
- width: 208rpx;
- height: 72rpx;
- line-height: 72rpx;
- text-align: center;
- background: #EEEEEE;
- border-radius: 36rpx;
- margin-right: 20rpx;
-
- &:last-child {
- margin: 0 !important;
- }
- }
- }
-
- .item-label {
- display: flex;
- align-items: center;
-
- text {
- &:nth-child(1) {
- font-weight: 500;
- font-size: 32rpx;
- color: #222222;
- }
-
- &:nth-child(2) {
- font-weight: 500;
- font-size: 32rpx;
- color: #FF0000;
- }
- }
- }
-
- .item-upload {
- width: 100%;
- padding: 30rpx 0;
- box-sizing: border-box;
- display: flex;
- align-items: center;
- justify-content: space-between;
- flex-wrap: wrap;
-
- .item-upload-item {
- width: 300rpx;
- border-radius: 10px;
- height: 196rpx;
- display: flex;
- align-items: center;
- justify-content: content;
- overflow: hidden;
- border: 1px solid #c2c2c2;
-
- image {
- width: 100%;
- height: 100%;
- }
- }
-
- .item-upload-item1 {
- width: 45%;
- padding-bottom: 40px;
- border-radius: 10px;
-
- .image {
- width: 100%;
- height: 196rpx;
- background: #F7F7F7;
- border: 1px solid #c2c2c2;
- border-radius: 16rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
-
- image {
- width: 48rpx;
- height: 48rpx;
- }
-
- text {
- font-weight: 400;
- font-size: 28rpx;
- color: #666666;
- margin-top: 12rpx;
- }
- }
-
- .info {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: 16rpx;
-
- text {
- &:nth-child(1) {
- font-weight: 400;
- font-size: 26rpx;
- color: #333333;
- }
-
- &:nth-child(2) {
- font-weight: 400;
- font-size: 26rpx;
- color: #FF0000;
- }
- }
- }
- }
- }
-
- .item-val {
- width: 100%;
- padding: 30rpx 0;
- box-sizing: border-box;
- position: relative;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
-
- input {
- width: 100%;
- font-weight: 400;
- font-size: 30rpx;
- color: #222222;
- }
-
- text {
- font-weight: 400;
- font-size: 30rpx;
- color: #666666;
- }
-
- button {
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- opacity: 0;
- }
- }
- }
- }
- }
- }
-</style>
\ No newline at end of file
diff --git a/small-program/pages/freight-certification/freight-certification.vue b/small-program/pages/freight-certification/freight-certification.vue
deleted file mode 100644
index d03db9a..0000000
--- a/small-program/pages/freight-certification/freight-certification.vue
+++ /dev/null
@@ -1,300 +0,0 @@
-<template>
- <view class="box">
- <view class="box-head" :style="{ backgroundImage: 'url(' + bgImg + ')' }">
- <view class="box-head-info">
- <text>璐ц繍璁よ瘉</text>
- <text>璇锋寜瑕佹眰濉啓璁よ瘉淇℃伅</text>
- </view>
- <view class="box-head-content">
- <view class="item">
- <view class="item-label">
- <text>璁よ瘉绫诲瀷</text>
- <text>*</text>
- </view>
- <view class="item-cate">
- <view class="item-cate-row active">涓汉</view>
- <view class="item-cate-row">浼佷笟</view>
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>鑱旂郴浜�</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <input type="text" placeholder="璇疯緭鍏ョ湡瀹炲鍚�" />
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>鍗曚綅鍚嶇О</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <input type="text" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" />
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>鎵嬫満鍙�</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <text>鐐瑰嚮鑾峰彇</text>
- <button open-type="getPhoneNumber">鑾峰彇鎵嬫満鍙�</button>
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>鎺ュ崟浣嶇疆</text>
- <text>*</text>
- </view>
- <view class="item-val">
- <text>璇烽�夋嫨</text>
- <u-icon name="arrow-right" color="#111111" size="18"></u-icon>
- </view>
- </view>
- <view class="item">
- <view class="item-label">
- <text>璁よ瘉璧勬枡</text>
- <text>*</text>
- </view>
- <view class="item-upload">
- <view class="item-upload-item">
- <view class="image">
- <image src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>钀ヤ笟鎵х収</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item">
- <view class="image">
- <image src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>閬撹矾杩愯緭缁忚惀璁稿彲璇�</text>
- <text>*</text>
- </view>
- </view>
- <view class="item-upload-item">
- <view class="image">
- <image src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <text>鐐瑰嚮涓婁紶</text>
- </view>
- <view class="info">
- <text>鍏跺畠璁よ瘉璧勬枡</text>
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class="box-head-botton">鎻愪氦璁よ瘉</view>
- <view style="width: 100%; height: calc(30rpx + env(safe-area-inset-bottom));"></view>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- bgImg: require('@/static/image/bg_renzheng_huoyun@2x.png')
- };
- }
- }
-</script>
-
-<style>
- page {
- background-color: #F7F7F7;
- }
-</style>
-
-<style lang="scss" scoped>
- .box {
- width: 100%;
- .box-head {
- width: 100%;
- height: 300rpx;
- padding: 34rpx 40rpx 0 40rpx;
- box-sizing: border-box;
- background-repeat: no-repeat;
- background-size: 100% 100%;
- .box-head-botton {
- width: 100%;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- font-weight: 500;
- font-size: 32rpx;
- color: #FFFFFF;
- background: #00BC12;
- border-radius: 44rpx;
- margin-top: 30rpx;
- }
- .box-head-info {
- width: 100%;
- display: flex;
- flex-direction: column;
- text {
- &:nth-child(1) {
- font-weight: bold;
- font-size: 48rpx;
- color: #FFFFFF;
- }
- &:nth-child(2) {
- font-weight: 400;
- font-size: 26rpx;
- color: rgba(255,255,255,0.8);
- margin-top: 14rpx;
- }
- }
- }
- .box-head-content {
- width: 100%;
- padding: 40rpx 30rpx;
- box-sizing: border-box;
- background-color: #FFFFFF;
- border-radius: 20rpx;
- margin-top: 30rpx;
- .item {
- width: 100%;
- display: flex;
- flex-direction: column;
- margin-bottom: 30rpx;
- &:last-child {
- margin: 0 !important;
- }
- .item-cate {
- width: 100%;
- display: flex;
- align-items: center;
- padding: 30rpx 0;
- box-sizing: border-box;
- border-bottom: 1rpx solid #E5E5E5;
- .active {
- background: #00BC12 !important;
- color: #FFFFFF !important;
- }
- .item-cate-row {
- width: 208rpx;
- height: 72rpx;
- line-height: 72rpx;
- text-align: center;
- background: #EEEEEE;
- border-radius: 36rpx;
- margin-right: 20rpx;
- &:last-child {
- margin: 0 !important;
- }
- }
- }
- .item-label {
- display: flex;
- align-items: center;
- text {
- &:nth-child(1) {
- font-weight: 500;
- font-size: 32rpx;
- color: #222222;
- }
- &:nth-child(2) {
- font-weight: 500;
- font-size: 32rpx;
- color: #FF0000;
- }
- }
- }
- .item-upload {
- width: 100%;
- padding: 30rpx 0;
- box-sizing: border-box;
- display: flex;
- align-items: center;
- justify-content: space-between;
- flex-wrap: wrap;
- .item-upload-item {
- width: 300rpx;
- margin-bottom: 40rpx;
- &:nth-child(3) {
- margin: 0 !important;
- }
- .image {
- width: 100%;
- height: 196rpx;
- background: #F7F7F7;
- border-radius: 16rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- image {
- width: 48rpx;
- height: 48rpx;
- }
- text {
- font-weight: 400;
- font-size: 28rpx;
- color: #666666;
- margin-top: 12rpx;
- }
- }
- .info {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: 16rpx;
- text {
- &:nth-child(1) {
- font-weight: 400;
- font-size: 26rpx;
- color: #333333;
- }
- &:nth-child(2) {
- font-weight: 400;
- font-size: 26rpx;
- color: #FF0000;
- }
- }
- }
- }
- }
- .item-val {
- width: 100%;
- padding: 30rpx 0;
- box-sizing: border-box;
- position: relative;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
- input {
- width: 100%;
- font-weight: 400;
- font-size: 30rpx;
- color: #222222;
- }
- text {
- font-weight: 400;
- font-size: 30rpx;
- color: #666666;
- }
- button {
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- opacity: 0;
- }
- }
- }
- }
- }
- }
-</style>
diff --git a/small-program/pages/freight/freight.vue b/small-program/pages/freight/freight.vue
index 750f55f..216c33f 100644
--- a/small-program/pages/freight/freight.vue
+++ b/small-program/pages/freight/freight.vue
@@ -950,14 +950,14 @@
}
}
.list-item-row-val {
- width: 100%;
+ // width: 100%;
padding: 30rpx 0;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
text {
- width: 80%;
+ // width: 80%;
flex-shrink: 0;
font-weight: 400;
font-size: 30rpx;
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 8d5d6c7..9bd939d 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -305,10 +305,10 @@
</view>
</view>
</template>
-
<view class="box-hz-btn" :style="{ backgroundImage: 'url(' + btn + ')' }">
<view class="box-hz-btn-kf" @click="contactPhone()" >瀹㈡湇</view>
- <view class="box-hz-btn-next" @click="jump()">绔嬪嵆涓嬪崟</view>
+ <view class="box-hz-btn-next" @click="jump()" v-if="typeId == 2">绔嬪嵆涓嬪崟</view>
+ <view class="box-hz-btn-next" @click="jump()" v-if="typeId !== 2">涓嬩竴姝�</view>
</view>
</view>
</view>
diff --git a/small-program/pages/mine/mine.vue b/small-program/pages/mine/mine.vue
index 3aa22eb..26b9905 100644
--- a/small-program/pages/mine/mine.vue
+++ b/small-program/pages/mine/mine.vue
@@ -35,35 +35,35 @@
</view>
<view class="statistics">
<view class="statistics-box" v-if="!isLogin || userInfo.useIdentity !=1">
- <view class="statistics-item" >
+ <view class="statistics-item" @click="jumpOrderList('0')" >
<text>{{isLogin?(userInfo.userCenterVO.releaseTaskTotal||0):'-'}}</text>
<text>鎬诲彂鍗曟暟</text>
</view>
<view class="statistics-x"></view>
- <view class="statistics-item">
+ <view class="statistics-item" @click="jumpOrderList('1')" >
<text class="redtxt">{{isLogin?(userInfo.userCenterVO.waitReceiveTotal||0):'-'}}</text>
<text>寰呮帴鍗�</text>
</view>
- <view class="statistics-item">
+ <view class="statistics-item" @click="jumpOrderList('2')" >
<text>{{isLogin?(userInfo.userCenterVO.doingTotal||0):'-'}}</text>
<text>杩涜涓�</text>
</view>
- <view class="statistics-item">
+ <view class="statistics-item" @click="jumpOrderList('3')" >
<text>{{isLogin?(userInfo.userCenterVO.waitCommentTotal||0):'-'}}</text>
<text>寰呰瘎浠�</text>
</view>
</view>
<view class="statistics-box" v-else>
- <view class="statistics-item" >
+ <view class="statistics-item" @click="jumpOrderList('4')" >
<text>{{isLogin?(userInfo.userCenterVO.receiveTotal||0):'-'}}</text>
<text>宸叉帴鍗�</text>
</view>
<view class="statistics-x"></view>
- <view class="statistics-item">
+ <view class="statistics-item" @click="jumpOrderList('5')">
<text>{{isLogin?(userInfo.userCenterVO.taskingTotal||0):'-'}}</text>
<text>杩涜涓�</text>
</view>
- <view class="statistics-item">
+ <view class="statistics-item" @click="jumpOrderList('6')">
<text>{{isLogin?(userInfo.userCenterVO.doneTotal||0):'-'}}</text>
<text>宸插畬鎴�</text>
</view>
@@ -164,6 +164,13 @@
}
},
methods: {
+ jumpOrderList(flag){
+ const app = getApp();
+ app.globalData.orderStatus = flag;
+ uni.switchTab({
+ url: '/pages/demand-hall/demand-hall'
+ })
+ },
getUserInfo() {
var that = this;
this.$u.api.getMemberInfo({}).then(res =>{
@@ -186,17 +193,17 @@
switch(type) {
case 1:
uni.navigateTo({
- url: '/pages/set-up/set-up'
+ url: '/packageA/pages/set-up/set-up'
})
break;
case 2:
if(!this.userInfo.workerIdentity ||this.userInfo.workerIdentity ==0){
uni.navigateTo({
- url: '/pages/employment-certification/employment-certification?flag=0'
+ url: '/packageA/pages/employment-certification/employment-certification?flag=0'
})
}else{
uni.navigateTo({
- url: '/pages/certification-results/certification-results?flag=0'
+ url: '/packageA/pages/certification-results/certification-results?flag=0'
})
}
break;
@@ -204,22 +211,22 @@
case 3:
if(!this.userInfo.driverIdentity ||this.userInfo.driverIdentity ==0){
uni.navigateTo({
- url: '/pages/employment-certification/employment-certification?flag=1'
+ url: '/packageA/pages/employment-certification/employment-certification?flag=1'
})
}else{
uni.navigateTo({
- url: '/pages/certification-results/certification-results?flag=1'
+ url: '/packageA/pages/certification-results/certification-results?flag=1'
})
}
break;
case 4:
if(!this.userInfo.chefIdentity ||this.userInfo.chefIdentity ==0){
uni.navigateTo({
- url: '/pages/employment-certification/employment-certification?flag=2'
+ url: '/packageA/pages/employment-certification/employment-certification?flag=2'
})
}else{
uni.navigateTo({
- url: '/pages/certification-results/certification-results?flag=2'
+ url: '/packageA/pages/certification-results/certification-results?flag=2'
})
}
break;
@@ -230,12 +237,12 @@
break;
case 6:
uni.navigateTo({
- url: '/pages/withdrawal/withdrawal'
+ url: '/packageA/pages/withdrawal/withdrawal'
})
break;
case 7:
uni.navigateTo({
- url: '/pages/certification-results/certification-results'
+ url: '/packageA/pages/certification-results/certification-results'
})
break;
}
diff --git a/small-program/pages/packaging-worker/packaging-worker.vue b/small-program/pages/packaging-worker/packaging-worker.vue
index 648fa1b..77a6182 100644
--- a/small-program/pages/packaging-worker/packaging-worker.vue
+++ b/small-program/pages/packaging-worker/packaging-worker.vue
@@ -9,7 +9,7 @@
<view class="list-item-row" @click="show = true">
<view class="list-item-row-label">鐢ㄥ伐鏃堕棿<b>*</b></view>
<view class="list-item-row-val">
- <text>{{form.startDate ? form.startDate + ' 鑷� ' + form.endDate + ' (' + form.priceNum1 + '澶�) ' : '璇烽�夋嫨'}}</text>
+ <text>{{form.startDate ? form.startDate + ' 鑷� ' + form.endDate + ' (' + workDays + '澶�) ' : '璇烽�夋嫨'}}</text>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
@@ -240,6 +240,8 @@
this.form.lgt = option.longitude
this.form.location = option.address
this.form.workType = option.workType
+ this.form.days = option.days
+ this.workDays = option.days
}
this.getCateList()
},
diff --git a/small-program/pages/set-up/set-up.vue b/small-program/pages/set-up/set-up.vue
deleted file mode 100644
index d7ac967..0000000
--- a/small-program/pages/set-up/set-up.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-<template>
- <view class="setup">
- <div class="setup-tx">
- <view class="setup-tx-image">
- <image v-if="fullCoverImage && fullCoverImage !=''" :src="fullCoverImage" mode="widthFix"></image>
- <image v-else src="/static/logo.png" mode="widthFix"></image>
- </view>
- <button open-type="chooseAvatar" @chooseavatar="onChooseAvatar" class="setup-tx-btn">鏇存崲澶村儚</button>
- </div>
- <view class="setup-list">
- <view class="setup-list-item">
- <view class="label">鏄电О</view>
- <view class="val">
- <input type="text" v-model='nickName' placeholder="璇疯緭鍏�" />
- </view>
- </view>
- <view class="setup-list-item">
- <view class="label">鐪熷疄濮撳悕</view>
- <view class="val">
- <input type="text" v-model='name' placeholder="璇疯緭鍏�" />
- </view>
- </view>
- <view class="setup-list-item">
- <view class="label">缁戝畾鎵嬫満鍙�</view>
- <view class="val">
- {{userInfo.telephone}}
- </view>
- </view>
- </view>
- <view class="setup-sub" @click="updateMemberInfo">淇濆瓨</view>
- </view>
-</template>
-
-<script>
- import { mapState } from 'vuex'
- export default {
- computed: {
- ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid'])
- },
- data() {
- return {
- name:null,
- coverImage:null,
- nickName:null,
- fullCoverImage:null
- };
- },
- onShow(options){
- console.log(this.userInfo)
- this.coverImage = this.userInfo.coverImage
- this.nickName = this.userInfo.nickName
- this.fullCoverImage = this.userInfo.fullCoverImage
- this.name = this.userInfo.name
- },
- methods: {
- onChooseAvatar(e){
- const { detail } = e
- var that =this
- uni.compressImage({
- src: detail.avatarUrl,
- quality: 80,
- success: res => {
- that.uploadFile(res.tempFilePath);
- }
- })
- },
- uploadFile(fileUrl) {
- var that = this
- console.log(fileUrl, 'fileUrl')
- uni.uploadFile({
- url: this.$baseUrl + 'web/public/upload',
- filePath: fileUrl,
- name: 'file',
- formData: {
- 'folder': 'member'
- },
- success:(data)=>{
- const res = JSON.parse(data.data)
- that.coverImage = res.data.imgaddr
- that.fullCoverImage = res.data.url
- that.updateMemberInfo()
- },
- fail:(e)=>{
- uni.showToast({
- title: '涓婁紶澶辫触',
- duration: 2000,
- icon: "none"
- });
- }
- })
- },
- updateMemberInfo() {
- if((!this.name ||this.name.trim() =='' )
- &&(!this.nickName ||this.nickName.trim() =='')
- &&(!this.coverImage ||this.coverImage.trim() =='')){
- uni.showToast({
- title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓淇℃伅锛�',
- icon: "none",
- duration: 2000
- });
- return
- }
- var that = this
- this.$u.api.editMemberInfo({
- name:that.name,
- nickName:that.nickName,
- coverImage:that.coverImage,
- }).then(res =>{
- that.userInfo.name = this.name
- that.userInfo.nickName = this.nickName
- that.userInfo.coverImage = this.coverImage
- that.userInfo.fullCoverImage = this.fullCoverImage
- uni.showToast({
- title: '鏇存柊鎴愬姛',
- icon: "none",
- duration: 2000
- });
- })
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .setup {
- width: 100%;
- padding: 0 40rpx;
- box-sizing: border-box;
- .setup-tx {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- margin-top: 64rpx;
- .setup-tx-image {
- width: 160rpx;
- height: 160rpx;
- border-radius: 50%;
- display: flex;
- align-items: center;
- justify-content: center;
- overflow: hidden;
- background: rgba(91,190,56,0.3);
- border: 2rpx solid rgba(91,190,56,0.35);
- image {
- width: 100%;
- }
- }
- .setup-tx-btn {
- width: 176rpx;
- height: 48rpx;
- line-height: 48rpx;
- text-align: center;
- border-radius: 32rpx;
- font-weight: 400;
- font-size: 26rpx;
- color: #5BBE38;
- border: 1rpx solid #5BBE38;
- background-color: #ffffff;
- margin-top: 24rpx;
- }
- }
- .setup-list {
- width: 100%;
- display: flex;
- flex-direction: column;
- margin-top: 40rpx;
- .setup-list-item {
- width: 100%;
- height: 112rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
- .label {
- font-weight: 400;
- font-size: 30rpx;
- color: #222222;
- flex-shrink: 0;
- width: 150rpx;
- margin-right: 30rpx;
- }
- .val {
- flex: 1;
- height: 100%;
- display: flex;
- align-items: center;
- justify-content: flex-end;
- input {
- width: 100%;
- height: 100%;
- font-weight: 400;
- font-size: 28rpx;
- color: #222222;
- text-align: right;
- }
- button {
- width: 148rpx;
- height: 60rpx;
- line-height: 60rpx;
- text-align: center;
- background: #5BBE38;
- border-radius: 30rpx;
- font-weight: 500;
- font-size: 28rpx;
- color: #FFFFFF;
- margin: 0 !important;
- }
- }
- }
- }
- .setup-sub {
- width: 100%;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- box-shadow: 0rpx 8rpx 12rpx 0rpx rgba(91,190,56,0.16);
- border-radius: 44rpx;
- font-weight: 500;
- font-size: 32rpx;
- color: white;
- background-color: #15CF52;
- margin-top: 80rpx;
- border: 1rpx solid #15CF52;
- }
- }
-</style>
diff --git a/small-program/pages/withdrawal-successful/withdrawal-successful.vue b/small-program/pages/withdrawal-successful/withdrawal-successful.vue
deleted file mode 100644
index 26400af..0000000
--- a/small-program/pages/withdrawal-successful/withdrawal-successful.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
- <view class="success">
- <image src="/static/icon/ic_success@2x.png" mode="widthFix"></image>
- <view class="success-a">鐢宠鎻愮幇鎴愬姛锛岀瓑寰呯郴缁熷鐞�</view>
- <view class="success-b">棰勮2灏忔椂鍐呭埌璐�</view>
- <view class="success-info">
- <view class="success-info-item">
- <text>鎻愮幇閲戦</text>
- <text>楼1000.00</text>
- </view>
- <view class="success-info-item">
- <text>鎻愮幇鏂瑰紡</text>
- <text>寰俊棰嗛挶</text>
- </view>
- </view>
- <view class="success-btn" @click="goHome">鍥炲埌棣栭〉</view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
-
- };
- },
- methods: {
- goHome() {
- uni.switchTab({
- url: '/pages/index/index'
- })
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .success {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- image {
- width: 180rpx;
- height: 180rpx;
- margin-top: 180rpx;
- }
- .success-a {
- font-weight: 500;
- font-size: 36rpx;
- color: #111111;
- margin-top: 40rpx;
- }
- .success-b {
- font-weight: 400;
- font-size: 26rpx;
- color: #999999;
- margin-top: 20rpx;
- }
- .success-info {
- width: 552rpx;
- padding: 30rpx;
- box-sizing: border-box;
- background: #F7F7F7;
- border-radius: 16rpx;
- margin-top: 60rpx;
- .success-info-item {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: 30rpx;
- &:last-child {
- margin: 0 !important;
- }
- text {
- &:nth-child(1) {
- font-weight: 400;
- font-size: 28rpx;
- color: #999999;
- }
- &:nth-child(2) {
- font-weight: 400;
- font-size: 28rpx;
- color: #222222;
- }
- }
- }
- }
- .success-btn {
- width: 200rpx;
- height: 72rpx;
- line-height: 72rpx;
- text-align: center;
- font-weight: 400;
- font-size: 28rpx;
- color: #5BBE38;
- border-radius: 36rpx;
- margin-top: 80rpx;
- border: 1rpx solid #5BBE38;
- }
- }
-</style>
diff --git a/small-program/pages/withdrawal/withdrawal.vue b/small-program/pages/withdrawal/withdrawal.vue
deleted file mode 100644
index 6e76dcd..0000000
--- a/small-program/pages/withdrawal/withdrawal.vue
+++ /dev/null
@@ -1,305 +0,0 @@
-<template>
- <view class="tx">
- <view class="tx-content">
- <view class="tx-content-title">鍙彁鐜颁綑棰�(鍏�)</view>
- <view class="tx-content-price">
- <text>{{((userInfo.amount|| 0)/100).toFixed(2)}}</text>
- <view class="tx-content-price-btn" @click="jump">浣欓鏄庣粏</view>
- </view>
- <view class="content">
- <view class="content-head">
- <text>鎻愮幇鍒拌处</text>
- <text>寰俊闆堕挶</text>
- </view>
- <view class="content-title">鐪熷疄濮撳悕</view>
- <view class="content-input" style="margin-bottom: 40rpx;">
- <input style="font-weight: 500;" type="text" v-model="name" @input="changeName" placeholder="寰俊瀹炲悕璁よ瘉濮撳悕" />
- </view>
- <view class="content-title">鎻愮幇閲戦</view>
- <view class="content-input">
- <view class="content-input-icon">
- <image src="/static/icon/ic_money@2x.png" mode="widthFix"></image>
- </view>
- <input type="digit" v-model="amount" @input="changeAmount" placeholder="璇疯緭鍏ユ彁鐜伴噾棰�" />
- <view class="content-input-btn" @click="inputAll">鍏ㄩ儴鎻愮幇</view>
- </view>
- <view class="content-tips">{{tips}}</view>
- <view class="content-button" @click="submit">2灏忔椂鍒拌处锛岀‘璁ゆ彁鐜�</view>
- </view>
- </view>
- </view>
-</template>
-
-<script>
- import { mapState } from 'vuex'
- export default {
- computed: {
- ...mapState(['userInfo' ])
- },
- data() {
- return {
- tips:'',//
- wxTips:'',
- canTransfer:false,
- changing1:false,
- amount: null,
- name:''
- };
- },
- onLoad(){
- this.name = this.userInfo.name
- var that =this
- that.canTransfer = false
- if (wx.canIUse('requestMerchantTransfer')) {
- //that.tips='鎮ㄧ殑寰俊鐗堟湰鏀寔璇ュ姛鑳�'
- that.canTransfer = true
- }else{
- that.tips='鎮ㄧ殑寰俊鐗堟湰杩囦綆锛岃鏇存柊鑷虫渶鏂扮増鏈娇鐢ㄨ鍔熻兘'
- uni.showToast({
- title:'鎮ㄧ殑寰俊鐗堟湰杩囦綆锛岃鏇存柊鑷虫渶鏂扮増鏈娇鐢ㄨ鍔熻兘銆�'
- })
- }
- /* wx.ready(function () {
- wx.checkJsApi({
- jsApiList: ['requestMerchantTransfer'],
- success: function (res) {
- if (res.checkResult['requestMerchantTransfer']) {
- that.canTransfer = true
- } else {
- that.tips='鎮ㄧ殑寰俊鐗堟湰杩囦綆锛岃鏇存柊鑷虫渶鏂扮増鏈娇鐢ㄨ鍔熻兘'
- uni.showToast({
- title:'鎮ㄧ殑寰俊鐗堟湰杩囦綆锛岃鏇存柊鑷虫渶鏂扮増鏈娇鐢ㄨ鍔熻兘銆�'
- })
- }
- }
- });
- }); */
- },
- methods: {
- jump() {
- uni.navigateTo({
- url: '/pages/balance-details/balance-details'
- })
- },
- inputAll(){
- this.amount = ((this.userInfo.amount|| 0)/100).toFixed(2)
- },
- changeAmount(){
- this.tips=''
- },
- wxMerchantTransfer(param){
- wx.requestMerchantTransfer({
- mchId: param.mchId,
- appId: param.appId,
- package: param.packageInfo,
- success: (res) => {
- // res.err_msg灏嗗湪椤甸潰灞曠ず鎴愬姛鍚庤繑鍥炲簲鐢ㄦ椂杩斿洖ok锛屽苟涓嶄唬琛ㄤ粯娆炬垚鍔�
- console.log(res)
- uni.navigateTo({
- url: '/pages/withdrawal-successful/withdrawal-successful'
- })
- },
- fail: (res) => {
- console.log("22222222222222",res)
- uni.showToast({
- title:'瀵逛笉璧凤紝鎻愮幇澶辫触銆�',
- icon: 'none'
- })
- },
- });
- /* WeixinJSBridge.invoke('requestMerchantTransfer',param,
- function (res) {
- if (res.err_msg === 'requestMerchantTransfer:ok') {
- // res.err_msg灏嗗湪椤甸潰灞曠ず鎴愬姛鍚庤繑鍥炲簲鐢ㄦ椂杩斿洖success锛屽苟涓嶄唬琛ㄤ粯娆炬垚鍔�
- uni.navigateTo({
- url: '/pages/withdrawal-successful/withdrawal-successful'
- })
- }else{
- uni.showToast({
- title:'瀵逛笉璧凤紝鎻愮幇澶辫触銆�'+res.err_msg
- })
- }
- }
- ); */
- },
- submit() {
- var that = this;
- if(!this.canTransfer){
- uni.showToast({
- title:'鎮ㄧ殑寰俊鐗堟湰杩囦綆锛岃鏇存柊鑷虫渶鏂扮増鏈娇鐢ㄨ鍔熻兘銆�'
- })
- return;
- }
- if(this.changing1){
- return
- }
- this.changing1 = true
- if(this.amount == null || this.amount<=0){
- this.tips = '鎻愪氦閲戦蹇呴』澶т簬0锛岃嚦灏戞彁鐜�0.1鍏�'
- this.changing1 = false
- return
- }
- if(this.amount *100 > this.userInfo.amount){
- this.tips = '杈撳叆鐨勯噾棰濆凡缁忚秴杩囧彲鎻愮幇閲戦'
- this.changing1 = false
- return
- }
- uni.requestSubscribeMessage({
- tmplIds: ['fNJy4545hcrH83bP3a1vszs7XEKWjXMsrfr2XCNsql0'],
- success(res) {
- this.changing1 = true
- var param ={amount:that.amount,name:that.name }
- that.$u.api.applyWithdrawal(param)
- .then(res =>{
- if(res.code ===200){
- that.wxMerchantTransfer(res.data);
- // uni.navigateTo({
- // url: '/pages/withdrawal-successful/withdrawal-successful'
- // })
- }
- }).finally(() => {
- that.changing1 = false
- that.tips=''
- that.amount =null
- })
- }
- })
- },
-
- }
- }
-</script>
-
-<style lang="scss">
- page {
- background-color: $uni-bg-color-grey;
- }
-</style>
-
-<style lang="scss" scoped>
- .tx {
- width: 100%;
- .tx-content {
- width: 100%;
- height: 240rpx;
- padding: 30rpx 40rpx;
- box-sizing: border-box;
- background: #5BBE38;
- .content {
- width: 100%;
- padding: 60rpx 40rpx;
- box-sizing: border-box;
- background: #FFFFFF;
- box-shadow: 0rpx 2rpx 20rpx 0rpx rgba(0,0,0,0.08);
- border-radius: 20rpx;
- .content-head {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
- padding-bottom: 32rpx;
- box-sizing: border-box;
- margin-bottom: 30rpx;
- text {
- &:nth-child(1) {
- font-weight: 400;
- font-size: 30rpx;
- color: #666666;
- }
- &:nth-child(2) {
- font-weight: 400;
- font-size: 30rpx;
- color: #222222;
- }
- }
- }
- .content-title {
- font-weight: 500;
- font-size: 34rpx;
- color: #111111;
- }
- .content-input {
- width: 100%;
- height: 116rpx;
- display: flex;
- align-items: center;
- border-bottom: 1rpx solid #E5E5E5;
- .content-input-icon {
- width: 24rpx;
- height: 56rpx;
- flex-shrink: 0;
- display: flex;
- align-items: center;
- justify-content: center;
- image {
- width: 100%;
- height: 100%;
- }
- }
- input {
- flex: 1;
- margin: 0 10px;
- font-weight: 500;
- font-size: 40rpx;
- color: #222222;
- }
- .content-input-btn {
- font-weight: 400;
- font-size: 30rpx;
- color: #5BBE38;
- }
- }
- .content-tips {
- font-weight: 400;
- font-size: 26rpx;
- color: #FF0000;
- margin-top: 30rpx;
- }
- .content-button {
- width: 100%;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- background: #5BBE38;
- box-shadow: 0rpx 8rpx 12rpx 0rpx rgba(91,190,56,0.16);
- border-radius: 44rpx;
- font-weight: 500;
- font-size: 32rpx;
- color: #FFFFFF;
- margin-top: 80rpx;
- box-sizing: border-box;
- }
- }
- .tx-content-title {
- font-weight: 400;
- font-size: 26rpx;
- color: #FFFFFF;
- margin-bottom: 14rpx;
- }
- .tx-content-price {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: 32rpx;
- text {
- font-weight: 600;
- font-size: 48rpx;
- color: #FFFFFF;
- }
- .tx-content-price-btn {
- width: 164rpx;
- height: 60rpx;
- line-height: 60rpx;
- text-align: center;
- border-radius: 30rpx;
- font-weight: 400;
- font-size: 26rpx;
- color: #FFFFFF;
- border: 2rpx solid #FFFFFF;
- }
- }
- }
- }
-</style>
--
Gitblit v1.9.3