yanghao
/
bawangcan-shop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: yanghao:6bd83053251bf05ab8384644f432ad05b686471c
Branches Tags
yanghao:lk
yanghao:master
yanghao:yh
yanghao:zh
..
compare: yanghao:6c12c3724e84c3eea32cae7c8eec2b2f4f8b6904
Branches Tags
yanghao:lk
yanghao:master
yanghao:yh
yanghao:zh

No commits in common. '6bd83053251bf05ab8384644f432ad05b686471c' and '6c12c3724e84c3eea32cae7c8eec2b2f4f8b6904' have entirely different histories.
6bd8305325 ... 6c12c3724e

33 changed files with 112 additions and 267 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 2
      common/config.js
  2. 10
      manifest.json
  3. 27
      pages.json
  4. 7
      pages/activity/index.vue
  5. 2
      pages/index/addShop.vue
  6. 144
      pages/index/shopIndex.vue
  7. 89
      pages/my/index.vue
  8. 3
      pages/my/myshop.vue
  9. 6
      pages/my/toExamine.vue
  10. 69
      project.config.json
  11. BIN
      static/img/home/calendar.png
  12. BIN
      static/img/home/feiji.png
  13. BIN
      static/img/home/money.png
  14. BIN
      static/img/home/xinzeng.png
  15. BIN
      static/img/my/about.png
  16. BIN
      static/img/my/chongzhi.png
  17. BIN
      static/img/my/dianpu.png
  18. BIN
      static/img/my/dingdan.png
  19. BIN
      static/img/my/huodong.png
  20. BIN
      static/img/my/jiaocheng.png
  21. BIN
      static/img/my/lianxikefu.png
  22. BIN
      static/img/my/lishi.png
  23. BIN
      static/img/my/share.png
  24. BIN
      static/img/my/tixian.png
  25. BIN
      static/img/my/yjfk.png
  26. BIN
      static/img/tabbar/activity.png
  27. BIN
      static/img/tabbar/activityselected.png
  28. BIN
      static/img/tabbar/dingdan.png
  29. BIN
      static/img/tabbar/dingdans.png
  30. BIN
      static/img/tabbar/mine.png
  31. BIN
      static/img/tabbar/mines.png
  32. BIN
      static/img/tabbar/shop2.png
  33. BIN
      static/img/tabbar/shopselected.png

2
common/config.js
Unescape View File

@ -1,4 +1,4 @@
const ROOTPATH1 = "http://192.168.0.112:8891/sqx_fast"; const ROOTPATH1 = "https://shop.canmoujiang.com/sqx_fast";
// const ROOTPATH1 = "http://192.168.1.17:8891/sqx_fast"; // const ROOTPATH1 = "http://192.168.1.17:8891/sqx_fast";
const ROOTPATH = "https://shop.canmoujiang.com/sqx_fast"; const ROOTPATH = "https://shop.canmoujiang.com/sqx_fast";
module.exports = { module.exports = {

10
manifest.json
Unescape View File

@ -135,9 +135,9 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wx00b9154f935c83a3", "appid" : "wxdcb523b59202e3bf",
"setting" : { "setting" : {
"urlCheck" : true, "urlCheck" : false,
"es6" : true "es6" : true
}, },
"plugins" : { "plugins" : {
@ -146,7 +146,11 @@
"provider" : "wx63ffb7b7894e99ae" "provider" : "wx63ffb7b7894e99ae"
} }
}, },
"permission" : {} "permission" : {
"scope.userLocation" : {
"desc" : "你的位置信息将用于小程序位置接口的效果展示"
}
}
}, },
"mp-alipay" : { "mp-alipay" : {
"usingComponents" : true "usingComponents" : true

27
pages.json
Unescape View File

@ -6,7 +6,7 @@
"path": "pages/index/shopIndex", "path": "pages/index/shopIndex",
"style": { "style": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "商家版", "navigationBarTitleText": "商户版",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
@ -152,9 +152,8 @@
{ {
"path": "pages/my/index", "path": "pages/my/index",
"style": { "style": {
"enablePullDownRefresh": false, "navigationStyle": "custom",
"navigationBarTitleText": "我的", "enablePullDownRefresh": false
"navigationBarTextStyle": "black"
} }
}, },
{ {
@ -516,31 +515,25 @@
}, },
"tabBar": { "tabBar": {
"color": "#B3B3B3", "color": "#B3B3B3",
"selectedColor": "#FF4848", "selectedColor": "#FF3530",
"borderStyle": "black", "borderStyle": "black",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"list": [{ "list": [{
"pagePath": "pages/index/shopIndex", "pagePath": "pages/index/shopIndex",
"iconPath": "static/img/tabbar/shop2.png", "iconPath": "static/img/tabbar/shop.png",
"selectedIconPath": "static/img/tabbar/shopselected.png", "selectedIconPath": "static/img/tabbar/shop1.png",
"text": "店铺" "text": "店铺"
}, },
{
"pagePath": "pages/my/toExamine",
"iconPath": "static/img/tabbar/dingdan.png",
"selectedIconPath": "static/img/tabbar/dingdans.png",
"text": "订单"
},
{ {
"pagePath": "pages/activity/index", "pagePath": "pages/activity/index",
"iconPath": "./static/img/tabbar/activity.png", "iconPath": "static/img/tabbar/actives.png",
"selectedIconPath": "static/img/tabbar/activityselected.png", "selectedIconPath": "static/img/tabbar/actives1.png",
"text": "活动" "text": "活动"
}, },
{ {
"pagePath": "pages/my/index", "pagePath": "pages/my/index",
"iconPath": "static/img/tabbar/mine.png", "iconPath": "static/img/tabbar/my.png",
"selectedIconPath": "static/img/tabbar/mines.png", "selectedIconPath": "static/img/tabbar/my1.png",
"text": "我的" "text": "我的"
} }
] ]

7
pages/activity/index.vue
Unescape View File

@ -3,7 +3,7 @@
<view class="header"> <view class="header">
<view class="shopName"> <view class="shopName">
<!-- <view class="" @tap="shopBtn()">小曲奇的店铺 <image class="icons" src="../../static/img/home/down.png" mode="widthFix"></image></view> --> <!-- <view class="" @tap="shopBtn()">小曲奇的店铺 <image class="icons" src="../../static/img/home/down.png" mode="widthFix"></image></view> -->
<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 120px;left: 35rpx;top:15px"> <u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 93%;">
<u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1" <u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1"
@change="changes"> @change="changes">
</u-dropdown-item> </u-dropdown-item>
@ -20,7 +20,7 @@
</view> --> </view> -->
</view> </view>
<view class="header_Right" @tap="release(0)"> <view class="header_Right" @tap="release(0)">
<image class="showaddImg" src="../../static/img/home/feiji.png"></image> <image class="showaddImg" src="../../static/img/home/fabu.png"></image>
<view class="showAdd">发布活动</view> <view class="showAdd">发布活动</view>
</view> </view>
</view> </view>
@ -60,6 +60,8 @@
name: '今日活动' name: '今日活动'
}, { }, {
name: '待发布活动' name: '待发布活动'
}, {
name: '历史活动'
}, { }, {
name: '发布记录' name: '发布记录'
}], }],
@ -230,7 +232,6 @@
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
.icons { .icons {
width: 30rpx; width: 30rpx;
margin-left: 10rpx; margin-left: 10rpx;

2
pages/index/addShop.vue
Unescape View File

@ -539,7 +539,7 @@
} }
.qr { .qr {
background: #FF2B2B; background: #FF4701;
} }
} }

144
pages/index/shopIndex.vue
Unescape View File

@ -2,7 +2,7 @@
<view class="container"> <view class="container">
<view class="header"> <view class="header">
<view class="shopName"> <view class="shopName">
<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 120px;left:35rpx;top:30rpx"> <u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 93%;">
<u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1" <u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1"
@change="changes"> @change="changes">
</u-dropdown-item> </u-dropdown-item>
@ -12,11 +12,12 @@
<view class="header_Left"> <view class="header_Left">
<view class="left_top"> <view class="left_top">
<image class="logo" :src="merchantLogo"></image> <image class="logo" :src="merchantLogo"></image>
</view> </view>
<view class="left_down"> <view class="left_down">
<image class="icons1" src="../../static/img/home/calendar.png"></image> <image class="icons1" src="../../static/img/home/datas.png"></image>
<view class="times"><span @tap="times(1)" >{{startTime}} <view class="times"><span @tap="times(1)" style="text-decoration:underline">{{startTime}}
</span>至<span @tap="times(2)" >{{endTime}}</span></view> </span>至<span @tap="times(2)" style="text-decoration:underline">{{endTime}}</span></view>
<u-picker mode="time" v-model="show1" title="开始时间" @confirm="times1()" :params="params"> <u-picker mode="time" v-model="show1" title="开始时间" @confirm="times1()" :params="params">
</u-picker> </u-picker>
<u-picker mode="time" v-model="show2" title="截止时间" @confirm="times2()" :params="params"> <u-picker mode="time" v-model="show2" title="截止时间" @confirm="times2()" :params="params">
@ -24,47 +25,29 @@
</view> </view>
</view> </view>
<view class="header_Right" @tap="release()"> <view class="header_Right" @tap="release()">
<image class="showaddImg" src="../../static/img/home/xinzeng.png"></image> <image class="showaddImg" src="../../static/img/home/shop.png"></image>
<view class="showAdd">+新增店铺</view> <view class="showAdd">新增店铺</view>
</view> </view>
</view> </view>
<view class="home-bgi"> <view class="home-bgi">
<view style="display: flex;"> <swiper class="swiper" autoplay="1500" :indicator-dots="true" :circular='true'
<view class="top"> indicator-active-color="#ffffff" indicator-color="#cccccc">
<view style="font-size: 12px;">报名数量</view> <swiper-item class="swiper-wrap" v-for="(item,index) in banners" :key='index'
<view style="font-size: 24px;margin-top: 5px;">111</view> @tap="toGoodsInfo(item.url)">
</view> <image :src="item.imageUrl"></image>
<view class="picture"> </swiper-item>
<image src="../../static/img/home/money.png" style="width: 128px;height: 104.09px;"></image> </swiper>
</view>
</view>
<view style="display: flex;color: #FFFFFF;" class="bottom">
<view class="item">
<view style="margin-bottom: 5px;">提交任务数</view>
<view>111</view>
</view>
<view class="item">
<view style="margin-bottom: 5px;">审核通过订单</view>
<view>111</view>
</view>
<view class="item">
<view style="margin-bottom: 5px;">返利金额</view>
<view>111</view>
</view>
</view>
</view> </view>
<view class="header_cont"> <view class="header_cont">
<view class="title">订单查询</view>
<view class="line"></view>
<view class="header_datas" v-for="(item,index) in headerData" :key="index"> <view class="header_datas" v-for="(item,index) in headerData" :key="index">
<view class="numbers">{{item.num}}</view> <view class="numbers">{{item.num}}</view>
<view class="shuoming">{{item.name}}</view> <view class="shuoming">{{item.name}}</view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="conters"> <view class="conters">
<view class="title">活动数据</view> <view class="title">活动数据</view>
<view class="dosj"> <view class="dosj">
<view class="dosj_cont" v-for="(item,index) in activityData" :key="index"> <view class="dosj_cont" v-for="(item,index) in activityData" :key="index">
@ -79,7 +62,7 @@
<view class="hdsj">{{item.num}}</view> <view class="hdsj">{{item.num}}</view>
<view class="hdsj_sm">{{item.name}}</view> <view class="hdsj_sm">{{item.name}}</view>
</view> --> </view> -->
<!-- <view v-for="(item,index) in zhangdanData" :key="index" @tap="goOrder"> <view v-for="(item,index) in zhangdanData" :key="index" @tap="goOrder">
<view style="display: flex;width: 100%;padding: 30rpx;align-content: center;"> <view style="display: flex;width: 100%;padding: 30rpx;align-content: center;">
<view style="width: 45%;text-align: left;"> <view style="width: 45%;text-align: left;">
<view class="hdsj">{{item.name}}</view> <view class="hdsj">{{item.name}}</view>
@ -94,7 +77,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> --> </view>
<view style="margin-top: 40rpx;" v-if="options1.length > 0"> <view style="margin-top: 40rpx;" v-if="options1.length > 0">
<view class="title">店铺管理</view> <view class="title">店铺管理</view>
<view class="shopList" v-for="(item,index) in options1"> <view class="shopList" v-for="(item,index) in options1">
@ -132,15 +115,11 @@
endDate: 0, endDate: 0,
title: '暂无店铺', title: '暂无店铺',
headerData: [{ headerData: [{
name: '今日预估金额', //fanLiMoney name: '返利金额', //fanLiMoney
num: 0 num: 0
}, },
{ {
name: '已出订单', //shenHeCount name: '审核通过订单', //shenHeCount
num: 0
},
{
name: '未出订单', //shenHeCount
num: 0 num: 0
} }
], ],
@ -522,33 +501,7 @@
.home-bgi { .home-bgi {
width: 100%; width: 100%;
height: 260rpx; height: 260rpx;
background: linear-gradient(48deg, #FF5656 0%, #FF9F74 100%); background: #FFF;
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 { .swiper {
width: 100%; width: 100%;
@ -581,7 +534,7 @@
.container { .container {
.header { .header {
width: 100%; width: 100%;
background:#F5F5F5; background: #FFFFFF;
padding: 30rpx; padding: 30rpx;
.header_Left { .header_Left {
@ -636,70 +589,39 @@
.header_Right { .header_Right {
// float: right; // float: right;
width: 111px; width: 20%;
height: 32px; text-align: center;
background: #FFFFFF; font-size: 26rpx;
opacity: 1; height: 120rpx;
border-radius: 20px 0px 0px 20px; padding: 20rpx 0;
position: absolute; position: absolute;
right: 0; right: 0;
top: 10px; top: 0;
z-index: 999999; z-index: 999999;
.showaddImg { .showaddImg {
width: 21px; width: 50rpx;
height: 21px; height: 50rpx;
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 { .header_cont {
clear: both; clear: both;
background-color: #FFFFFF; background-color: #FF4701;
width: 100%; width: 100%;
border-radius: 10rpx; border-radius: 10rpx;
height: 120px; height: 100rpx;
margin-top: 20rpx; margin-top: 20rpx;
color:#333333; color: #FFFFFF;
.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 { .header_datas {
display: inline-block; display: inline-block;
width: 110px; width: 50%;
text-align: center; text-align: center;
padding: 10rpx 0; padding: 10rpx 0;
padding-left: 20px;
.numbers { .numbers {
font-size: 40rpx; font-size: 40rpx;
color: #FF605A;
} }
} }
} }

89
pages/my/index.vue
Unescape View File

@ -14,37 +14,40 @@
</view> </view>
<view class="phones" v-if="phone">{{phone.substr(0,4)}}****{{phone.substr(8,11)}}</view> <view class="phones" v-if="phone">{{phone.substr(0,4)}}****{{phone.substr(8,11)}}</view>
</view> </view>
<view class="noLogin" @tap="checkLogin()" v-else>登录</view> <view class="noLogin" @tap="checkLogin()" v-else>登录</view>
</view> </view>
</view> </view>
<view class="info-jifen"> <view class="info-jifen">
<view class="wdjf">账户资金</view>
<view class="shouye_item"> <view class="shouye_item">
<view class="shouye_item_left" @tap="myMoneyMessage"> <view class="shouye_item_left" @tap="myMoneyMessage">
<view class="shouye_item_text">账户余额</view>
<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{myMoney}}</view> <view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{myMoney}}</view>
<view class="shouye_item_text">账户余额</view>
</view> </view>
<view class="shouye_item_center" @tap="moneyMessage"> <view class="shouye_item_center" @tap="moneyMessage">
<view class="shouye_item_text">不可用金额</view>
<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{money}}</view> <view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{money}}</view>
<view class="shouye_item_text">不可用金额</view>
</view> </view>
<view class="shouye_item_right" @tap="cashMoneyMessage"> <view class="shouye_item_right" @tap="cashMoneyMessage">
<view class="shouye_item_text">可用金额</view>
<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{cashMoney}}</view> <view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{cashMoney}}</view>
<view class="shouye_item_text">可用金额</view>
</view> </view>
</view> </view>
<view class="line"></view>
<view class="tuandui_item"> <view class="tuandui_item">
<view class="shouye_item_left" @tap="goPageLogin('/pages/my/recharge')"> <view class="shouye_item_left" @tap="goPageLogin('/pages/my/recharge')">
<image class="shouye_item_img" src="../../static/img/my/chongzhi.png"></image> <image class="shouye_item_img" src="../../static/img/my/zhcz.png"></image>
<view class="shouye_item_text">账户充值</view> <view class="shouye_item_text">账户充值</view>
</view> </view>
<view class="shouye_item_center" @tap="goPageLogin('/pages/my/withdrawal')"> <view class="shouye_item_center" @tap="goPageLogin('/pages/my/withdrawal')">
<image class="shouye_item_img" src="../../static/img/my/tixian.png"></image> <image class="shouye_item_img" src="../../static/img/my/yetx.png"></image>
<view class="shouye_item_text">余额提现</view> <view class="shouye_item_text">余额提现</view>
</view> </view>
<view class="shouye_item_right" @tap="goPageLogin('/pages/my/balanceHistory')"> <view class="shouye_item_right" @tap="goPageLogin('/pages/my/balanceHistory')">
<image class="shouye_item_img" src="../../static/img/my/lishi.png"></image> <image class="shouye_item_img" src="../../static/img/my/yels.png"></image>
<view class="shouye_item_text">余额历史</view> <view class="shouye_item_text">余额历史</view>
</view> </view>
</view> </view>
@ -54,35 +57,35 @@
<view class="integrals-box"> <view class="integrals-box">
<view class="integral" @tap="goPageLoginByMerchant('/pages/my/toExamine')"> <view class="integral" @tap="goPageLoginByMerchant('/pages/my/toExamine')">
<view class="left"> <view class="left">
<image src="../../static/img/my/dingdan.png"></image> <image src="../../static/img/my/spsh.png"></image>
<text>我的订单</text> <text>我的订单</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<view class="integral" @tap="goPageLoginByMerchant('/pages/my/myshop')"> <view class="integral" @tap="goPageLoginByMerchant('/pages/my/myshop')">
<view class="left"> <view class="left">
<image src="../../static/img/my/dianpu.png"></image> <image src="../../static/img/my/wddp.png"></image>
<text>我的店铺</text> <text>我的店铺</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<view class="integral" @tap="goPageLoginByMerchant('../activity/index')"> <view class="integral" @tap="goPageLoginByMerchant('../activity/index')">
<view class="left"> <view class="left">
<image src="../../static/img/my/huodong.png"></image> <image src="../../static/img/my/hdgl.png"></image>
<text>活动管理</text> <text>活动管理</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<!-- <view class="integral" @tap="goPageLogin('/pages/my/cooperation')"> <view class="integral" @tap="goPageLogin('/pages/my/cooperation')">
<view class="left"> <view class="left">
<image src="../../static/img/my/dlhz.png"></image> <image src="../../static/img/my/dlhz.png"></image>
<text>代理合作</text> <text>代理合作</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> --> </view>
<view class="integral" @tap="goPageLogin('/pages/my/customer')"> <view class="integral" @tap="goPageLogin('/pages/my/customer')">
<view class="left"> <view class="left">
<image src="../../static/img/my/lianxikefu.png"></image> <image src="../../static/img/my/lxkf.png"></image>
<text>联系客服</text> <text>联系客服</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
@ -91,36 +94,35 @@
<view class="integrals-box"> <view class="integrals-box">
<view class="integral" @tap="goPageLogin('/pages/my/account?className=商家教程')"> <view class="integral" @tap="goPageLogin('/pages/my/account?className=商家教程')">
<view class="left"> <view class="left">
<image src="../../static/img/my/jiaocheng.png"></image> <image src="../../static/img/my/sjjc.png"></image>
<text>商家教程</text> <text>商家教程</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<!-- <view class="integral" v-if="userId" @tap='loginOut()'> <view class="integral" v-if="userId" @tap='loginOut()'>
<view class="left"> <view class="left">
<image src="../../static/img/my/qwyhd.png"></image> <image src="../../static/img/my/qwyhd.png"></image>
<text>前往用户端</text> <text>前往用户端</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> --> </view>
<view class="integral"> <view class="integral">
<view class="left"> <view class="left">
<image src="../../static/img/my/share.png"></image> <image src="../../static/img/my/fenxiang.png"></image>
<button open-type="share" <button open-type="share" style="background: #FFFFFF;border: none;padding-left: 34rpx;font-size: 30rpx;font-weight: 500;">分享给其他商家</button>
style="background: #FFFFFF;border: none;padding-left: 34rpx;font-size: 30rpx;font-weight: 500;">分享给其他商家</button>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<view class="integral" @tap="goPageLogin('/pages/my/account?className=关于我们')"> <view class="integral" @tap="goPageLogin('/pages/my/account?className=关于我们')">
<view class="left"> <view class="left">
<image src="../../static/img/my/about.png"></image> <image src="../../static/img/my/gywm.png"></image>
<text>关于我们</text> <text>关于我们</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<view class="integral" @tap="goPageLogin('/pages/member/feedback')"> <view class="integral" @tap="goPageLogin('/pages/member/feedback')">
<view class="left"> <view class="left">
<image src="../../static/img/my/yjfk.png"></image> <image src="../../static/img/my/fankui.png"></image>
<text>意见反馈</text> <text>意见反馈</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
@ -141,12 +143,12 @@
avatar: "/static/img/logo.jpg", avatar: "/static/img/logo.jpg",
member: 0, member: 0,
total: 0, total: 0,
tuiguang: '', tuiguang:'',
backgroundImageUrl: '', backgroundImageUrl:'',
CompanylinkUrl: '', CompanylinkUrl: '',
Companyname: '', Companyname: '',
userId: '', userId: '',
shopcourse: '', shopcourse:'',
nickName: "", nickName: "",
isStudent: -1, isStudent: -1,
MerchantList: 0, MerchantList: 0,
@ -228,7 +230,7 @@
let token = this.$queue.getData('token'); let token = this.$queue.getData('token');
let userId = this.$queue.getData('userId'); let userId = this.$queue.getData('userId');
if (token) { if (token) {
if (!url) { if(!url){
return; return;
} }
if (url.indexOf('/pages/') !== -1) { if (url.indexOf('/pages/') !== -1) {
@ -274,8 +276,7 @@
}); });
}, },
getShopList(userId) { getShopList(userId) {
this.$Request.getT('/goodsMerchant/selectGoodsMerchantPage?page=1&limit=10&userId=' + userId + '&status=2') this.$Request.getT('/goodsMerchant/selectGoodsMerchantPage?page=1&limit=10&userId=' + userId + '&status=2').then(res => {
.then(res => {
if (res.code == 0) { if (res.code == 0) {
if (res.data.records.length > 0) { if (res.data.records.length > 0) {
this.$queue.setData('merchantId', res.data.records[0].merchantId); this.$queue.setData('merchantId', res.data.records[0].merchantId);
@ -515,7 +516,7 @@
.header { .header {
width: 100%; width: 100%;
height: 500rpx; height: 600rpx;
display: block; display: block;
position: relative; position: relative;
// background: #fff; // background: #fff;
@ -532,11 +533,11 @@
height: 425rpx; height: 425rpx;
position: absolute; position: absolute;
z-index: 15; z-index: 15;
padding: 0 30upx; padding: 100upx 30upx 0;
display: flex; display: flex;
align-items: center; align-items: center;
// background: #FF4701; // background: #FF4701;
background-image: url(../../static/img/my/myuser.png);
background-size: 100%; background-size: 100%;
.user-info-box { .user-info-box {
@ -566,7 +567,7 @@
margin-left: 20rpx; margin-left: 20rpx;
font-size: 40upx; font-size: 40upx;
font-weight: 800; font-weight: 800;
color: #333333; color: #FEFEFE;
} }
.user-info { .user-info {
@ -586,7 +587,7 @@
height: 38upx; height: 38upx;
line-height: 38upx; line-height: 38upx;
font-weight: 800; font-weight: 800;
color:#333333; color: #fff;
} }
.nick_image { .nick_image {
@ -610,7 +611,7 @@
} }
.phones { .phones {
color:#333333!important; color: #fff;
margin-top: 15rpx; margin-top: 15rpx;
} }
@ -646,10 +647,10 @@
width: 92%; width: 92%;
height: 360rpx; height: 360rpx;
position: absolute; position: absolute;
background: linear-gradient(50deg, #FF4848 0%, #FF6E6E 100%); background: #fff;
border-radius: 15rpx; border-radius: 15rpx;
z-index: 15; z-index: 15;
margin: 120upx 30upx 0; margin: 235upx 30upx 0;
padding: 20upx; padding: 20upx;
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0 0 3px 1px #ccc; box-shadow: 0 0 3px 1px #ccc;
@ -658,34 +659,28 @@
margin-top: 10rpx; margin-top: 10rpx;
font-size: 34rpx; font-size: 34rpx;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #806C30;
}
.line{
height: 1px;
background-color: #FFFFFF;
margin-top: 20px;
} }
.shouye_item { .shouye_item {
margin-top: 20rpx; margin-top: 20rpx;
display: flex; display: flex;
width: 100%; width: 100%;
color: #FFFFFF; color: #333333;
// text-align: justify; // text-align: justify;
text-align: center; text-align: center;
padding: 0rpx 20rpx; padding: 0rpx 20rpx;
justify-content: space-between; justify-content: space-between;
.shouye_item_text { .shouye_item_text {
color: #FFFFFF; color: #806C30;
font-size: 24rpx; font-size: 24rpx;
} }
.shouye_item_money { .shouye_item_money {
margin-top: 10rpx; margin-top: 10rpx;
font-size: 20px; font-size: 38rpx;
color: #FFFFFF; color: #FF4701;
} }
.shouye_item_left { .shouye_item_left {
@ -737,7 +732,7 @@
} }
.shouye_item_text { .shouye_item_text {
color: #FFFFFF; color: #999;
font-size: 24rpx; font-size: 24rpx;
} }

3
pages/my/myshop.vue
Unescape View File

@ -214,9 +214,8 @@
width: 92%; width: 92%;
margin: 0 4%; margin: 0 4%;
box-sizing: border-box; box-sizing: border-box;
background: #FF2B2B; background: #FF4701;
color: #fff; color: #fff;
border-radius: 8px;
} }
} }

6
pages/my/toExamine.vue
Unescape View File

@ -15,9 +15,9 @@
<image class="logo" :src="merchantLogo"></image> <image class="logo" :src="merchantLogo"></image>
</view> </view>
<view class="left_down"> <view class="left_down">
<image class="icons1" src="../../static/img/home/calendar.png"></image> <image class="icons1" src="../../static/img/home/datas.png"></image>
<view class="times"><span @tap="times(1)" >{{startTime}} <view class="times"><span @tap="times(1)" style="text-decoration:underline">{{startTime}}
</span>至<span @tap="times(2)" >{{endTime}}</span> </span>至<span @tap="times(2)" style="text-decoration:underline">{{endTime}}</span>
</view> </view>
<u-picker mode="time" v-model="show1" title="开始时间" @confirm="times1()" :params="params"> <u-picker mode="time" v-model="show1" title="开始时间" @confirm="times1()" :params="params">
</u-picker> </u-picker>

69
project.config.json
Unescape View File

@ -1,69 +0,0 @@
{
"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": []
}
}
}

BIN
static/img/home/calendar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 396 B

BIN
static/img/home/feiji.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 588 B

BIN
static/img/home/money.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.7 KiB

BIN
static/img/home/xinzeng.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 715 B

BIN
static/img/my/about.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/img/my/chongzhi.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/img/my/dianpu.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/img/my/dingdan.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 482 B

BIN
static/img/my/huodong.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 516 B

BIN
static/img/my/jiaocheng.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/img/my/lianxikefu.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
static/img/my/lishi.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/img/my/share.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
static/img/my/tixian.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 820 B

BIN
static/img/my/yjfk.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 463 B

BIN
static/img/tabbar/activity.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
static/img/tabbar/activityselected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 987 B

BIN
static/img/tabbar/dingdan.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 688 B

BIN
static/img/tabbar/dingdans.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 659 B

BIN
static/img/tabbar/mine.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/img/tabbar/mines.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/img/tabbar/shop2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/img/tabbar/shopselected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

Write Preview
Loading…
Cancel
Save