loumengning
/
shop
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

调整 

1猜你喜欢去掉
2限时秒杀改限时活动，（+图片）
3查看售后去掉
4评价去掉，待评价去掉
5货到付款取消掉
6手机号改登陆密码，文字改成修改密码
7登录改工号
8忘记密码也去掉
undefined
xubin 4 years ago
parent
63fbefc356
commit
0089b777fd
10 changed files with 674 additions and 594 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +23
    -21
      addons/unishop/uniapp/uni-shop/pages.json
  2. +1
    -1
      addons/unishop/uniapp/uni-shop/pages/flash/list.vue
  3. +613
    -536
      addons/unishop/uniapp/uni-shop/pages/index/index.vue
  4. +8
    -7
      addons/unishop/uniapp/uni-shop/pages/money/pay.vue
  5. +10
    -10
      addons/unishop/uniapp/uni-shop/pages/order/order.vue
  6. +7
    -7
      addons/unishop/uniapp/uni-shop/pages/order/orderDetail.vue
  7. +6
    -6
      addons/unishop/uniapp/uni-shop/pages/public/login.vue
  8. +1
    -1
      addons/unishop/uniapp/uni-shop/pages/set/set.vue
  9. +3
    -3
      addons/unishop/uniapp/uni-shop/pages/user/user.vue
  10. +2
    -2
      addons/unishop/uniapp/uni-shop/pages/userinfo/userinfo.vue

+ 23
- 21
addons/unishop/uniapp/uni-shop/pages.json View File

@@ -63,13 +63,15 @@
"style": {
"navigationBarTitleText": "修改资料"
}
}, {
"path": "pages/cart/cart",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "购物车"
}
}, {
},
// {
// "path": "pages/cart/cart",
// "style": {
// "enablePullDownRefresh": true,
// "navigationBarTitleText": "购物车"
// }
// },
{
"path": "pages/public/login",
"style": {
"navigationBarTitleText": "",
@@ -199,7 +201,7 @@
"path" : "pages/flash/list",
"style" : {
"enablePullDownRefresh": true,
"navigationBarTitleText": "限时秒杀"
"navigationBarTitleText": "限时活动"
}
},
{
@@ -230,13 +232,13 @@
"navigationBarTitleText": "申请售后"
}
},
{
"path" : "pages/product/evaluate",
"style" : {
"enablePullDownRefresh": true,
"navigationBarTitleText": "评价"
}
},
// {
// "path" : "pages/product/evaluate",
// "style" : {
// "enablePullDownRefresh": true,
// "navigationBarTitleText": "评价"
// }
// },
{
"path" : "pages/order/delivery",
"style" : {
@@ -268,12 +270,12 @@
"selectedIconPath": "static/tab-cate-current.png",
"text": "分类"
},
{
"pagePath": "pages/cart/cart",
"iconPath": "static/tab-cart.png",
"selectedIconPath": "static/tab-cart-current.png",
"text": "购物车"
},
// {
// "pagePath": "pages/cart/cart",
// "iconPath": "static/tab-cart.png",
// "selectedIconPath": "static/tab-cart-current.png",
// "text": "购物车"
// },
{
"pagePath": "pages/user/user",
"iconPath": "static/tab-my.png",


+ 1
- 1
addons/unishop/uniapp/uni-shop/pages/flash/list.vue View File

@@ -170,7 +170,7 @@
// 设置导航栏名称
setNavigationBarTitle(title) {
uni.setNavigationBarTitle({
title: '限时秒杀|' + title
title: '限时活动|' + title
});
}



+ 613
- 536
addons/unishop/uniapp/uni-shop/pages/index/index.vue
File diff suppressed because it is too large
View File


+ 8
- 7
addons/unishop/uniapp/uni-shop/pages/money/pay.vue View File

@@ -26,7 +26,7 @@
</radio>
</label>
</view>
<view class="type-item b-b" @click="changePayType(3)" v-if="payTypeList.offline">
<!-- <view class="type-item b-b" @click="changePayType(3)" v-if="payTypeList.offline">
<text class="icon yticon icon-pay"></text>
<view class="con">
<text class="tit">货到付款</text>
@@ -35,7 +35,7 @@
<radio value="" color="#fa436a" :checked='payType == 3' />
</radio>
</label>
</view>
</view> -->
</view>

<text class="mix-btn" @click="confirm">确认支付</text>
@@ -85,8 +85,8 @@
case 2: // 支付宝支付

break;
case 3: // 货到付款
break;
// case 3: // 货到付款
// break;
}
},
//确认支付
@@ -99,10 +99,11 @@
} else if (this.payType == 2) {
// 支付宝支付
this.alipay();
} else if (this.payType == 3) {
// 货到付款
this.offlinePay();
}
// else if (this.payType == 3) {
// // 货到付款
// this.offlinePay();
// }
},
async alipay() {


+ 10
- 10
addons/unishop/uniapp/uni-shop/pages/order/order.vue View File

@@ -29,7 +29,7 @@
<text class="title clamp">{{goodsItem.title}}</text>
<text class="attr-box">{{goodsItem.spec}} x {{goodsItem.number}}</text>
<text class="price">{{goodsItem.price}}</text>
<button class="action-btn" v-if="item.have_received != 0 && goodsItem.evaluate == false && goodsItem.refund==false" @click.stop="button('evaluate', {order_id:item.order_id,id:goodsItem.id,image:goodsItem.image,title:goodsItem.title,spec:goodsItem.spec})">评价</button>
<!-- <button class="action-btn" v-if="item.have_received != 0 && goodsItem.evaluate == false && goodsItem.refund==false" @click.stop="button('evaluate', {order_id:item.order_id,id:goodsItem.id,image:goodsItem.image,title:goodsItem.title,spec:goodsItem.spec})">评价</button> -->
</view>
</view>

@@ -47,13 +47,13 @@
<button class="action-btn recom" v-if="item.have_paid == 0" @click.stop="button('pay',item)">立即支付</button>
<!-- <button class="action-btn" v-if="item.have_paid != 0 && item.have_delivered == 0">提醒发货</button> -->
<!-- <button class="action-btn" v-if="item.have_paid != 0" @click.stop="button('delivery',item)">查看物流</button> -->
<button class="action-btn" v-if="item.have_paid != 0 && item.have_received == 0" @click.stop="button('recerved',item)">确认收货</button>
<!-- <button class="action-btn" v-if="item.have_paid != 0 && item.have_received == 0" @click.stop="button('recerved',item)">确认收货</button> -->
<!-- <button class="action-btn" v-if="item.have_received != 0 && item.have_commented != 0">追加评价</button> -->
<button class="action-btn" v-if="item.have_paid != 0" @click.stop="button('refund', item)">申请售后</button>
<!-- <button class="action-btn" v-if="item.have_paid != 0" @click.stop="button('refund', item)">申请售后</button> -->
</view>
<view class="action-box b-t" v-if="item.state == 9 && item.status == -1">
<!-- <view class="action-box b-t" v-if="item.state == 9 && item.status == -1">
<button class="action-btn" v-if="item.have_paid != 0" @click.stop="button('refund', item)">查看售后</button>
</view>
</view> -->
</view>
<uni-load-more :status="tabItem.loadingType"></uni-load-more>
</scroll-view>
@@ -103,14 +103,14 @@
},
{
state: 4,
text: '评价',
text: '已完成',
loadingType: 'more',
orderList: [],
page: 1
},
{
state: 5,
text: '售后',
text: '已取消',
loadingType: 'more',
orderList: [],
page: 1
@@ -308,7 +308,7 @@
stateTip = '待评价';
break;
case 5:
stateTip = '售后';
stateTip = '已取消';
break;
case 6:
stateTip = '拒绝退款';
@@ -391,14 +391,14 @@
},
{
state: 4,
text: '评价',
text: '已完成',
loadingType: 'more',
orderList: [],
page: 1
},
{
state: 5,
text: '售后',
text: '已取消',
loadingType: 'more',
orderList: [],
page: 1


+ 7
- 7
addons/unishop/uniapp/uni-shop/pages/order/orderDetail.vue View File

@@ -31,7 +31,7 @@
<text class="title clamp">{{goodsItem.title}}</text>
<text class="attr-box">{{goodsItem.spec}} x {{goodsItem.number}}</text>
<text class="price">{{goodsItem.price}}</text>
<button class="action-btn" v-if="order.have_received != 0 && goodsItem.evaluate == false" @click.stop="button('evaluate', goodsItem)">评价</button>
<!-- <button class="action-btn" v-if="order.have_received != 0 && goodsItem.evaluate == false" @click.stop="button('evaluate', goodsItem)">评价</button> -->
</view>
</view>

@@ -59,11 +59,11 @@
<button class="action-btn recom" v-if="order.have_paid == 0" @click.stop="button('pay')">立即支付</button>
<!-- <button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('delivery')">查看物流</button> -->
<button class="action-btn" v-if="order.have_paid != 0 && order.have_received == 0" @click.stop="button('recerved')">确认收货</button>
<button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('refund')">申请售后</button>
<!-- <button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('refund')">申请售后</button> -->
</view>
<view class="bottom" v-if="order.state == 9 && order.status == -1">
<!-- <view class="bottom" v-if="order.state == 9 && order.status == -1">
<button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('refund')">查看售后</button>
</view>
</view> -->
</view>
</template>

@@ -107,9 +107,9 @@
case 3:
stateTip = '待收货';
break;
case 4:
stateTip = '待评价';
break;
// case 4:
// stateTip = '待评价';
// break;
case 5:
stateTip = '售后';
break;


+ 6
- 6
addons/unishop/uniapp/uni-shop/pages/public/login.vue View File

@@ -12,8 +12,8 @@

<view class="input-content">
<view class="input-item">
<text class="tit">手机号码</text>
<input type="text" :value="mobile" placeholder="请输入手机号码" data-key="mobile" @input="inputChange" />
<text class="tit">工号</text>
<input type="text" :value="mobile" placeholder="请输入工号" data-key="mobile" @input="inputChange" />
</view>
<view class="input-item">
<text class="tit">密码</text>
@@ -23,13 +23,13 @@
</view>
<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
<!-- #ifdef MP-WEIXIN -->
<button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="loginForWechatMini">授权微信绑定电话号码一键登录</button>
<!-- <button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="loginForWechatMini">授权微信绑定电话号码一键登录</button> -->
<!-- #endif -->

<view class="forget-section">
<view><label @click="register('resetpwd')">忘记密码</label>
<!-- <view class="forget-section"> -->
<!-- <view><label @click="register('resetpwd')">忘记密码</label> -->
<!-- - <label @click="register('register')">立马注册</label></view> -->
</view>
<!-- </view> -->


</view>


+ 1
- 1
addons/unishop/uniapp/uni-shop/pages/set/set.vue View File

@@ -1,7 +1,7 @@
<template>
<view class="container">
<view class="list-cell b-b m-t" @click="navTo('/pages/userinfo/userinfo')" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">个人资料</text>
<text class="cell-tit">修改密码</text>
<text class="cell-more yticon icon-you"></text>
</view>
<view class="list-cell log-out-btn" @click="toLogout">


+ 3
- 3
addons/unishop/uniapp/uni-shop/pages/user/user.vue View File

@@ -63,12 +63,12 @@
<view class="order-item" @click="$api.navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
<text class="yticon icon-pingjia"></text>
<text class="num" v-if="orderNum.uncomment > 0">{{orderNum.uncomment}}</text>
<text>评价</text>
<text>已完成</text>
</view>
<view class="order-item" @click="$api.navTo('/pages/order/order?state=5')" hover-class="common-hover" :hover-stay-time="50">
<text class="yticon icon-shouhou"></text>
<text class="num" v-if="orderNum.refund > 0">{{orderNum.refund}}</text>
<text>退款/售后</text>
<text>已取消</text>
</view>
</view>
<!-- 浏览历史 -->
@@ -86,7 +86,7 @@
<image @click="navTo('/pages/product/product')" src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=191678693,2701202375&fm=26&gp=0.jpg" mode="aspectFill"></image>
</scroll-view> -->
<!-- <list-cell icon="icon-iconfontweixin" iconColor="#e07472" title="我的钱包" tips="您的会员还有3天过期"></list-cell> -->
<list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理" @eventClick="$api.navTo('/pages/address/address')"></list-cell>
<!-- <list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理" @eventClick="$api.navTo('/pages/address/address')"></list-cell> -->
<!-- <list-cell icon="icon-share" iconColor="#9789f7" title="分享" tips="邀请好友赢10万大礼"></list-cell> -->
<!-- <list-cell icon="icon-pinglun-copy" iconColor="#ee883b" title="晒单" tips="晒单抢红包"></list-cell> -->
<list-cell icon="icon-shoucang-setting" iconColor="#54b4ef" title="我的收藏" @eventClick="$api.navTo('/pages/favorite/favorite')"></list-cell>


+ 2
- 2
addons/unishop/uniapp/uni-shop/pages/userinfo/userinfo.vue View File

@@ -18,9 +18,9 @@
</view>
</view>
<view class="yt-list-cell">
<view class="cell-tit clamp">手机号码
<view class="cell-tit clamp">登陆密码
<input v-if="mobile" disabled="true" class="input" type="text" v-model="mobile" />
<button v-else class="input" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权获取微信绑定的手机号码</button>
<!-- <button v-else class="input" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权获取微信绑定的手机号码</button> -->
</view>
</view>
<!-- #endif -->


Write Preview
Loading…
Cancel
Save