diff --git a/main.js b/main.js
index 02d8dc4..089b950 100644
--- a/main.js
+++ b/main.js
@@ -7,13 +7,14 @@ import util from 'utils/util'
import { HTTP_REQUEST_URL } from '@/config/app';
import skeleton from './components/skeleton/index.vue'
import BaseMoney from './components/BaseMoney.vue';
+// import uvUI from '@climblee/uv-ui'
Vue.component('skeleton', skeleton)
Vue.component('BaseMoney', BaseMoney)
Vue.prototype.$util = util;
Vue.prototype.$Cache = Cache;
Vue.prototype.$eventHub = new Vue();
Vue.config.productionTip = false
-
+// Vue.use(uvUI);
// #ifdef H5
import { parseQuery } from "./utils";
import Auth from './libs/wechat';
diff --git a/manifest.json b/manifest.json
index 9783db7..24b1af6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -165,7 +165,10 @@
},
"requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
"usingComponents" : true,
- "__usePrivacyCheck__" : true
+ "__usePrivacyCheck__" : true,
+ "optimization" : {
+ "subPackages" : true
+ }
},
"mp-alipay" : {
"usingComponents" : true
diff --git a/package-lock.json b/package-lock.json
index 2e11c3d..7156f66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,34 +1,11 @@
{
- "name": "DS",
- "lockfileVersion": 3,
"requires": true,
- "packages": {
- "": {
- "dependencies": {
- "@lucky-canvas/uni": "^0.0.13",
- "uni-luck-draw": "^1.3.9"
- }
- },
- "node_modules/@lucky-canvas/uni": {
- "version": "0.0.13",
- "resolved": "https://registry.npmjs.org/@lucky-canvas/uni/-/uni-0.0.13.tgz",
- "integrity": "sha512-rtudKkWgGY+Uj+1xvZJqbQ/NMGGvge/os0cypj12EO6RK8ZX0NKVR97SxEsFG7mn96cDn96tCg12MwmYQHkB9g==",
- "dependencies": {
- "lucky-canvas": "~1.7.19"
- }
- },
- "node_modules/lucky-canvas": {
- "version": "1.7.27",
- "resolved": "https://registry.npmjs.org/lucky-canvas/-/lucky-canvas-1.7.27.tgz",
- "integrity": "sha512-Ftz6qD+863bI7xijBmZg3dw3cNEc7odPr70EZQcGA14y3TgTAzH65HPosOCd6kKUlMwhntBaHMx3onoj9MtJRQ=="
- },
- "node_modules/uni-luck-draw": {
- "version": "1.3.9",
- "resolved": "https://registry.npmjs.org/uni-luck-draw/-/uni-luck-draw-1.3.9.tgz",
- "integrity": "sha512-n0uUHeHL91lUpeoTYE1b6dWyYCdFfN64wGd0v/x8qyacUVbKGGP+QzdcxniVBmFM8Ycgixvxro0cMY6Hag/mQg==",
- "dependencies": {
- "lucky-canvas": "^1.5.3"
- }
+ "lockfileVersion": 1,
+ "dependencies": {
+ "@climblee/uv-ui": {
+ "version": "1.1.20",
+ "resolved": "https://registry.npmjs.org/@climblee/uv-ui/-/uv-ui-1.1.20.tgz",
+ "integrity": "sha512-jkyesHJsPJkF4Nap9ZmG1/ibKlxXA5M8+ntqKXwwloIsYSYL5SOKb0gyPj17aBOU1PkJpmeiZ8PwnTolhK2/HA=="
}
}
}
diff --git a/package.json b/package.json
index f39a9a5..5e81bd4 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
{
"dependencies": {
+ "@climblee/uv-ui": "^1.1.20",
"@lucky-canvas/uni": "^0.0.13",
"uni-luck-draw": "^1.3.9"
}
diff --git a/pages.json b/pages.json
index e947aa8..4f096f0 100644
--- a/pages.json
+++ b/pages.json
@@ -31,13 +31,13 @@
"navigationBarTitleText": "购物车"
}
},
- {
- "path": "pages/plant_grass/index",
- "style": {
- // "navigationStyle": "custom",
- "navigationBarTitleText": "种草社区"
- }
- },
+ // {
+ // "path": "pages/plant_grass/index",
+ // "style": {
+ // // "navigationStyle": "custom",
+ // "navigationBarTitleText": "种草社区"
+ // }
+ // },
{
"path": "pages/user/index",
"style": {
@@ -46,6 +46,7 @@
"navigationStyle": "custom"
}
},
+ // #ifndef MP
{
"path": "pages/small_page/index",
"style": {
@@ -54,6 +55,7 @@
}
},
+ // #endif
{
"path": "pages/shop_details/index",
"style": {
@@ -1346,11 +1348,12 @@
]
}
],
- "easycom" : {
- "custom": {
- "^u-(.*)" : "@/uni_modules/uview-ui/components/u-$1/u-$1.vue",
- "^uv-(.*)" : "@/uni_modules/uv-ui/components/uv-$1/uv-$1.vue"
- }
+ "easycom": {
+ // "autoscan": true,
+ "custom": {
+ "^u-(.*)" : "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
+ // "^uv-(.*)": "@climblee/uv-ui/components/uv-$1/uv-$1.vue"
+ }
},
"globalStyle": {
"navigationBarTextStyle": "black",
@@ -1386,12 +1389,12 @@
"selectedIconPath": "static/images/2-2.png",
"text": "分类"
},
- {
- "pagePath": "pages/shop/index",
- "iconPath": "static/images/3-1.png",
- "selectedIconPath": "static/images/3-2.png",
- "text": "商家"
- },
+ // {
+ // "pagePath": "pages/shop/index",
+ // "iconPath": "static/images/3-1.png",
+ // "selectedIconPath": "static/images/3-2.png",
+ // "text": "商家"
+ // },
{
"pagePath": "pages/order_addcart/order_addcart",
"iconPath": "static/images/4-1.png",
diff --git a/pages/shop_details/index.vue b/pages/shop_details/index.vue
index d3ecbee..8a9bdbb 100644
--- a/pages/shop_details/index.vue
+++ b/pages/shop_details/index.vue
@@ -96,7 +96,8 @@ export default {
data() {
return {
shopInfo: {
- swiper_image: [{ img: "/static/images/shop_bg.png" }],
+ // swiper_image: [{ img: "/static/images/shop_bg.png" }],
+ swiper_image: [],
},
week: [ "周一", "周二", "周三", "周四", "周五", "周六","周日"],
tabList: [{ name: "商家信息" }],
diff --git a/pages/store/merchantDetails/index.vue b/pages/store/merchantDetails/index.vue
index 57a35a2..f29c56a 100644
--- a/pages/store/merchantDetails/index.vue
+++ b/pages/store/merchantDetails/index.vue
@@ -14,7 +14,7 @@
商户账号：
- {{resData.mer_account}}
+ {{resData.mer_name}}
复制
@@ -50,7 +50,7 @@
})
},
copyTBL(url) {
- let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.mer_account}`
+ let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.mer_name}`
// #ifdef MP || APP-PLUS
uni.setClipboardData({
data: copeData,
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 6b346e7..235f4ee 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -447,8 +447,8 @@
let biz=resData.biz;
uni.setStorageSync('updateShopInfo',resData);
let {shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType} = this.shopInfo;
-
- mer_classification=this.array[resData.mer_type_id],classification=resData.mer_type_id,mer_storeType=this.storeTypeArr[resData.merchant_category_id]['type_name'],mer_type=resData.merchant_category_id,EnterprisePhone=com.mobile,shopName=resData.mer_name,userPhone=resData.phone,EnterpriseName=com.name,userName=resData.name,mer_type=resData.merchant_category_id,classification=resData.mer_type_id,EnterpriseType=com.type,EnterpriseName=com.name,EnterpriseJoinName=com.contact,EnterpriseId=com.number,userName=com.initiator,userPhone=com.inti_mobile,userId=com.inti_number,userPhoto=com.init_image,isVeteran=com.is_huimei,isVeteranPhoto=com.image_huimei,isFlagshipStore=com.is_soldier,isFlagshipStorePhoto=com.image_soldier,businessAddress=biz.province+'/'+biz.city,businessAddressDetail=biz.address_true;
+ console.log(resData);
+ mer_classification=this.array[resData.mer_type_id],classification=resData.mer_type_id,mer_storeType=this.storeTypeArr[resData.merchant_category_id]['type_name'],mer_type=resData.mer_type_id,EnterprisePhone=com.mobile,shopName=resData.mer_name,userPhone=resData.phone,EnterpriseName=com.name,userName=resData.name,mer_type=resData.mer_type_id,classification=resData.mer_type_id,EnterpriseType=com.type,EnterpriseName=com.name,EnterpriseJoinName=com.contact,EnterpriseId=com.number,userName=com.initiator,userPhone=com.inti_mobile,userId=com.inti_number,userPhoto=com.init_image,isVeteran=com.is_huimei,isVeteranPhoto=com.image_huimei,isFlagshipStore=com.is_soldier,isFlagshipStorePhoto=com.image_soldier,businessAddress=biz.province+'/'+biz.city,businessAddressDetail=biz.address_true;
this.shopInfo={
shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType
}
diff --git a/pages/store/settled/step2.vue b/pages/store/settled/step2.vue
index 582e8a1..98b68c1 100644
--- a/pages/store/settled/step2.vue
+++ b/pages/store/settled/step2.vue
@@ -82,8 +82,14 @@
法人身份证有效期开始
+
-
+
+ {{shopInfo.idCardStartTime}}
+
+
+
@@ -101,8 +107,10 @@
法人身份证有效期结束
-
-
+
+ {{shopInfo.idCardEndTime}}
+
+
@@ -151,7 +159,11 @@
统一社会信用证开始日期
-
+
+
+ {{shopInfo.countStartTime}}
+
+
请检查格式是否为：x年x月x日
@@ -163,7 +175,10 @@
统一社会信用证截止日期
-
+
+ {{shopInfo.countEndTime}}
+
+
请检查格式是否为：x年x月x日
@@ -263,7 +278,13 @@
},
computed: {
- ...mapGetters(['isLogin','viewColor'])
+ ...mapGetters(['isLogin','viewColor']),
+ // startDate() {
+ // return this.getDate('start');
+ // },
+ // endDate() {
+ // return this.getDate('end');
+ // }
},
watch:{
deep:true,
@@ -283,6 +304,44 @@
}
},
methods: {
+ handleOpen(e){
+ this.shopInfo.idCardStartTime = this.formatDate(e.detail.value)
+ this.validateBtn()
+ },
+ handleEndTime(e){
+ this.shopInfo.idCardEndTime = this.formatDate(e.detail.value)
+ this.validateBtn()
+ },
+ handleCountStartTime(e){
+ this.shopInfo.countStartTime = this.formatDate(e.detail.value)
+ this.validateBtn()
+ },
+ handleCountEndTime(e){
+ this.shopInfo.countEndTime = this.formatDate(e.detail.value)
+ this.validateBtn()
+ },
+ // getDate(type) {
+ // const date = new Date();
+ // let year = date.getFullYear();
+ // let month = date.getMonth() + 1;
+ // let day = date.getDate();
+
+ // if (type === 'start') {
+ // year = year - 60;
+ // } else if (type === 'end') {
+ // year = year + 2;
+ // }
+ // month = month > 9 ? month : '0' + month;
+ // day = day > 9 ? day : '0' + day;
+ // return `${year}-${month}-${day}`;
+ // },
+ formatDate(dateString) {
+ const date = new Date(dateString);
+ const year = date.getFullYear();
+ const month = (date.getMonth() + 1).toString().padStart(2, '0');
+ const day = date.getDate().toString().padStart(2, '0');
+ return `${year}年${month}月${day}日`;
+ },
isValidDate(dateString) {
var regex = /^\d{1,4}年\d{1,2}月\d{1,2}日$/;
return regex.test(dateString);
@@ -351,6 +410,7 @@
this.shopInfo.businessAddress = address.map(v=>v.name).join('/');
},
validateBtn(){
+ console.log(this.shopInfo)
let data2=uni.getStorageSync('shopInfo');
let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo;
if(idCardPhoto&&idCardName&&idCardNumber&&idCardStartTime&&idCardEndTime&&businessLicense&&countId&&countStartTime&&countEndTime&&businessScope&®isterAddressDetail){
@@ -498,6 +558,17 @@
background-color: var(--view-theme)!important;
color: #fff!important;
}
+ /deep/.uni-date-x .icon-calendar{
+ display: none;
+ }
+ /deep/.uni-date__x-input{
+ text-align: right;
+ color: #B2B2B2;
+ }
+ .uni-input{
+ font-size: 30rpx;
+ text-align: right;
+ }
.uni-input-placeholder {
color: #B2B2B2;
}
diff --git a/project.config.json b/project.config.json
index 36e2fb8..7721b7d 100644
--- a/project.config.json
+++ b/project.config.json
@@ -45,7 +45,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.14.3",
- "appid": "wx5fb1cc8edb3f8baa",
+ "appid": "wx95e45e4fc390dd98",
"projectname": " _merchant_h5",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
diff --git a/static/iconfont/iconfont.css b/static/iconfont/iconfont.css
index 3c26532..b33d3d7 100644
--- a/static/iconfont/iconfont.css
+++ b/static/iconfont/iconfont.css
@@ -2220,7 +2220,7 @@
content: "\e618";
}
-.icon- 1:before {
+.icon-1:before {
content: "\e739";
}
diff --git a/static/images/1-001.png b/static/images/1-001.png
deleted file mode 100644
index 3c9ac39..0000000
Binary files a/static/images/1-001.png and /dev/null differ
diff --git a/static/images/1-002.png b/static/images/1-002.png
deleted file mode 100644
index f05682b..0000000
Binary files a/static/images/1-002.png and /dev/null differ
diff --git a/static/images/2-001.png b/static/images/2-001.png
deleted file mode 100644
index 4a4ce02..0000000
Binary files a/static/images/2-001.png and /dev/null differ
diff --git a/static/images/2-002.png b/static/images/2-002.png
deleted file mode 100644
index 5069750..0000000
Binary files a/static/images/2-002.png and /dev/null differ
diff --git a/static/images/3-001.png b/static/images/3-001.png
deleted file mode 100644
index 8637fed..0000000
Binary files a/static/images/3-001.png and /dev/null differ
diff --git a/static/images/3-002.png b/static/images/3-002.png
deleted file mode 100644
index 5aa6e9c..0000000
Binary files a/static/images/3-002.png and /dev/null differ
diff --git a/static/images/4-001.png b/static/images/4-001.png
deleted file mode 100644
index 5fb279c..0000000
Binary files a/static/images/4-001.png and /dev/null differ
diff --git a/static/images/4-002.png b/static/images/4-002.png
deleted file mode 100644
index e79368c..0000000
Binary files a/static/images/4-002.png and /dev/null differ
diff --git a/static/images/5-001.png b/static/images/5-001.png
deleted file mode 100644
index 845cc63..0000000
Binary files a/static/images/5-001.png and /dev/null differ
diff --git a/static/images/5-002.png b/static/images/5-002.png
deleted file mode 100644
index ffa5e80..0000000
Binary files a/static/images/5-002.png and /dev/null differ
diff --git a/static/images/mh-btn.png b/static/images/mh-btn.png
deleted file mode 100644
index 70c00cf..0000000
Binary files a/static/images/mh-btn.png and /dev/null differ
diff --git a/static/images/shop_bg.png b/static/images/shop_bg.png
deleted file mode 100644
index 87dfd92..0000000
Binary files a/static/images/shop_bg.png and /dev/null differ
diff --git a/vue.config.js b/vue.config.js
index 3612e93..4358503 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,4 +1,5 @@
module.exports = {
+ transpileDependencies: ['@climblee/uv-ui'],
productionSourceMap: false, // 生产打包时不输出map文件，增加打包速度
configureWebpack: config => {
if (process.env.NODE_ENV === 'production') {