流程测试

16a76289 · 严立 · 881999b9 · 16a76289 · 16a76289 · 16a76289
Commit 16a76289 authored Dec 15, 2020 by 严立
Showing with 64 additions and 125 deletions
app.js
component/m-dialog/m-dialog.wxss
component/m-init.js
component/m-input/m-input.wxml
component/m-input/m-input.wxss
pages/commodity/home/home.js
pages/home/dynamic-detail/dynamic-detail.wxml
pages/home/dynamic-detail/dynamic-detail.wxss
pages/home/dynamic/dynamic.wxml
pages/home/dynamic/dynamic.wxss
pages/home/night-appointment/night-appointment.js
pages/home/night-appointment/night-appointment.wxss
pages/mine/authentication-input/authentication-input.wxml
pages/mine/order/order.js
pages/play/activity/activity.js
pages/play/activity/activity.wxml
pages/play/activity/activity.wxss
pages/play/movie/movie.wxss
utils/utils.js
--- a/app.js
+++ b/app.js
@@ -193,63 +193,6 @@ App({
    },
    /**
-     *  请求封装
-     *  @function
-     *  @param {object} - 请求参数
-     *  @returns
-     */
-    wxRequest: function (obj) {
-        var token = wx.getStorageSync('token')
-        var param = obj.data ? JSON.stringify(obj.data) : ''
-        var header = obj.header ? obj.header : { 'token': token || '' }
-        wx.request({
-            url: this.globalData.baseUrl + obj.url,
-            data: param,
-            method: obj.method || 'POST',
-            header: header,
-            success: (res) => {
-                let code = res.data.code * 1
-                if (200 == code && true == res.data.success) {
-                    if (obj.success) {
-                        obj.success(res.data)
-                    }
-                } else if (402 == code) {
-                    // this.refreshToken(obj)
-                } else if (500 === code) {
-                    if (obj.success) {
-                        obj.success(res)
-                    }
-                } else {
-                    if (obj.fail) {
-                        let err = {
-                            statusCode: code,
-                            msg: res.data.msg || '网络异常'
-                        };
-                        obj.fail(err)
-                    }
-                }
-            },
-            fail: (err) => {
-                if (obj.fail) {
-                    let err = {
-                        statusCode: 9999,
-                        msg: '网络异常'
-                    };
-                    obj.fail(err)
-                } else {
-                    wx.showToast({
-                        title: '网络异常',
-                        icon: 'none',
-                        duration: 2000
-                    })
-                }
-            }
-        });
-    },
-    /**
     *  查询用户认证状态
     *  仅在用户已经注册的前提下会查询此函数
     *  @function

--- a/component/m-dialog/m-dialog.wxss
+++ b/component/m-dialog/m-dialog.wxss
@@ -64,15 +64,15 @@
 /* 操作按钮 */
 .dialog-operation {
+    border: 1px #E2E7EF solid;
    border-style: solid none none none;
-    border-width: 1px;
 }
 .dialog-operation-line {
    width: 1px;
    height: 32rpx;
+    border: 1px #E2E7EF solid;
    border-style: none solid none solid;
-    border-width: 1px;
 }
 .dialog-operation-cancel {

--- a/component/m-init.js
+++ b/component/m-init.js
@@ -24,6 +24,9 @@ function showToast (funcOption) {
    funcOption = Object.assign(App.ui.toast.data, funcOption)
    funcOption.winToast = true
+    console.log('App.ui.toast', App.ui.toast)
+    console.log('funcOption', funcOption)
    App.ui.toast.setData(funcOption)
    // 设置 toast 关闭时间

--- a/component/m-input/m-input.wxml
+++ b/component/m-input/m-input.wxml
 <view class="m-input">
    <view class="row ac" hidden="{{!winText}}" bindtap="setInputShow">
        <view class="m-input-boundary row ac {{className}}">
-            <text class="m-input-text-content" hidden="{{value === '' ? true : false}}">{{value}}</text>
+            <text class="m-input-text-content fs30" hidden="{{value === '' ? true : false}}">{{value}}</text>
-            <text class="m-input-text-placeholder" hidden="{{value === '' ? false : true}}">{{placeholder}}</text>
+            <text class="m-input-text-placeholder fs30" hidden="{{value === '' ? false : true}}">{{placeholder}}</text>
        </view>
    </view>
    <view class="row ac" hidden="{{!winInput}}">
        <view class="m-input-boundary row ac {{className}}">
            <input
-                class="m-input-input-content row ac"
+                class="m-input-input-content row ac fs30"
                value="{{value}}"
                type="{{type}}"
                maxlength="{{maxlength}}"

--- a/component/m-input/m-input.wxss
+++ b/component/m-input/m-input.wxss
@@ -2,7 +2,13 @@
 .m-input-boundary {
    position: relative;
+    width: 100%;
+    height: 80rpx;
+    margin: 16rpx 0 0 0;
+    padding: 0 24rpx;
+    border-radius: 4px;
    overflow-x: scroll;
+    border: 1px #DBDFE5 solid;
 }
 /* 显示文本样式 */

--- a/pages/commodity/home/home.js
+++ b/pages/commodity/home/home.js
@@ -149,13 +149,14 @@ Page({
                } else {
                    funcBanner[funcIndex] = ''
                }
-                this.setData({
+                This.setData({
                    banner: funcBanner
                })
            })
        }
        // 0 首页，1 所有服务，2 儿童营地，3 海错图，4 元养水韵，5 儿童营地接待，6 拾光花坊， 7 商品
+        let This = this
        let funcShopList = [2, 3, 4, 5, 6]
        for (let i = 0, l = funcShopList.length; i < l; i++) {
            shopCover(funcShopList[i], i)

--- a/pages/home/dynamic-detail/dynamic-detail.wxml
+++ b/pages/home/dynamic-detail/dynamic-detail.wxml
@@ -5,7 +5,7 @@
        <text>{{notice.title}}</text>
    </view>
    <view class="date row cs">
-        <text>{{notice.date}}</text>
+        <text class="fs26 c31">{{notice.date}}</text>
    </view>
    <view class="describe">
        <rich-text nodes="{{notice.describe}}"></rich-text>

--- a/pages/home/dynamic-detail/dynamic-detail.wxss
+++ b/pages/home/dynamic-detail/dynamic-detail.wxss
 .title {
    width: 670rpx;
-    margin-top: 60rpx;
+    margin: 50rpx 0 0 0;
    font-size: 46rpx;
    font-weight: bolder;
    color: #15191F;
@@ -8,9 +8,7 @@
 .date {
    width: 670rpx;
-    margin: 32rpx 0 64rpx 0;
+    margin: 38rpx 0 64rpx 0;
-    font-size: 32rpx;
-    color: #959DA9;
 }
 .cover,
@@ -22,7 +20,7 @@
 .describe {
    width: 670rpx;
-    margin-top: 50rpx;
+    margin: 2rpx 0 0 0;
    margin-bottom: 50rpx;
    font-size: 30rpx;
    font-weight: 300;

--- a/pages/home/dynamic/dynamic.wxml
+++ b/pages/home/dynamic/dynamic.wxml
-<m-nav titleText="最新动态"></m-nav>
+<m-nav titleText="最新动态" styleIndex="{{1}}"></m-nav>
 <view class="container">
    <view class="title row cb ae">
@@ -14,7 +14,7 @@
                    <text>{{item.date}}</text>
                </view>
                <view class="notice-describe">
-                    <rich-text nodes="{{item.describe}}"></rich-text>
+                    <text class="fs26 c31">{{item.describe}}</text>
                </view>
                <view class="notice-cover" wx:if="{{item.cover !== ''}}">
                    <image src="{{item.cover}}" mode="widthFix"></image>

--- a/pages/home/dynamic/dynamic.wxss
+++ b/pages/home/dynamic/dynamic.wxss
@@ -36,7 +36,7 @@
 .notice-describe {
    width: 670rpx;
-    margin-top: 24rpx;
+    margin: 16rpx 0 0 0;
 }
 .notice-describe text {

--- a/pages/home/night-appointment/night-appointment.js
+++ b/pages/home/night-appointment/night-appointment.js
-const App = getApp()
+let App = getApp()
-let logicData = {
-    pageScrollLock: false,
-    pageScrollTimer: 0,
-}
 Page({
    data: {
-        imageBase: App.globalData.appImageBase,
-        resourcesBase: App.globalData.appResourcesBase,
-        navScroll: 0,
        appointmentDate: '',
        appointmentEndDate: '',
        appointmentComplete: false,
@@ -229,7 +218,6 @@ Page({
        App.ui.showToast({
            iconType: 'loading',
            title: '提交中',
-            duration: 60000,
        })
        App.request({
            url: 'v1/subscribe/doSubscribe',
@@ -245,9 +233,8 @@ Page({
            if (response.data && response.data.code == 500) {
                App.ui.showToast({
                    iconType: 'error',
-                    title: response.data.msg,
+                    title: response.data.message,
                })
            } else {
                this.setData({
                    appointmentComplete: true,
@@ -256,9 +243,10 @@ Page({
            }
        })
        .catch((response) => {
+            console.log('response', response)
            App.ui.showToast({
                iconType: 'error',
-                title: response.msg,
+                title: response.message,
            })
        })
    },

--- a/pages/home/night-appointment/night-appointment.wxss
+++ b/pages/home/night-appointment/night-appointment.wxss
@@ -55,7 +55,7 @@
 /* 表单 */
 .form-title {
    width: 750rpx;
-    margin-top: 40rpx;
+    margin: 40rpx 0 10rpx 0;
    padding: 0 40rpx;
    font-size: 30rpx;
    color: #959DA9;
@@ -85,6 +85,7 @@
    width: 76rpx;
    height: 40rpx;
    border-right: 1px #DBDFE5 solid;
+    border-radius: 0;
    background: #FFFFFF;
 }
@@ -99,6 +100,7 @@
    width: 76rpx;
    height: 40rpx;
    border-left: 1px #DBDFE5 solid;
+    border-radius: 0;
    background: #FFFFFF;
 }
@@ -159,7 +161,7 @@
 /* 操作按钮 */
 .appointment-operation {
    width: 750rpx;
-    margin-top: 30rpx;
+    margin: 18rpx 0 0 0;
    padding: 30rpx 40rpx;
    background: #ffffff;
 }

--- a/pages/mine/authentication-input/authentication-input.wxml
+++ b/pages/mine/authentication-input/authentication-input.wxml
@@ -3,7 +3,7 @@
 <view class="container">
    <view class="header">
-        <image class="banner" src="http://upload.miaomiao-bao.com/968f6202008192116574683.jpg"></image>
+        <image class="banner" src="{{resourcesBase + 'bgi/bgi-71.png'}}"></image>
        <view style="display:flex;justify-content: center;padding-top:144rpx;">
            <image class="yztq" src="./image/yztq.png"></image>
        </view>

--- a/pages/mine/order/order.js
+++ b/pages/mine/order/order.js
@@ -83,15 +83,16 @@ Page({
     */
    queryOrder: function () {
        // 数据全部加载完成不再执行
-        App.wxRequest({
+        App.request({
            url: 'v1/order/getOrderList',
-            data: {
+            params: {
                'goodType': this.data.orderTypeActive ? this.data.orderType[this.data.orderTypeActive].value : '',
                'status': this.data.tabItem[this.data.statusActive].value,
                'pageSize': 10,
                'pageNo': this.data.orderPages,
-            },
+            }
-            success: (response) => {
+        })
+        .then((response) => {
            let funcResponse = response.data
            let funcList = []
            for (let i = 0, l = funcResponse.length; i < l; i++) {
@@ -156,7 +157,6 @@ Page({
            this.setData({
                orderList: this.data.orderPages === 1 ? funcList : this.data.orderList.concat(funcList)
            })
-            }
        })
    },
@@ -167,12 +167,13 @@ Page({
     *  @returns
     */
    setOrderType: function () {
-        App.wxRequest({
+        App.request({
            url: 'v1/common/getDictByType',
-            data: {
+            params: {
                'type': 'order_good_type',
            },
-            success: (response) => {
+        })
+        .then((response) => {
            let funcResponse = response.data
            let funcList = [{
                'value': '',
@@ -225,7 +226,6 @@ Page({
                orderTypeActive
            })
            this.queryOrder()
-            }
        })
    },
@@ -309,8 +309,6 @@ Page({
     *  @returns
     */
    onOrderCancel: function (event) {        
-        console.log('onOrderCancel')
        App.ui.showDialog({
            type: 'confirm',
            title: '是否确认取消订单',
@@ -327,13 +325,14 @@ Page({
                    isDoing: true
                })
                let funcItem = event.target.dataset.item
-                App.wxRequest({
+                App.request({
                    url: 'v1/order/cancelOrder',
-                    data: {
+                    params: {
                        'orderId': funcItem.id,
                        'type': 0,
                    },
-                    success: (response) => {
+                })
+                .then((response) => {
                    App.ui.showToast({
                        'iconType': 'success',
                        'title': '取消成功'
@@ -344,7 +343,6 @@ Page({
                        'orderPages': 1,
                    })
                    this.queryOrder()
-                    }
                })
            },
            fail: () => { },
@@ -374,13 +372,14 @@ Page({
                    isDoing: true
                })
                let funcItem = event.target.dataset.item
-                App.wxRequest({
+                App.request({
                    url: 'v1/order/cancelOrder',
-                    data: {
+                    params: {
                        'orderId': funcItem.id,
                        'type': 1,
                    },
-                    success: (response) => {
+                })
+                .then((response) => {
                    App.ui.showToast({
                        'iconType': 'success',
                        'title': '删除成功'
@@ -391,7 +390,6 @@ Page({
                        'orderPages': 1,
                    })
                    this.queryOrder()
-                    }
                })
            },
            fail: () => {},

--- a/pages/play/activity/activity.js
+++ b/pages/play/activity/activity.js
@@ -80,6 +80,7 @@ Page({
            let funcData = response.data
            let funcList = [{ text: '全部', value: 0 }]
            for (let i = 0, l = funcData.length; i < l; i++) {
+                if (['101'].includes(funcData[i].tagId)) continue
                let funcItem = {
                    'text': funcData[i].name,
                    'value': funcData[i].tagId,

--- a/pages/play/activity/activity.wxml
+++ b/pages/play/activity/activity.wxml
 <m-nav titleText="主题活动" scrollHeight="{{navScroll}}" styleIndex="{{1}}" bindnavChangeHeight="eventNavChangeHeight"></m-nav>
-<m-tab item="{{tabItem}}" isFixed="{{true}}" fixedTop="{{tabTop}}" bindtabChange="eventTabChange"></m-tab>
+<m-tab class="tab-type" item="{{tabItem}}" isFixed="{{true}}" fixedTop="{{tabTop}}" bindtabChange="eventTabChange"></m-tab>
 <view class="container bg-gradient">
    <!-- 近期活动 -->
@@ -12,7 +12,7 @@
                    </view>
                    <view class="item-info column">
                        <view class="item-title row cb ac">
-                            <text>{{item.name}}</text>
+                            <text class="fs30 fw800 c01">{{item.name}}</text>
                            <text wx:if="{{item.tagNames[0]}}">{{item.tagNames[0]}}</text>
                        </view>
                        <view class="item-date row ac">

--- a/pages/play/activity/activity.wxss
+++ b/pages/play/activity/activity.wxss
-.tab {
+.tab-type {
-    position: fixed;
+    margin: 44rpx 0 0 0;
-    top: 0;
-    left: 0;
-    background: #FFFFFF;
 }
 .container {
@@ -86,14 +83,10 @@
 .item-title {
    height: 44rpx;
-    margin-top: 32rpx;
+    margin: 20rpx 0 0 0;
 }
 .item-title text:nth-child(1) {
-    font-size: 34rpx;
-    font-weight: bold;
-    color: #15191f;
-    line-height: 44rpx;
    display: -webkit-box;
    overflow: hidden;
    white-space: normal;

--- a/pages/play/movie/movie.wxss
+++ b/pages/play/movie/movie.wxss
@@ -11,6 +11,7 @@ page {
 .status {
    z-index: 2;
    width: 750rpx;
+    margin: 52rpx 0 0 0;
    background-color: #1C1C25;
    border-bottom: 1rpx #3A3A40 solid;
 }
@@ -40,7 +41,7 @@ page {
    width: 670rpx;
    height: 396rpx;
    margin: 76rpx auto 0;
-    padding: 64rpx 32rpx 32rpx 32rpx;
+    padding: 60rpx 32rpx 32rpx 32rpx;
    background: #272733;
 }
 .movie-time-wrapper {
@@ -83,7 +84,7 @@ page {
 }
 .movie-name-wrapper {
    height: 40rpx;
-    margin: 0 0 12rpx 0;
+    margin: 0 0 20rpx 0;
    overflow: hidden;
    flex-wrap: wrap;
 }

--- a/utils/utils.js
+++ b/utils/utils.js
@@ -43,6 +43,12 @@ let output = {
        }
    },
+    /**
+     *  计算字符串字符数量
+     *  @function
+     *  @param {string} - funcCountString 字符串
+     *  @returns
+     */
    countStringChar: function (funcCountString) {
        let funcCountDoubleByte = funcCountString.match(/[\uff00-\uffff]/ig)
        let funcCountSingleByte = funcCountString.match(/[\u0000-\u00ff]/ig)
@@ -55,7 +61,6 @@ let output = {
        if (funcCountEmoji === null) funcCountEmoji = []
        let funcCountStringChar = funcCountDoubleByte.length * 2 + funcCountSingleByte.length * 1 + funcCountChinese.length * 2 + funcCountEmoji.length * 1
-        console.log(funcCountStringChar)
        return funcCountStringChar
    },
 }