diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 9cba30d..075b9c5 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -6,6 +6,10 @@
{
"launchtype" : "remote"
},
+ "h5" :
+ {
+ "launchtype" : "remote"
+ },
"mp-weixin" :
{
"launchtype" : "remote"
diff --git a/common/config.js b/common/config.js
index ad0c5bf..8732a04 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,4 +1,4 @@
-const ROOTPATH1 = "https://shop.canmoujiang.com/sqx_fast";
+const ROOTPATH1 = "http://192.168.0.112:8891/sqx_fast";
// const ROOTPATH1 = "http://192.168.1.17:8891/sqx_fast";
const ROOTPATH = "https://shop.canmoujiang.com/sqx_fast";
module.exports = {
diff --git a/manifest.json b/manifest.json
index ea9c95d..275c8ae 100644
--- a/manifest.json
+++ b/manifest.json
@@ -135,9 +135,9 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wxdcb523b59202e3bf",
+ "appid" : "wx00b9154f935c83a3",
"setting" : {
- "urlCheck" : false,
+ "urlCheck" : true,
"es6" : true
},
"plugins" : {
@@ -146,11 +146,7 @@
"provider" : "wx63ffb7b7894e99ae"
}
},
- "permission" : {
- "scope.userLocation" : {
- "desc" : "你的位置信息将用于小程序位置接口的效果展示"
- }
- }
+ "permission" : {}
},
"mp-alipay" : {
"usingComponents" : true
diff --git a/pages.json b/pages.json
index 4c8aa6d..9a723b0 100644
--- a/pages.json
+++ b/pages.json
@@ -6,7 +6,7 @@
"path": "pages/index/shopIndex",
"style": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "商户版",
+ "navigationBarTitleText": "商家版",
"enablePullDownRefresh": false
}
},
@@ -152,8 +152,9 @@
{
"path": "pages/my/index",
"style": {
- "navigationStyle": "custom",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "我的",
+ "navigationBarTextStyle": "black"
}
},
{
@@ -515,25 +516,31 @@
},
"tabBar": {
"color": "#B3B3B3",
- "selectedColor": "#FF3530",
+ "selectedColor": "#FF4848",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"list": [{
"pagePath": "pages/index/shopIndex",
- "iconPath": "static/img/tabbar/shop.png",
- "selectedIconPath": "static/img/tabbar/shop1.png",
+ "iconPath": "static/img/tabbar/shop2.png",
+ "selectedIconPath": "static/img/tabbar/shopselected.png",
"text": "店铺"
},
+ {
+ "pagePath": "pages/my/toExamine",
+ "iconPath": "static/img/tabbar/dingdan.png",
+ "selectedIconPath": "static/img/tabbar/dingdans.png",
+ "text": "订单"
+ },
{
"pagePath": "pages/activity/index",
- "iconPath": "static/img/tabbar/actives.png",
- "selectedIconPath": "static/img/tabbar/actives1.png",
+ "iconPath": "./static/img/tabbar/activity.png",
+ "selectedIconPath": "static/img/tabbar/activityselected.png",
"text": "活动"
},
{
"pagePath": "pages/my/index",
- "iconPath": "static/img/tabbar/my.png",
- "selectedIconPath": "static/img/tabbar/my1.png",
+ "iconPath": "static/img/tabbar/mine.png",
+ "selectedIconPath": "static/img/tabbar/mines.png",
"text": "我的"
}
]
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index a0ebe5b..1f71fce 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -3,7 +3,7 @@
@@ -60,9 +60,7 @@
name: '今日活动'
}, {
name: '待发布活动'
- }, {
- name: '历史活动'
- }, {
+ }, {
name: '发布记录'
}],
current: 0,
@@ -231,6 +229,7 @@
line-height: 60rpx;
font-size: 36rpx;
font-weight: 600;
+
.icons {
width: 30rpx;
diff --git a/pages/index/addShop.vue b/pages/index/addShop.vue
index 79655ab..9517b5f 100644
--- a/pages/index/addShop.vue
+++ b/pages/index/addShop.vue
@@ -539,7 +539,7 @@
}
.qr {
- background: #FF4701;
+ background: #FF2B2B;
}
}
diff --git a/pages/index/shopIndex.vue b/pages/index/shopIndex.vue
index f2309d6..abe002e 100644
--- a/pages/index/shopIndex.vue
+++ b/pages/index/shopIndex.vue
@@ -2,7 +2,7 @@
-
+
-
+
店铺管理
@@ -115,11 +132,15 @@
endDate: 0,
title: '暂无店铺',
headerData: [{
- name: '返利金额', //fanLiMoney
+ name: '今日预估金额', //fanLiMoney
+ num: 0
+ },
+ {
+ name: '已出订单', //shenHeCount
num: 0
},
{
- name: '审核通过订单', //shenHeCount
+ name: '未出订单', //shenHeCount
num: 0
}
],
@@ -501,7 +522,33 @@
.home-bgi {
width: 100%;
height: 260rpx;
- background: #FFF;
+ background: linear-gradient(48deg, #FF5656 0%, #FF9F74 100%);
+ opacity: 1;
+ border-radius: 8px;
+
+ .top{
+ margin-top: 10px;
+ margin-left: 10px;
+ color: #FFFFFF;
+ }
+
+ .picture{
+ position: absolute;
+ top:45px;
+ right:20px;
+ }
+
+ .bottom{
+ margin-left: 10px;
+ color: #FFFFFF;
+ font-size: 14px;
+ margin-top: 20px;
+
+ .item{
+ margin-right: 30px;
+ }
+ }
+
.swiper {
width: 100%;
@@ -534,7 +581,7 @@
.container {
.header {
width: 100%;
- background: #FFFFFF;
+ background:#F5F5F5;
padding: 30rpx;
.header_Left {
@@ -589,39 +636,70 @@
.header_Right {
// float: right;
- width: 20%;
- text-align: center;
- font-size: 26rpx;
- height: 120rpx;
- padding: 20rpx 0;
+ width: 111px;
+ height: 32px;
+ background: #FFFFFF;
+ opacity: 1;
+ border-radius: 20px 0px 0px 20px;
position: absolute;
right: 0;
- top: 0;
+ top: 10px;
z-index: 999999;
.showaddImg {
- width: 50rpx;
- height: 50rpx;
+ width: 21px;
+ height: 21px;
+ margin-top: 5px;
+ margin-left: 10px;
+ }
+
+ .showAdd{
+ position: absolute;
+ top:8px;
+ right: 20px;
+ font-size: 12px;
+ font-family: PingFang SC;
+ font-weight: 500;
+ line-height: 17px;
+ color: #FF605A;
}
}
.header_cont {
clear: both;
- background-color: #FF4701;
+ background-color: #FFFFFF;
width: 100%;
border-radius: 10rpx;
- height: 100rpx;
+ height: 120px;
margin-top: 20rpx;
- color: #FFFFFF;
+ color:#333333;
+
+ .title{
+ font-size: 16px;
+ font-family: PingFang SC;
+ font-weight: 500;
+ line-height: 22px;
+ color: #333333;
+ padding: 13px;
+ }
+
+ .line{
+ height: 1px;
+ background-color: #999999;
+ width: 100%;
+ opacity: 0.22;
+ }
.header_datas {
display: inline-block;
- width: 50%;
+ width: 110px;
text-align: center;
padding: 10rpx 0;
+ padding-left: 20px;
.numbers {
font-size: 40rpx;
+ color: #FF605A;
}
}
}
diff --git a/pages/my/index.vue b/pages/my/index.vue
index e9aae87..bc8f7d5 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -14,40 +14,37 @@
{{phone.substr(0,4)}}****{{phone.substr(8,11)}}
-
登录
- 账户资金
- ¥{{myMoney}}
账户余额
+ ¥{{myMoney}}
- ¥{{money}}
不可用金额
+ ¥{{money}}
- ¥{{cashMoney}}
可用金额
-
+ ¥{{cashMoney}}
-
+
-
+
账户充值
-
+
余额提现
-
+
余额历史
@@ -57,35 +54,35 @@
-
+
我的订单
-
+
我的店铺
-
+
活动管理
-
+
-
+
联系客服
@@ -94,42 +91,43 @@
-
+
商家教程
-
+
-
-
+
+
-
+
关于我们
-
+
意见反馈
-
+
{{Companyname}}
@@ -143,12 +141,12 @@
avatar: "/static/img/logo.jpg",
member: 0,
total: 0,
- tuiguang:'',
- backgroundImageUrl:'',
+ tuiguang: '',
+ backgroundImageUrl: '',
CompanylinkUrl: '',
Companyname: '',
userId: '',
- shopcourse:'',
+ shopcourse: '',
nickName: "",
isStudent: -1,
MerchantList: 0,
@@ -179,7 +177,7 @@
onShow() {
this.CompanylinkUrl = this.$queue.getData('151Url');
this.Companyname = this.$queue.getData('152name');
-
+
let avatar = this.$queue.getData('avatar');
if (avatar && avatar !== 'undefined') {
this.avatar = avatar;
@@ -198,7 +196,7 @@
} else {
this.invitationCode = '';
}
-
+
let that = this;
that.$Request.getT('/common/type/147').then(res => {
if (res.code == 0) {
@@ -214,7 +212,7 @@
}
}
});
-
+
this.sex = this.$queue.getData('sex');
this.userId = this.$queue.getData('userId');
if (this.userId) {
@@ -230,7 +228,7 @@
let token = this.$queue.getData('token');
let userId = this.$queue.getData('userId');
if (token) {
- if(!url){
+ if (!url) {
return;
}
if (url.indexOf('/pages/') !== -1) {
@@ -276,13 +274,14 @@
});
},
getShopList(userId) {
- this.$Request.getT('/goodsMerchant/selectGoodsMerchantPage?page=1&limit=10&userId=' + userId + '&status=2').then(res => {
- if (res.code == 0) {
- if (res.data.records.length > 0) {
- this.$queue.setData('merchantId', res.data.records[0].merchantId);
+ this.$Request.getT('/goodsMerchant/selectGoodsMerchantPage?page=1&limit=10&userId=' + userId + '&status=2')
+ .then(res => {
+ if (res.code == 0) {
+ if (res.data.records.length > 0) {
+ this.$queue.setData('merchantId', res.data.records[0].merchantId);
+ }
}
- }
- });
+ });
},
checkMerchant(userId) {
this.$Request.getT('/goodsMerchant/selectGoodsMerchantList?userId=' + userId + '&status=1').then(res => {
@@ -516,7 +515,7 @@
.header {
width: 100%;
- height: 600rpx;
+ height: 500rpx;
display: block;
position: relative;
// background: #fff;
@@ -533,11 +532,11 @@
height: 425rpx;
position: absolute;
z-index: 15;
- padding: 100upx 30upx 0;
+ padding: 0 30upx;
display: flex;
align-items: center;
// background: #FF4701;
- background-image: url(../../static/img/my/myuser.png);
+
background-size: 100%;
.user-info-box {
@@ -567,7 +566,7 @@
margin-left: 20rpx;
font-size: 40upx;
font-weight: 800;
- color: #FEFEFE;
+ color: #333333;
}
.user-info {
@@ -587,7 +586,7 @@
height: 38upx;
line-height: 38upx;
font-weight: 800;
- color: #fff;
+ color:#333333;
}
.nick_image {
@@ -611,7 +610,7 @@
}
.phones {
- color: #fff;
+ color:#333333!important;
margin-top: 15rpx;
}
@@ -647,10 +646,10 @@
width: 92%;
height: 360rpx;
position: absolute;
- background: #fff;
+ background: linear-gradient(50deg, #FF4848 0%, #FF6E6E 100%);
border-radius: 15rpx;
z-index: 15;
- margin: 235upx 30upx 0;
+ margin: 120upx 30upx 0;
padding: 20upx;
box-sizing: border-box;
box-shadow: 0 0 3px 1px #ccc;
@@ -659,28 +658,34 @@
margin-top: 10rpx;
font-size: 34rpx;
font-weight: 400;
- color: #806C30;
+ color: #FFFFFF;
+ }
+
+ .line{
+ height: 1px;
+ background-color: #FFFFFF;
+ margin-top: 20px;
}
.shouye_item {
margin-top: 20rpx;
display: flex;
width: 100%;
- color: #333333;
+ color: #FFFFFF;
// text-align: justify;
text-align: center;
padding: 0rpx 20rpx;
justify-content: space-between;
.shouye_item_text {
- color: #806C30;
+ color: #FFFFFF;
font-size: 24rpx;
}
.shouye_item_money {
margin-top: 10rpx;
- font-size: 38rpx;
- color: #FF4701;
+ font-size: 20px;
+ color: #FFFFFF;
}
.shouye_item_left {
@@ -732,7 +737,7 @@
}
.shouye_item_text {
- color: #999;
+ color: #FFFFFF;
font-size: 24rpx;
}
diff --git a/pages/my/myshop.vue b/pages/my/myshop.vue
index 44fcdf0..bd1bea9 100644
--- a/pages/my/myshop.vue
+++ b/pages/my/myshop.vue
@@ -214,8 +214,9 @@
width: 92%;
margin: 0 4%;
box-sizing: border-box;
- background: #FF4701;
+ background: #FF2B2B;
color: #fff;
+ border-radius: 8px;
}
}
diff --git a/pages/my/toExamine.vue b/pages/my/toExamine.vue
index f5e838e..bcfec84 100644
--- a/pages/my/toExamine.vue
+++ b/pages/my/toExamine.vue
@@ -15,9 +15,9 @@
-
- {{startTime}}
- 至{{endTime}}
+
+ {{startTime}}
+ 至{{endTime}}
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..97cb9fa
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,69 @@
+{
+ "description": "项目配置文件",
+ "packOptions": {
+ "ignore": []
+ },
+ "setting": {
+ "bundle": false,
+ "userConfirmedBundleSwitch": false,
+ "urlCheck": true,
+ "scopeDataCheck": false,
+ "coverView": true,
+ "es6": true,
+ "postcss": true,
+ "compileHotReLoad": false,
+ "lazyloadPlaceholderEnable": false,
+ "preloadBackgroundData": false,
+ "minified": true,
+ "autoAudits": false,
+ "newFeature": false,
+ "uglifyFileName": false,
+ "uploadWithSourceMap": true,
+ "useIsolateContext": true,
+ "nodeModules": false,
+ "enhance": true,
+ "useMultiFrameRuntime": true,
+ "useApiHook": true,
+ "useApiHostProcess": true,
+ "showShadowRootInWxmlPanel": true,
+ "packNpmManually": false,
+ "enableEngineNative": false,
+ "packNpmRelationList": [],
+ "minifyWXSS": true,
+ "showES6CompileOption": false,
+ "minifyWXML": true
+ },
+ "compileType": "miniprogram",
+ "libVersion": "2.20.2",
+ "appid": "wx5f5b49c361569a10",
+ "projectname": "miniprogram-1",
+ "debugOptions": {
+ "hidedInDevtools": []
+ },
+ "scripts": {},
+ "staticServerOptions": {
+ "baseURL": "",
+ "servePath": ""
+ },
+ "isGameTourist": false,
+ "condition": {
+ "search": {
+ "list": []
+ },
+ "conversation": {
+ "list": []
+ },
+ "game": {
+ "list": []
+ },
+ "plugin": {
+ "list": []
+ },
+ "gamePlugin": {
+ "list": []
+ },
+ "miniprogram": {
+ "list": []
+ }
+ }
+}
\ No newline at end of file
diff --git a/static/img/home/calendar.png b/static/img/home/calendar.png
new file mode 100644
index 0000000..082cdb3
Binary files /dev/null and b/static/img/home/calendar.png differ
diff --git a/static/img/home/feiji.png b/static/img/home/feiji.png
new file mode 100644
index 0000000..c4b6e51
Binary files /dev/null and b/static/img/home/feiji.png differ
diff --git a/static/img/home/money.png b/static/img/home/money.png
new file mode 100644
index 0000000..833f2ee
Binary files /dev/null and b/static/img/home/money.png differ
diff --git a/static/img/home/xinzeng.png b/static/img/home/xinzeng.png
new file mode 100644
index 0000000..3466791
Binary files /dev/null and b/static/img/home/xinzeng.png differ
diff --git a/static/img/my/about.png b/static/img/my/about.png
new file mode 100644
index 0000000..10797f3
Binary files /dev/null and b/static/img/my/about.png differ
diff --git a/static/img/my/chongzhi.png b/static/img/my/chongzhi.png
new file mode 100644
index 0000000..5c83502
Binary files /dev/null and b/static/img/my/chongzhi.png differ
diff --git a/static/img/my/dianpu.png b/static/img/my/dianpu.png
new file mode 100644
index 0000000..5c08dff
Binary files /dev/null and b/static/img/my/dianpu.png differ
diff --git a/static/img/my/dingdan.png b/static/img/my/dingdan.png
new file mode 100644
index 0000000..2a25bd8
Binary files /dev/null and b/static/img/my/dingdan.png differ
diff --git a/static/img/my/huodong.png b/static/img/my/huodong.png
new file mode 100644
index 0000000..1d549e9
Binary files /dev/null and b/static/img/my/huodong.png differ
diff --git a/static/img/my/jiaocheng.png b/static/img/my/jiaocheng.png
new file mode 100644
index 0000000..87086c3
Binary files /dev/null and b/static/img/my/jiaocheng.png differ
diff --git a/static/img/my/lianxikefu.png b/static/img/my/lianxikefu.png
new file mode 100644
index 0000000..cef2747
Binary files /dev/null and b/static/img/my/lianxikefu.png differ
diff --git a/static/img/my/lishi.png b/static/img/my/lishi.png
new file mode 100644
index 0000000..da8b843
Binary files /dev/null and b/static/img/my/lishi.png differ
diff --git a/static/img/my/share.png b/static/img/my/share.png
new file mode 100644
index 0000000..2145ef4
Binary files /dev/null and b/static/img/my/share.png differ
diff --git a/static/img/my/tixian.png b/static/img/my/tixian.png
new file mode 100644
index 0000000..a8b84ff
Binary files /dev/null and b/static/img/my/tixian.png differ
diff --git a/static/img/my/yjfk.png b/static/img/my/yjfk.png
new file mode 100644
index 0000000..19e2682
Binary files /dev/null and b/static/img/my/yjfk.png differ
diff --git a/static/img/tabbar/activity.png b/static/img/tabbar/activity.png
new file mode 100644
index 0000000..1b04af7
Binary files /dev/null and b/static/img/tabbar/activity.png differ
diff --git a/static/img/tabbar/activityselected.png b/static/img/tabbar/activityselected.png
new file mode 100644
index 0000000..e8569bb
Binary files /dev/null and b/static/img/tabbar/activityselected.png differ
diff --git a/static/img/tabbar/dingdan.png b/static/img/tabbar/dingdan.png
new file mode 100644
index 0000000..0d06a4f
Binary files /dev/null and b/static/img/tabbar/dingdan.png differ
diff --git a/static/img/tabbar/dingdans.png b/static/img/tabbar/dingdans.png
new file mode 100644
index 0000000..f90c516
Binary files /dev/null and b/static/img/tabbar/dingdans.png differ
diff --git a/static/img/tabbar/mine.png b/static/img/tabbar/mine.png
new file mode 100644
index 0000000..3789c5c
Binary files /dev/null and b/static/img/tabbar/mine.png differ
diff --git a/static/img/tabbar/mines.png b/static/img/tabbar/mines.png
new file mode 100644
index 0000000..738c0ef
Binary files /dev/null and b/static/img/tabbar/mines.png differ
diff --git a/static/img/tabbar/shop2.png b/static/img/tabbar/shop2.png
new file mode 100644
index 0000000..03b8d87
Binary files /dev/null and b/static/img/tabbar/shop2.png differ
diff --git a/static/img/tabbar/shopselected.png b/static/img/tabbar/shopselected.png
new file mode 100644
index 0000000..369413d
Binary files /dev/null and b/static/img/tabbar/shopselected.png differ