From 715a2691d88ffbe5f5be9e5403c166f923088fcc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 26 七月 2024 17:15:57 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_staff/pages/kefu/index.wxml | 5 +
admin/admin/template/fcode.xlsx | 0
wechat_staff/pages/userinfo/collect.js | 20 ++++--
wechat_staff/pages/sets/index.wxss | 17 +++++
wechat_staff/pages/sets/index.wxml | 16 +++-
server/service/src/main/java/com/doumee/dao/admin/request/FcodeImport.java | 4 +
wechat_staff/pages/detailDis/product.wxss | 2
server/service/src/main/java/com/doumee/dao/admin/request/ShopImport.java | 2
wechat_staff/pages/store/index.js | 45 +++++++++++---
wechat_staff/pages/store/info.wxml | 2
wechat_staff/app.json | 2
wechat_staff/pages/login/index.js | 2
server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 4 +
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 2
wechat_staff/api/index.js | 9 ++
wechat_staff/pages/store/index.wxml | 14 ++--
wechat_staff/pages/kefu/index.js | 2
wechat_staff/pages/kefu/index.wxss | 15 ++++
admin/.env.development | 2
wechat_staff/components/disRealpic/index.wxml | 2
wechat_staff/components/buoyClient/index.wxml | 2
wechat_staff/components/disRealpic/index.wxss | 10 ++-
22 files changed, 134 insertions(+), 45 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 4cc5086..aa3a833 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,3 +1,3 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
-VUE_APP_BASE_API = 'http://192.168.0.135:10028'
+VUE_APP_BASE_API = 'http://localhost:10028'
diff --git a/admin/admin/template/fcode.xlsx b/admin/admin/template/fcode.xlsx
new file mode 100644
index 0000000..58d3e6f
--- /dev/null
+++ b/admin/admin/template/fcode.xlsx
Binary files differ
diff --git a/server/service/src/main/java/com/doumee/dao/admin/request/FcodeImport.java b/server/service/src/main/java/com/doumee/dao/admin/request/FcodeImport.java
index b99e0ea..3d64dec 100644
--- a/server/service/src/main/java/com/doumee/dao/admin/request/FcodeImport.java
+++ b/server/service/src/main/java/com/doumee/dao/admin/request/FcodeImport.java
@@ -40,4 +40,8 @@
private String legalIdcode;
@ExcelColumn(name="绾崇◣鐧昏璇佸彿鐮�",value = "legalIdcode",index = 14)
private String taxRegCode;
+ @ExcelColumn(name="SCODE",value = "SCODE",index = 15)
+ private String scode;
+ @ExcelColumn(name="FCODE",value = "fcode",index = 16)
+ private String fcode;
}
diff --git a/server/service/src/main/java/com/doumee/dao/admin/request/ShopImport.java b/server/service/src/main/java/com/doumee/dao/admin/request/ShopImport.java
index 6e79782..5389b37 100644
--- a/server/service/src/main/java/com/doumee/dao/admin/request/ShopImport.java
+++ b/server/service/src/main/java/com/doumee/dao/admin/request/ShopImport.java
@@ -30,4 +30,6 @@
private String parentOrgId;
@ExcelColumn(name="鍝佺被缂栫爜",value = "鍝佺被缂栫爜",index = 9)
private String unitCode;
+ @ExcelColumn(name="SCODE",value = "SCODE",index = 10)
+ private String scode;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index 0c185d7..a1c246c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -364,6 +364,8 @@
shop.setLegalPhone(model.getLegalPhone());
shop.setLegalIdcode(model.getLegalIdcode());
shop.setLegalName(model.getLegalName());
+ shop.setFcode(model.getFcode());
+ shop.setScode(model.getScode());
shop.setTaxRegCode(model.getTaxRegCode());
shopMapper.updateById(shop);
}
@@ -742,6 +744,7 @@
shop.setSecondType(model.getSecondType());
shop.setAttribute(model.getAttribute());
shop.setParentIamId(model.getParentOrgId());
+ shop.setScode(model.getScode());
newList.add(shop);
}else {
shop.setEditor(loginUserInfo.getId());
@@ -750,6 +753,7 @@
shop.setSecondType(model.getSecondType());
shop.setName(model.getName());
shop.setCode(model.getCode());
+ shop.setScode(model.getScode());
shop.setUnitCode(model.getUnitCode());
if(Constants.equalsInteger(model.getStatus(),Constants.TWO)){
shop.setIsdeleted(Constants.ONE);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index cd4824e..6429dc8 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -728,7 +728,9 @@
private String dealShareImgNoUser(ContentShareImgDto param, Users users, String shareFolder, String path) {
String url =null;
//鍐呭鍒嗕韩娴锋姤鍥剧墖
+ //鍐呭鍒嗕韩娴锋姤鍥剧墖
InputStream mpCode = Constants.generateWxMiniImgStream(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG, Constants.WX_TOKEN_CUSTOMER).getCode(),
+ //"userId="+users.getId()+"&articleId="+param.getArticleId(),
param.getArticleId()+"_"+users.getId(),
param.getPageUrl());//灏忕▼搴�
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index 4157c97..86fcab2 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -13,7 +13,7 @@
export const loginByPhone = (data) => {
return request({
url: '/web/personnel/loginByPhone',
- data
+ datas
})
}
// 鍙戦�侀獙璇佺爜
@@ -196,6 +196,13 @@
data
})
}
+// 鑾峰彇闂ㄥ簵璇︽儏
+export const loadShopList= (data) => {
+ return request({
+ url: '/web/personnel/userShopList',
+ data
+ })
+}
// 鎴戠殑 鏀惰棌/鍠滄鍒楄〃
export const collectLikePage = (data) => {
return request({
diff --git a/wechat_staff/app.json b/wechat_staff/app.json
index 8c5b809..5e82744 100644
--- a/wechat_staff/app.json
+++ b/wechat_staff/app.json
@@ -58,7 +58,7 @@
]
},
"window": {
- "navigationBarTitleText": "蹇楅偊瀹堕��",
+ "navigationBarTitleText": "ZB浼樺",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#fff"
},
diff --git a/wechat_staff/components/buoyClient/index.wxml b/wechat_staff/components/buoyClient/index.wxml
index 956d4c1..973259c 100644
--- a/wechat_staff/components/buoyClient/index.wxml
+++ b/wechat_staff/components/buoyClient/index.wxml
@@ -3,7 +3,7 @@
<view class="item" data-i="0" bindtap="jumpPage">
<image src="../../static/icon/ic_kehuxihuan.png" mode="widthFix"></image>
<view>瀹㈡埛鍠滄</view>
- <view class="activeNum">{{ enjoyList.length }}</view>
+ <view class="activeNum" wx:if="{{enjoyList.length}}">{{ enjoyList.length }}</view>
</view>
<view wx:if="{{ showPurpose && showPurpose == '1' }}" class="item" data-i="2" bindtap="jumpPage">
<image src="../../static/icon/ic_yixiang.png" mode="widthFix"></image>
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index cbe6dc2..a25d888 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -37,7 +37,7 @@
</view>
<!-- goods_list -->
<scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
- <view wx:for="{{ dataList }}" data-item="{{item}}" class="item" bindtap="handleDetail">
+ <view wx:for="{{ dataList }}" data-index="index" data-item="{{item}}" class="item {{(index%2 == 0 && index == dataList.length-1)?'lastitem':''}}" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
<view wx:if="{{ item.openType == 'link' }}" data-item="{{item}}" bindtap="priviewFull" class="full">
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index 2f65c46..836d279 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -130,11 +130,15 @@
box-sizing: border-box;
display: flex;
flex-wrap: wrap;
- justify-content: space-around;
+ justify-content: space-around;
}
-.main_content .goods_list .item {
+.main_content .goods_list .lastitem {
+ margin-right: auto;
+}
+
+.main_content .goods_list .item {
width: 324rpx;
- margin-bottom: 32rpx;
+ margin-bottom: 32rpx;
}
.main_content .goods_list .item .img_wrap {
width: 100%;
diff --git a/wechat_staff/pages/detailDis/product.wxss b/wechat_staff/pages/detailDis/product.wxss
index ddf8552..0f4017a 100644
--- a/wechat_staff/pages/detailDis/product.wxss
+++ b/wechat_staff/pages/detailDis/product.wxss
@@ -150,7 +150,7 @@
}
.detail .line {
display: flex;
- height: 32rpx;
+ min-height: 32rpx;
margin-bottom: 24rpx;
}
.detail .line .label {
diff --git a/wechat_staff/pages/kefu/index.js b/wechat_staff/pages/kefu/index.js
index 8034eec..66bd51c 100644
--- a/wechat_staff/pages/kefu/index.js
+++ b/wechat_staff/pages/kefu/index.js
@@ -40,7 +40,7 @@
console.log('杩炴帴瀹㈡湇鎴愬姛');
}
})
- } catch (error) {
+ } catch (error) {
wx.showToast({
title: '璇锋洿鏂拌嚦寰俊鏈�鏂扮増鏈�',
icon: 'none'
diff --git a/wechat_staff/pages/kefu/index.wxml b/wechat_staff/pages/kefu/index.wxml
index 39c2f6d..b575179 100644
--- a/wechat_staff/pages/kefu/index.wxml
+++ b/wechat_staff/pages/kefu/index.wxml
@@ -10,9 +10,10 @@
<image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
<view class="name">鍒嗕韩</view>
</button>
- <view class="sub_btn" bindtap="toSever">
+ <view class="sub_btn" >
<image class="icon" src="../../static/icon/home_ic_kefu.png" mode="widthFix"></image>
- <view>绔嬪嵆鍜ㄨ瀹㈡湇</view>
+ <button class="sub_btn1" open-type="contact" bindcontact="handleContact">绔嬪嵆鍜ㄨ瀹㈡湇</button>
+ <!-- <view>绔嬪嵆鍜ㄨ瀹㈡湇</view> -->
</view>
</view>
</view>
diff --git a/wechat_staff/pages/kefu/index.wxss b/wechat_staff/pages/kefu/index.wxss
index 2003098..561d5df 100644
--- a/wechat_staff/pages/kefu/index.wxss
+++ b/wechat_staff/pages/kefu/index.wxss
@@ -26,8 +26,19 @@
font-weight: 500;
color: #FFFFFF;
font-style: 28rpx;
- box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
- border-radius: 8rpx;
+ background: linear-gradient( 180deg, #E0B49C 0%, #B68B74 100%);
+ box-shadow: 0px 4px 16px 0px rgba(176,135,113,0.3), inset 0px 2px 2px 0px rgba(255,255,255,0.33);
+ border-radius: 8px;
+
+}
+.footer .sub_btn1 {
+ height: 72rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ display:contents;
+ border: none;
+ background: none;
}
.footer .sub_btn .icon {
width: 34rpx;
diff --git a/wechat_staff/pages/login/index.js b/wechat_staff/pages/login/index.js
index 8182f8c..90f7f48 100644
--- a/wechat_staff/pages/login/index.js
+++ b/wechat_staff/pages/login/index.js
@@ -128,7 +128,7 @@
getWxMiniPhone({
encryptedData: data.encryptedData,
iv: data.iv,
- sessionKey: wx.getStorageSync('sessionKey') || data.iv,
+ sessionKey: wx.getStorageSync('sessionKey'),
}).then(res => {
if (res.data && res.data.token) {
wx.login({
diff --git a/wechat_staff/pages/sets/index.wxml b/wechat_staff/pages/sets/index.wxml
index bae6cd6..d6e04a1 100644
--- a/wechat_staff/pages/sets/index.wxml
+++ b/wechat_staff/pages/sets/index.wxml
@@ -8,17 +8,23 @@
<view class="name">銆奪BOM鐢ㄦ埛闅愮鍗忚銆�</view>
<image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
- <view class="logout" bindtap="showLogout">
- <view class="name">閫�鍑虹櫥褰�</view>
+ <!-- <view class="line" bindtap="showLogout">
+ <view class="name">鍒囨崲璐﹀彿</view>
+ <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
+ </view> -->
+
+ <view class="outbut" >
+ <button bindtap="showLogout" class="btn">閫�鍑虹櫥褰�</button>
</view>
</view>
+
<!-- -->
<van-popup show="{{ show }}" bind:close="onClose">
<view class="modal">
- <view class="title">娉ㄩ攢鎻愰啋</view>
- <view class="text">濡傛偍涓嶅啀浣跨敤姝よ处鍙凤紝鍙互灏嗗叾娉ㄩ攢銆傝处鍙锋垚鍔熸敞閿�鍚庯紝鍏朵笅鎵�鏈夋暟鎹皢浼氳鍒犻櫎骞跺皢鏃犳硶鎭㈠锛岃璋ㄦ厧鎿嶄綔</view>
+ <view class="title">閫�鍑虹櫥褰曟彁閱�</view>
+ <view class="text">鎮ㄧ‘璁ら��鍑哄綋鍓嶇櫥褰曡处鍙峰悧锛�</view>
<view class="btns">
- <view class="btn" bind:tap="logout">纭娉ㄩ攢</view>
+ <view class="btn" bind:tap="logout">纭閫�鍑�</view>
<view class="btn cancel" bindtap="onClose">杩樻槸绠椾簡</view>
</view>
</view>
diff --git a/wechat_staff/pages/sets/index.wxss b/wechat_staff/pages/sets/index.wxss
index ef9e711..fcea0ca 100644
--- a/wechat_staff/pages/sets/index.wxss
+++ b/wechat_staff/pages/sets/index.wxss
@@ -72,3 +72,20 @@
color: #fff;
background-color: var(--themeColor);
}
+.outbut{
+ width: 100%;
+ margin-top: 100rpx;
+}
+.outbut .btn{
+ width: 100%;
+ height: 88rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #B08771;
+ line-height: 88rpx;
+ text-align: center;
+ font-style: normal;
+ border-radius: 8rpx;
+ border: 1px solid #B08771;
+ color: rgba(176, 135, 113, 1);
+}
\ No newline at end of file
diff --git a/wechat_staff/pages/store/index.js b/wechat_staff/pages/store/index.js
index 28f0871..f85a27c 100644
--- a/wechat_staff/pages/store/index.js
+++ b/wechat_staff/pages/store/index.js
@@ -1,4 +1,4 @@
-import { getShopDetail } from '../../api/index'
+import { getShopDetail,loadShopList } from '../../api/index'
// pages/store/index.js
Page({
@@ -7,19 +7,43 @@
*/
data: {
shopId: null,
- shopInfo:{}
- },
+ shopInfo:{},
+ shopList:[]
+ },buo
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
console.log(options.shopId)
- this.setData({shopId:options.shopId})
+ // this.loadShopList()
+ // this.setData({shopId:options.shopId})
},
- getShopInfo(id){
-
- getShopDetail(id).then(res => {
+ loadShopList(params) {
+ loadShopList({}).then(res => {
+ if(res.data &&res.data){
+ const t = '';
+ res.data.forEach(item => {
+ if(item.seqNameList && item.seqNameList.length){
+ const tindex =0;
+ item.seqNameList.forEach(element => {
+ if(tindex>0){
+ t =t+"銆�"
+ }
+ t = t+ element;
+ tindex++;
+ });
+ }
+ item.seqNameInfo = t;
+ });
+ }
+ this.setData({
+ shopList: res.data || []
+ })
+ })
+ },
+ getShopInfo(id){
+ getShopDetail(id).then(res => {
if(res.data && res.data.seqNameList){
const t = '';
const tindex =0;
@@ -38,8 +62,8 @@
})
},
handleEdit(e) {
- const {shopInfo} = this.data
- const objString = JSON.stringify(shopInfo);
+ // const {shopInfo} = this.data
+ const objString = JSON.stringify(e.target.dataset.index);
console.log(objString)
wx.navigateTo({
url: '/pages/store/info?data='+objString ,
@@ -56,7 +80,8 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
- this.getShopInfo(this.data.shopId)
+ // this.getShopInfo(this.data.shopId)
+ this.loadShopList()
},
/**
diff --git a/wechat_staff/pages/store/index.wxml b/wechat_staff/pages/store/index.wxml
index d4406ce..9c1ff5d 100644
--- a/wechat_staff/pages/store/index.wxml
+++ b/wechat_staff/pages/store/index.wxml
@@ -1,24 +1,24 @@
<view class="container">
- <view class="list">
+ <view class="list" wx:for="{{shopList}}" wx:for-item="item" >
<view class="item">
- <view class="name">{{shopInfo.name}}</view>
+ <view class="name">{{item.name || ''}}</view>
<view class="line">
<view class="label">鑱旂郴浜�</view>
- <view class="val">{{shopInfo.linkerName}}</view>
+ <view class="val">{{item.linkerName || ''}}</view>
</view>
<view class="line">
<view class="label">鑱旂郴鐢佃瘽</view>
- <view class="val">{{shopInfo.linkPhone}}</view>
+ <view class="val">{{item.linkPhone || ''}}</view>
</view>
<view class="line">
<view class="label">缁忚惀鑼冨洿</view>
- <view class="val">{{shopInfo.seqNameInfo||''}}</view>
+ <view class="val">{{item.seqNameInfo||''}}</view>
</view>
<view class="line">
<view class="label">闂ㄥ簵鍦板潃</view>
- <view class="val">{{shopInfo.address}}</view>
+ <view class="val">{{item.address || ''}}</view>
</view>
- <view bindtap="handleEdit" class="edit">缂栬緫</view>
+ <view bindtap="handleEdit" data-index="{{item}}" class="edit">缂栬緫</view>
</view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/store/info.wxml b/wechat_staff/pages/store/info.wxml
index 03b5b89..fd1a018 100644
--- a/wechat_staff/pages/store/info.wxml
+++ b/wechat_staff/pages/store/info.wxml
@@ -15,7 +15,7 @@
<view class="line">
<view class="la">闂ㄥ簵缁忕含搴�</view>
<view class="val" bindtap="getLocation">
- <view class="input">{{ longitude }},{{ latitude }}</view>
+ <view class="input">[{{ longitude || '' }},{{ latitude || ''}}]</view>
<image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
</view>
diff --git a/wechat_staff/pages/userinfo/collect.js b/wechat_staff/pages/userinfo/collect.js
index 2ff7453..55c2bcd 100644
--- a/wechat_staff/pages/userinfo/collect.js
+++ b/wechat_staff/pages/userinfo/collect.js
@@ -15,7 +15,6 @@
pageSize: 10,
},
onLoad(options) {
- this.getList()
},
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
@@ -66,10 +65,16 @@
pageNum
}).then(res => {
if (res.data) {
- this.setData({
- dataList: [...this.data.dataList, ...res.data.records || []],
- total: res.data.total
- })
+ res.data.pageNum = res.data.pageNum <=0?1: res.data.pageNum
+ if(pageNum == res.data.pageNum){
+ if(pageNum == 1){
+ this.setData({dataList:[],total:0})
+ }
+ this.setData({
+ dataList: [...this.data.dataList, ...res.data.records || []],
+ total: res.data.total
+ })
+ }
}
})
},
@@ -84,8 +89,9 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
- onShow() {
-
+ onShow() {
+ this.setData({pageNum:1})
+ this.getList()
},
/**
--
Gitblit v1.9.3