3 Commits

Author SHA1 Message Date
  chenkun f7b0342e4d 图标 4 months ago
  chenkun c7dbf2e907 底部栏图标 4 months ago
  chenkun b8eccd3e78 编辑地址 4 months ago
15 changed files with 34 additions and 17 deletions
Split View
  1. +6
    -1
      api/api.js
  2. +4
    -4
      components/base/tabbar.vue
  3. +3
    -1
      pages_order/center/addressListManage.vue
  4. +8
    -8
      pages_order/center/systemSet.vue
  5. +3
    -2
      pages_order/components/address/addressList.vue
  6. +1
    -0
      pages_order/components/address/redactAddress.vue
  7. +1
    -1
      pages_order/static/order/3.svg
  8. +1
    -0
      static/image/center/1.svg
  9. +1
    -0
      static/image/center/2.svg
  10. +1
    -0
      static/image/center/3.svg
  11. +1
    -0
      static/image/center/4.svg
  12. +1
    -0
      static/image/tabbar/Trading.svg
  13. +1
    -0
      static/image/tabbar/center.svg
  14. +1
    -0
      static/image/tabbar/clearanceService.svg
  15. +1
    -0
      static/image/tabbar/index.svg

+ 6
- 1
api/api.js View File

@ -106,9 +106,14 @@ const config = {
},
// 用户地址表-编辑
editAddress: {
url: '/address/add',
url: '/address/edit',
method: 'POST',
},
// 用户地址表-删除
deleteAddress: {
url: '/address/edit',
method: 'PUT',
},
// 用户地址表-分页列表查询
addressList: {
url: '/address/list',


+ 4
- 4
components/base/tabbar.vue View File

@ -36,25 +36,25 @@
list : [
{
"selectedIconPath": "/static/image/tabbar/index-a.png",
"iconPath": "/static/image/tabbar/home.png",
"iconPath": "/static/image/tabbar/index.svg",
"pagePath": "/pages/index/index",
"title": "tabbar.title.1"
},
{
"selectedIconPath": "/static/image/tabbar/Trading-a.png",
"iconPath": "/static/image/tabbar/order.png",
"iconPath": "/static/image/tabbar/Trading.svg",
"pagePath": "/pages/index/tradingPlatform",
"title": "tabbar.title.2"
},
{
"selectedIconPath": "/static/image/tabbar/clearanceService-a.png",
"iconPath": "/static/image/tabbar/clearanceService.png",
"iconPath": "/static/image/tabbar/clearanceService.svg",
"pagePath": "/pages/index/clearanceService",
"title": "tabbar.title.3"
},
{
"selectedIconPath": "/static/image/tabbar/center-a.png",
"iconPath": "/static/image/tabbar/center.png",
"iconPath": "/static/image/tabbar/center.svg",
"pagePath": "/pages/index/center2",
"title": "tabbar.title.4"
}


+ 3
- 1
pages_order/center/addressListManage.vue View File

@ -83,6 +83,7 @@ export default {
longitude: addressDetail.longitude
}
console.log(addressDetail.id,"addressDetail.id")
if (addressDetail.id) {
data.id = addressDetail.id
}
@ -122,13 +123,14 @@ export default {
//
deleteAddress(id) {
console.log("==========")
let self = this
uni.showModal({
title: '删除地址',
content: '确认删除此地址?删除后数据不可恢复',
success(e) {
if(e.confirm){
self.$api('addressDelete', {
self.$api('deleteAddress', {
id
}, res => {
if (res.code == 200) {


+ 8
- 8
pages_order/center/systemSet.vue View File

@ -47,24 +47,24 @@ export default {
title: `${this.$t('pageTitle.accountSetting')}`,
itemList: [
// text: `${this.$t('pageTitle.switchAccount')}`
{leftIcon: "../static/center/1.svg", text: `${this.$t('pageTitle.switchAccount')}`, rightIcon: ">"},
{leftIcon: "../static/center/2.svg", text: `${this.$t('pageTitle.forgotPasswordPage')}`, rightIcon: ">"},
{leftIcon: "../static/center/2.svg", text: this.$t('pageTitle.logout'), rightIcon: ">"},
{leftIcon: "../static/center/2.svg", text: this.$t('pageTitle.addressList'), rightIcon: ">",toUrl:'/pages_order/center/addressListManage'},
{leftIcon: "../../static/image/center/1.svg", text: `${this.$t('pageTitle.switchAccount')}`, rightIcon: ">"},
{leftIcon: "../../static/image/center/2.svg", text: `${this.$t('pageTitle.changePassword')}`, rightIcon: ">"},
{leftIcon: "../../static/image/center/3.svg", text: this.$t('pageTitle.logout'), rightIcon: ">"},
{leftIcon: "../../static/image/center/4.svg", text: this.$t('pageTitle.addressList'), rightIcon: ">",toUrl:'/pages_order/center/addressListManage'},
]
},
{
title: `${this.$t('pageTitle.systemSetting')}`,
itemList: [
{leftIcon: "../static/center/1.svg", text: `${this.$t('pageTitle.languageSwitch')}`, rightIcon: ">"},
{leftIcon: "../static/center/2.svg", text: `${this.$t('pageTitle.versionUpdate')}`, rightIcon: ">"},
{leftIcon: "../static/center/2.svg", text: this.$t('pageTitle.clearCache'), rightIcon: ">"},
{leftIcon: "../../static/image/center/1.svg", text: `${this.$t('pageTitle.languageSwitch')}`, rightIcon: ">"},
{leftIcon: "../../static/image/center/2.svg", text: `${this.$t('pageTitle.versionUpdate')}`, rightIcon: ">"},
{leftIcon: "../../static/image/center/3.svg", text: this.$t('pageTitle.clearCache'), rightIcon: ">"},
]
},
{
title: `${this.$t('pageTitle.identitySetting')}`,
itemList: [
{leftIcon: "../static/center/2.svg", text: this.$t('pageTitle.switchIdentity'), rightIcon: ">"},
{leftIcon: "../../static/image/center/1.svg", text: this.$t('pageTitle.switchIdentity'), rightIcon: ">"},
]
}
],


+ 3
- 2
pages_order/components/address/addressList.vue View File

@ -45,9 +45,9 @@
<text @click="editAddress(item)" class="control-title">编辑</text>
</view>
<view class="del-btn">
<view class="del-btn" @click="deleteAddress(item.id)">
<uv-icon name="trash"></uv-icon>
<text class="control-title" @click="deleteAddress(item.id)">删除</text>
<text class="control-title" >删除</text>
</view>
</view>
@ -114,6 +114,7 @@ export default {
},
//
deleteAddress(e){
console.log(e,"$emitdeleteAddress")
this.$emit('deleteAddress', e)
},
//


+ 1
- 0
pages_order/components/address/redactAddress.vue View File

@ -70,6 +70,7 @@ export default {
'zIndex': 10000
})
}
this.$emit('saveOrUpdate', this.addressDetail)
},
//


+ 1
- 1
pages_order/static/order/3.svg
File diff suppressed because it is too large
View File


+ 1
- 0
static/image/center/1.svg View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="15.777" height="12.51" viewBox="0 0 15.777 12.51"><defs><style>.a{fill:#333;stroke:#333;stroke-width:0.5px;}</style></defs><g transform="translate(0.26 0.281)"><path class="a" d="M324.545,108.387h14.168a.545.545,0,0,0,.385-.93l-3.814-3.814a.545.545,0,0,0-.77.77L337.4,107.3H324.545a.545.545,0,1,0,0,1.09Zm14.168,2.18H324.545a.545.545,0,0,0-.385.93l3.814,3.814a.544.544,0,1,0,.77-.77l-2.883-2.885h12.851a.545.545,0,1,0,0-1.09Zm0,0" transform="translate(-324 -103.491)"/></g></svg>

+ 1
- 0
static/image/center/2.svg View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="12.261" height="11.947" viewBox="0 0 12.261 11.947"><defs><style>.a{fill:#030000;}</style></defs><g transform="translate(-1.497 -0.015)"><path class="a" d="M366.7,79.826a.1.1,0,0,0-.019.034l-.617,2.278a.394.394,0,0,0,.1.377.389.389,0,0,0,.373.1L368.782,82s.005,0,.008,0a.1.1,0,0,0,.07-.03l6-6.049a.971.971,0,0,0,.276-.692,1.189,1.189,0,0,0-.35-.828l-.567-.572a1.172,1.172,0,0,0-.822-.353.961.961,0,0,0-.687.278l-6,6.051c-.006.006,0,.014-.009.021Zm7.576-4.5-.6.6-.967-.99.588-.592a.279.279,0,0,1,.38.027l.567.573a.313.313,0,0,1,.093.217.232.232,0,0,1-.065.164Zm-6.508,4.592,4.333-4.366.967.991L368.745,80.9l-.976-.982m-.79,1.77.313-1.158.835.841-1.148.317m7.678-3.965a.417.417,0,0,0-.415.418v5.011a1.229,1.229,0,0,1-1.161,1.164H364.87c-.523,0-1.066-.517-1.162-1.479V75.207c0-1.194.868-1.165,1.162-1.165h5.47a.417.417,0,0,0,0-.834h-5.533c-.716,0-1.927.449-1.927,1.622V82.9a1.983,1.983,0,0,0,1.927,2.251h8.338a1.816,1.816,0,0,0,1.927-1.936V78.142a.418.418,0,0,0-.414-.416Zm0,0" transform="translate(-361.383 -73.193)"/></g></svg>

+ 1
- 0
static/image/center/3.svg View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11.933" height="11.947" viewBox="0 0 11.933 11.947"><defs><style>.a{fill:none;}.b{clip-path:url(#a);}</style><clipPath id="a"><rect class="a" width="11.933" height="11.947"/></clipPath></defs><g transform="translate(-1.661 -0.011)"><g transform="translate(-296.339 0.011)"><g transform="translate(298)"><g class="b" transform="translate(0)"><path d="M309.922,4.772a2.761,2.761,0,0,0-.119-1.192c-.278-.437-.675-.358-1.351-.358h-2.82V1.872a4.328,4.328,0,0,0-.04-.755A1.384,1.384,0,0,0,304.8.164a1.646,1.646,0,0,0-.636-.119,2.109,2.109,0,0,0-.715.04A1.35,1.35,0,0,0,302.335,1.2a1.783,1.783,0,0,0-.04.477V3.263h-2.781c-.675-.04-1.112-.119-1.39.318A2.76,2.76,0,0,0,298,4.772v1.39a.812.812,0,0,0,.794.636V8.864a10.393,10.393,0,0,1-.079,1.629c-.04.159-.04.318-.079.437a1.017,1.017,0,0,0,0,.834c.159.238.437.2.794.2h9.057c.318,0,.556.04.755-.119.238-.2.159-.477.079-.794-.04-.119-.04-.278-.079-.4a9.23,9.23,0,0,1-.119-1.867V6.8a.735.735,0,0,0,.755-.6,1.905,1.905,0,0,0,0-.477V4.772Zm-1.629,6.2h-1.47V9.142c0-.278.04-.636-.079-.794a.48.48,0,0,0-.477-.238c-.516.079-.437.516-.437,1.073V10.97H304.48V9.142c0-.278.04-.636-.079-.794a.48.48,0,0,0-.477-.238c-.516.079-.437.516-.437,1.073V10.97h-1.351V9.142c0-.278.04-.636-.079-.794a.481.481,0,0,0-.477-.238c-.516.079-.437.516-.437,1.073V10.97h-1.51c.04-.2.04-.4.079-.6,0-.2.04-.358.04-.556V6.838h8.342V9.182a6.835,6.835,0,0,0,.079,1.311,1.387,1.387,0,0,1,.119.477Zm.636-5.164H299V4.256h3.019c.4,0,.953.079,1.112-.159.159-.2.119-.437.119-.755V1.952a2.044,2.044,0,0,1,.04-.715c.119-.2.318-.2.636-.2h.278c.4.079.358.4.358.834V3.3c0,.238-.04.516.079.675.2.318.675.238,1.152.238h3.059V5.805Zm0,0" transform="translate(-298 -0.035)"/></g></g></g></g></svg>

+ 1
- 0
static/image/center/4.svg View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="15.777" height="12.51" viewBox="0 0 15.777 12.51"><defs><style>.a{fill:#333;stroke:#333;stroke-width:0.5px;}</style></defs><g transform="translate(0.26 0.281)"><path class="a" d="M324.545,108.387h14.168a.545.545,0,0,0,.385-.93l-3.814-3.814a.545.545,0,0,0-.77.77L337.4,107.3H324.545a.545.545,0,1,0,0,1.09Zm14.168,2.18H324.545a.545.545,0,0,0-.385.93l3.814,3.814a.544.544,0,1,0,.77-.77l-2.883-2.885h12.851a.545.545,0,1,0,0-1.09Zm0,0" transform="translate(-324 -103.491)"/></g></svg>

+ 1
- 0
static/image/tabbar/Trading.svg View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><defs><style>.a{opacity:0.7;}.b{fill:none;}.c{fill:#fff;}</style></defs><g class="a" transform="translate(-40.997 -770)"><rect class="b" width="20" height="20" transform="translate(40.997 770)"/><g transform="translate(-593.003 556)"><path class="c" d="M651.244,216H636.8a.8.8,0,0,0-.8.8v10.969a.8.8,0,0,0,.8.8h4.811v2.41h-2.677a.535.535,0,1,0,0,1.071H649.1a.535.535,0,1,0,0-1.071h-2.677v-2.41h4.811a.8.8,0,0,0,.8-.8V216.8a.791.791,0,0,0-.795-.8Zm-12.04,5.079v-.535a.264.264,0,0,1,.268-.268h6.685a.264.264,0,0,0,.268-.268v-.644a.268.268,0,0,1,.469-.176l1.539,1.707a.264.264,0,0,1-.2.443h-8.76a.257.257,0,0,1-.268-.259Zm9.63,2.945a.264.264,0,0,1-.268.268h-6.685a.264.264,0,0,0-.268.268v.644a.268.268,0,0,1-.468.176l-1.54-1.715a.264.264,0,0,1,.2-.443h8.76a.264.264,0,0,1,.268.268v.535Zm0,0"/></g></g></svg>

+ 1
- 0
static/image/tabbar/center.svg View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><defs><style>.a{opacity:0.7;}.b{fill:none;}.c{fill:#fff;}</style></defs><g class="a" transform="translate(-315 -770)"><rect class="b" width="20" height="20" transform="translate(315 770)"/><g transform="translate(-285.997 587.987)"><g transform="translate(602.997 185.013)"><g transform="translate(0 0)"><path class="c" d="M610.892,195.537a4.986,4.986,0,1,0-3.526-1.46,4.986,4.986,0,0,0,3.526,1.46Zm-2.236-3.153a.384.384,0,0,1,.541,0,2.378,2.378,0,0,0,3.425,0,.384.384,0,1,1,.552.533,3.145,3.145,0,0,1-4.53,0,.384.384,0,0,1-.008-.533Zm9.907,6.532c-.506-.6-3.034-2.5-4.219-2.65s-2.324,1.151-3.452,1.151-2.252-1.285-3.452-1.151-3.732,2.048-4.219,2.647-.621,2.616.767,2.616H617.8c1.411,0,1.289-2.014.767-2.612Zm0,0" transform="translate(-602.88 -185.565)"/></g></g></g></g></svg>

+ 1
- 0
static/image/tabbar/clearanceService.svg View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><defs><style>.a{opacity:0.7;}.b{fill:none;}.c{fill:#fff;}</style></defs><g class="a" transform="translate(-144 -769)"><rect class="b" width="20" height="20" transform="translate(144 769)"/><g transform="translate(-460 637)"><path class="c" d="M836.127,134.807h3.6a.913.913,0,0,0-.023-1.807h-3.582a.911.911,0,0,0,0,1.807Zm0,0" transform="translate(-224.408)"/><path class="c" d="M619.192,191.183h-1.033s-.723.2-.723.3c0,.76-.533,1.507-1.169,1.507h-5.48a1.427,1.427,0,0,1-1.2-1.507c0-.1-.649-.3-.649-.3h-1.128c-1.452,0-1.808.849-1.808,2.074V205.39c0,1.315.511,2.052,1.918,2.052h11.165c1.406,0,2.09-.577,2.09-2.052V193.257a1.851,1.851,0,0,0-1.981-2.074Zm-1.833,11.979H609.6a.693.693,0,0,1-.571-.658.546.546,0,0,1,.528-.547h7.736a.566.566,0,0,1,.549.547c0,.3-.2.658-.483.658Zm.031-3.212h-7.758c-.286,0-.468-.318-.468-.613a.587.587,0,0,1,.527-.592h7.736a.606.606,0,0,1,.549.592.662.662,0,0,1-.587.613Zm0-3.3h-7.758c-.286,0-.468-.317-.468-.613a.587.587,0,0,1,.527-.591h7.736a.606.606,0,0,1,.549.591.661.661,0,0,1-.587.613Zm0,0" transform="translate(0 -56.933)"/></g></g></svg>

+ 1
- 0
static/image/tabbar/index.svg View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><defs><style>.a{opacity:0.7;}.b{fill:none;}.c{fill:#fff;}</style></defs><g class="a" transform="translate(-40.997 -770)"><rect class="b" width="20" height="20" transform="translate(40.997 770)"/><path class="c" d="M786.172,357.946l-1.054-1.6a2.554,2.554,0,0,0-.761-.776,3.809,3.809,0,0,0-2.166-.724h-8.606a3.465,3.465,0,0,0-2.166.724,2.556,2.556,0,0,0-.761.776l-1.054,1.6a2.723,2.723,0,0,0,1.229,3.984,3.565,3.565,0,0,0,4.274-.776,3.524,3.524,0,0,0,5.62,0,3.657,3.657,0,0,0,4.274.776,2.7,2.7,0,0,0,1.171-3.984Zm-2.283,5.485a3.794,3.794,0,0,1-2.4-.673.885.885,0,0,0-1.054.052,3.745,3.745,0,0,1-2.517.88,4.028,4.028,0,0,1-2.517-.88.885.885,0,0,0-1.054-.052,3.9,3.9,0,0,1-2.4.673.753.753,0,0,0-.819.672v5.589a.753.753,0,0,0,.819.673h12.06a.753.753,0,0,0,.82-.673V364.1a.98.98,0,0,0-.937-.672Zm-3.161,4.088a1.433,1.433,0,0,1-1.522-1.345,1.534,1.534,0,0,1,3.044,0,1.433,1.433,0,0,1-1.522,1.345Zm0,0" transform="translate(-727.158 417.159)"/></g></svg>

Loading…
Cancel
Save