Browse Source

no message

featrue/v4.5
xpz2018 4 years ago
parent
commit
4b7b237550
19 changed files with 8 additions and 20 deletions
  1. 4
      app.json
  2. 1
      pages/home/about/index.wxss
  3. 1
      pages/home/city-select/index.js
  4. 1
      pages/home/city-select/index.wxml
  5. 1
      pages/home/city-select/index.wxss
  6. 2
      pages/home/info/index.js
  7. 2
      pages/home/setting/index.wxml
  8. 1
      pages/mall/search-list/index.js
  9. 1
      pages/mall/search-list/index.wxml
  10. 1
      pages/mall/search-list/index.wxss
  11. 1
      pages/purchase/create/index.wxml
  12. 3
      submodel/pages/home/about/index.js
  13. 0
      submodel/pages/home/about/index.json
  14. 1
      submodel/pages/home/about/index.wxml
  15. 0
      submodel/pages/home/about/index.wxss
  16. 8
      submodel/pages/home/enterprise/index.js
  17. 0
      submodel/pages/home/enterprise/index.json
  18. 0
      submodel/pages/home/enterprise/index.wxml
  19. 0
      submodel/pages/home/enterprise/index.wxss

4
app.json

@ -2,7 +2,6 @@
"pages": [ "pages": [
"pages/index/index", "pages/index/index",
"pages/login/index", "pages/login/index",
"pages/home/about/index",
"pages/home/mobile/index", "pages/home/mobile/index",
"pages/home/password/index", "pages/home/password/index",
"pages/home/setting/index", "pages/home/setting/index",
@ -19,7 +18,6 @@
"pages/home/tab6/index", "pages/home/tab6/index",
"pages/home/attention-paper/index", "pages/home/attention-paper/index",
"pages/home/business-license/index", "pages/home/business-license/index",
"pages/home/enterprise/index",
"pages/shop/create/index", "pages/shop/create/index",
"pages/shop/detail/index", "pages/shop/detail/index",
"pages/shop/order/index", "pages/shop/order/index",
@ -69,6 +67,8 @@
{ {
"root": "submodel/", "root": "submodel/",
"pages": [ "pages": [
"pages/home/about/index",
"pages/home/enterprise/index",
"pages/html/personal/index", "pages/html/personal/index",
"pages/html/logistics/index", "pages/html/logistics/index",
"pages/html/service/index", "pages/html/service/index",

1
pages/home/about/index.wxss

@ -1 +0,0 @@
/* pages/home/about/index.wxss */

1
pages/home/city-select/index.js

@ -1,4 +1,3 @@
// pages/home/about/index.js
const util = require('../../../utils/util') const util = require('../../../utils/util')
const event = require('../../../utils/event') const event = require('../../../utils/event')
const storage = require('../../../utils/storage') const storage = require('../../../utils/storage')

1
pages/home/city-select/index.wxml

@ -1,4 +1,3 @@
<!--pages/home/about/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/home/city-select/index.wxss

@ -1,4 +1,3 @@
/* pages/home/about/index.wxss */
.list-bar{ .list-bar{
display: flex; display: flex;
flex-direction: column; flex-direction: column;

2
pages/home/info/index.js

@ -308,7 +308,7 @@ Page({
}, },
goEnterpriseInfo: function () { goEnterpriseInfo: function () {
if(app.globalData.userInfo.isEnterpriseAuth){ if(app.globalData.userInfo.isEnterpriseAuth){
wx.navigateTo({ url: '/pages/home/enterprise/index' })
wx.navigateTo({ url: '/submodel/pages/home/enterprise/index' })
} else { } else {
wx.navigateTo({ url: '/pages/home/certificate/index' }) wx.navigateTo({ url: '/pages/home/certificate/index' })
} }

2
pages/home/setting/index.wxml

@ -39,7 +39,7 @@
<view style="height:16rpx"></view> <view style="height:16rpx"></view>
<wux-cell-group> <wux-cell-group>
<wux-cell title="关于纸通宝" is-link url="/pages/home/about/index"></wux-cell>
<wux-cell title="关于纸通宝" is-link url="/submodel/pages/home/about/index"></wux-cell>
<wux-cell disabled="{{userInfo.bizUserName!=null}}" is-link data-cid='bizUserId' data-tag='业务人员邀请码' bind:click="showDialog"> <wux-cell disabled="{{userInfo.bizUserName!=null}}" is-link data-cid='bizUserId' data-tag='业务人员邀请码' bind:click="showDialog">
<view slot="header" class="text-black">业务人员邀请码</view> <view slot="header" class="text-black">业务人员邀请码</view>
<view slot="footer" class="{{userInfo.bizUserId? 'text-black':'text-gray'}}">{{userInfo.bizUserCode || '点击填写业务人员邀请码'}}</view> <view slot="footer" class="{{userInfo.bizUserId? 'text-black':'text-gray'}}">{{userInfo.bizUserCode || '点击填写业务人员邀请码'}}</view>

1
pages/mall/search-list/index.js

@ -1,4 +1,3 @@
// pages/home/about/index.js
import { getFactoryPrice, getProxyOrderList } from "../../../api/ztb" import { getFactoryPrice, getProxyOrderList } from "../../../api/ztb"
import { getPreferList, getInformationList } from "../../../api/moment" import { getPreferList, getInformationList } from "../../../api/moment"
const storage = require('../../../utils/storage') const storage = require('../../../utils/storage')

1
pages/mall/search-list/index.wxml

@ -1,4 +1,3 @@
<!--pages/home/about/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/mall/search-list/index.wxss

@ -1 +0,0 @@
/* pages/home/about/index.wxss */

1
pages/purchase/create/index.wxml

@ -4,7 +4,6 @@
</cu-custom> </cu-custom>
<scroll-view scroll-y="true" style="height: {{height}}rpx;"> <scroll-view scroll-y="true" style="height: {{height}}rpx;">
<view class="cu-list menu no-card sm-border margin-top"> <view class="cu-list menu no-card sm-border margin-top">
<view id="operation" class="cu-item" bindtap="showPaperPicker"> <view id="operation" class="cu-item" bindtap="showPaperPicker">
<view class="flex flex-justify content cu-item arrow"> <view class="flex flex-justify content cu-item arrow">

pages/home/about/index.js → submodel/pages/home/about/index.js

@ -1,13 +1,10 @@
// pages/home/about/index.js
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */

pages/home/about/index.json → submodel/pages/home/about/index.json

pages/home/about/index.wxml → submodel/pages/home/about/index.wxml

@ -1,4 +1,3 @@
<!--pages/home/about/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>

0
submodel/pages/home/about/index.wxss

pages/home/enterprise/index.js → submodel/pages/home/enterprise/index.js

@ -1,7 +1,7 @@
import { zconfig, getBaseInfo, updateUserInfoZtb } from '../../../api/ztb'
import { updateUserInfo } from '../../../api/user'
const util = require('../../../utils/util')
const tdsdk = require('../../../libs/tdweapp')
import { zconfig, getBaseInfo, updateUserInfoZtb } from '../../../../api/ztb'
import { updateUserInfo } from '../../../../api/user'
const util = require('../../../../utils/util')
const tdsdk = require('../../../../libs/tdweapp')
const app = getApp() const app = getApp()
Page({ Page({

pages/home/enterprise/index.json → submodel/pages/home/enterprise/index.json

pages/home/enterprise/index.wxml → submodel/pages/home/enterprise/index.wxml

pages/home/enterprise/index.wxss → submodel/pages/home/enterprise/index.wxss

Loading…
Cancel
Save