Browse Source

no message

featrue/v4.5
xpz2018 4 years ago
parent
commit
8b98e1f3c7
14 changed files with 19 additions and 24 deletions
  1. 6
      app.json
  2. 1
      pages/agent/address/index.wxml
  3. 1
      pages/agent/address/index.wxss
  4. 4
      pages/home/index/index.js
  5. 4
      pages/morder/create/index.wxml
  6. 8
      submodel/pages/address/create/index.js
  7. 0
      submodel/pages/address/create/index.json
  8. 1
      submodel/pages/address/create/index.wxml
  9. 1
      submodel/pages/address/create/index.wxss
  10. 13
      submodel/pages/address/list/index.js
  11. 0
      submodel/pages/address/list/index.json
  12. 0
      submodel/pages/address/list/index.wxml
  13. 0
      submodel/pages/address/list/index.wxss
  14. 4
      utils/util.js

6
app.json

@ -62,8 +62,6 @@
"pages/purchase/create/index", "pages/purchase/create/index",
"pages/purchase/detail/index", "pages/purchase/detail/index",
"pages/message/index/index", "pages/message/index/index",
"pages/address/list/index",
"pages/address/create/index",
"pages/html/agreement/index", "pages/html/agreement/index",
"pages/html/bankcard/index", "pages/html/bankcard/index",
"pages/html/banner/index", "pages/html/banner/index",
@ -82,7 +80,9 @@
"root": "submodel/", "root": "submodel/",
"pages": [ "pages": [
"pages/html/logistics/index", "pages/html/logistics/index",
"pages/html/service/index"
"pages/html/service/index",
"pages/address/list/index",
"pages/address/create/index"
] ]
} }
], ],

1
pages/agent/address/index.wxml

@ -1,4 +1,3 @@
<!--pages/adress/create/index.wxml-->
<cu-custom bgColor="bg-white" isBack="{{true}}"> <cu-custom bgColor="bg-white" isBack="{{true}}">
<view slot="content">发货信息</view> <view slot="content">发货信息</view>
</cu-custom> </cu-custom>

1
pages/agent/address/index.wxss

@ -1,4 +1,3 @@
/* pages/adress/create/index.wxss */
.margin-top{ .margin-top{
margin-top: 16rpx; margin-top: 16rpx;
} }

4
pages/home/index/index.js

@ -116,7 +116,7 @@ Component({
} else if (e.currentTarget.id == 'article') { } else if (e.currentTarget.id == 'article') {
util.navigateTo('/pages/article/list/index') util.navigateTo('/pages/article/list/index')
} else if (e.currentTarget.id == 'adress') { } else if (e.currentTarget.id == 'adress') {
util.navigateTo('/pages/address/list/index')
util.navigateTo('/submodel/pages/address/list/index')
} else if (e.currentTarget.id == 'setting') { } else if (e.currentTarget.id == 'setting') {
util.navigateTo('/pages/home/setting/index') util.navigateTo('/pages/home/setting/index')
} else if (e.currentTarget.id == 'tovip') { } else if (e.currentTarget.id == 'tovip') {
@ -189,7 +189,7 @@ Component({
} else if (parseInt(e.currentTarget.id) == 6) { } else if (parseInt(e.currentTarget.id) == 6) {
wx.navigateTo({ url: '/pages/article/list/index' }) wx.navigateTo({ url: '/pages/article/list/index' })
} else if (parseInt(e.currentTarget.id) == 7) { } else if (parseInt(e.currentTarget.id) == 7) {
wx.navigateTo({ url: '/pages/address/list/index' })
wx.navigateTo({ url: '/submodel/pages/address/list/index' })
} }
}, },
onShareAppMessage: function () { onShareAppMessage: function () {

4
pages/morder/create/index.wxml

@ -31,11 +31,11 @@
</view> </view>
<view style="height:18rpx"></view> <view style="height:18rpx"></view>
<wux-cell-group> <wux-cell-group>
<wux-cell wx:if="{{addressInfo}}" title="{{addressInfo.provinceName+addressInfo.cityName+addressInfo.districtName+addressInfo.details}}" is-link url="/pages/address/list/index?type=1">
<wux-cell wx:if="{{addressInfo}}" title="{{addressInfo.provinceName+addressInfo.cityName+addressInfo.districtName+addressInfo.details}}" is-link url="/submodel/pages/address/list/index?type=1">
<view slot="header" class="cuIcon-locationfill text-black" style="width:32rpx;height:32rpx;margin:0rpx 12rpx 0rpx 0rpx"> <view slot="header" class="cuIcon-locationfill text-black" style="width:32rpx;height:32rpx;margin:0rpx 12rpx 0rpx 0rpx">
</view> </view>
</wux-cell> </wux-cell>
<wux-cell wx:else title="无收货地址--去添加" is-link url="/pages/address/list/index?type=1">
<wux-cell wx:else title="无收货地址--去添加" is-link url="/submodel/pages/address/list/index?type=1">
<view slot="header" class="cuIcon-locationfill text-black" style="width:32rpx;height:32rpx;margin:0rpx 12rpx 0rpx 0rpx"> <view slot="header" class="cuIcon-locationfill text-black" style="width:32rpx;height:32rpx;margin:0rpx 12rpx 0rpx 0rpx">
</view> </view>
</wux-cell> </wux-cell>

pages/address/create/index.js → submodel/pages/address/create/index.js

@ -1,8 +1,8 @@
// pages/shop/apply/index.js // pages/shop/apply/index.js
import { getAddressInfo, deleteAddress, createAddress, updateAddress } from "../../../api/ztb"
const util = require('../../../utils/util')
import regions from '../../../const/region'
const tdsdk = require('../../../libs/tdweapp')
import { getAddressInfo, deleteAddress, createAddress, updateAddress } from "../../../../api/ztb"
const util = require('../../../../utils/util')
import regions from '../../../../const/region'
const tdsdk = require('../../../../libs/tdweapp')
const app = getApp() const app = getApp()
Page({ Page({

pages/address/create/index.json → submodel/pages/address/create/index.json

pages/address/create/index.wxml → submodel/pages/address/create/index.wxml

@ -1,4 +1,3 @@
<!--pages/adress/create/index.wxml-->
<cu-custom bgColor="bg-white" isBack="{{true}}"> <cu-custom bgColor="bg-white" isBack="{{true}}">
<view slot="content">{{type==1?'新增':'编辑'}}地址</view> <view slot="content">{{type==1?'新增':'编辑'}}地址</view>
</cu-custom> </cu-custom>

pages/address/create/index.wxss → submodel/pages/address/create/index.wxss

@ -1,4 +1,3 @@
/* pages/adress/create/index.wxss */
.margin-top{ .margin-top{
margin-top: 16rpx; margin-top: 16rpx;
} }

pages/address/list/index.js → submodel/pages/address/list/index.js

@ -1,7 +1,6 @@
// pages/adress/list/index.js
import { getAddressList } from "../../../api/ztb"
const event = require('../../../utils/event.js')
const tdsdk = require('../../../libs/tdweapp')
import { getAddressList } from "../../../../api/ztb"
const event = require('../../../../utils/event.js')
const tdsdk = require('../../../../libs/tdweapp')
Page({ Page({
data: { data: {
@ -29,15 +28,15 @@ Page({
event.emit('EventMessage', { what: 301, obj: item, desc: 'AddressChoose' }) event.emit('EventMessage', { what: 301, obj: item, desc: 'AddressChoose' })
wx.navigateBack({ delta: 1 }) wx.navigateBack({ delta: 1 })
} else { } else {
wx.navigateTo({ url: '/pages/adress/create/index?type=0&shippingAddressId='+ item.shippingAddressId })
wx.navigateTo({ url: '/submodel/pages/address/create/index?type=0&shippingAddressId='+ item.shippingAddressId })
} }
}, },
toEdit: function (e) { toEdit: function (e) {
var item = this.data.adressList[e.currentTarget.dataset.index] var item = this.data.adressList[e.currentTarget.dataset.index]
wx.navigateTo({ url: '/pages/adress/create/index?type=0&shippingAddressId='+ item.shippingAddressId })
wx.navigateTo({ url: '/submodel/pages/address/create/index?type=0&shippingAddressId='+ item.shippingAddressId })
}, },
toCreate: function () { toCreate: function () {
wx.navigateTo({ url: '/pages/adress/create/index?type=1' })
wx.navigateTo({ url: '/submodel/pages/address/create/index?type=1' })
}, },
onHide: function(){ onHide: function(){
tdsdk.Page.onHide() tdsdk.Page.onHide()

pages/address/list/index.json → submodel/pages/address/list/index.json

pages/address/list/index.wxml → submodel/pages/address/list/index.wxml

pages/address/list/index.wxss → submodel/pages/address/list/index.wxss

4
utils/util.js

@ -171,7 +171,7 @@ const tokenList = [
'/pages/morder/index/index', '/pages/morder/index/index',
'/pages/message/index/index', '/pages/message/index/index',
'/pages/home/setting/index', '/pages/home/setting/index',
'/pages/address/list/index',
'/submodel/pages/address/list/index',
'/pages/article/list/index', '/pages/article/list/index',
'/pages/html/integral/index', '/pages/html/integral/index',
'/pages/withdrawal/balance/index', '/pages/withdrawal/balance/index',
@ -231,7 +231,7 @@ function navigateTarget(redirectInfo){
} else if(redirectInfo.targetView == 'contract'){ } else if(redirectInfo.targetView == 'contract'){
navigateTo('/submodel/pages/html/service/index') navigateTo('/submodel/pages/html/service/index')
} else if(redirectInfo.targetView == 'myAddress'){ } else if(redirectInfo.targetView == 'myAddress'){
navigateTo('/pages/address/list/index')
navigateTo('/submodel/pages/address/list/index')
} else if(redirectInfo.targetView == 'myBankCard'){ } else if(redirectInfo.targetView == 'myBankCard'){
navigateTo('/pages/bank/vindex/index') navigateTo('/pages/bank/vindex/index')
} else if(redirectInfo.targetView == 'personalBillDetail'){ } else if(redirectInfo.targetView == 'personalBillDetail'){

Loading…
Cancel
Save