Commit 2ec8baae authored by 不吃草的咩's avatar 不吃草的咩
Browse files

修改登录跳转方式，修改报名须知，

parent b6426068

.github/FUNDING.yml

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
# These are supported funding model platforms



# github: [@weilanwl, @bypanghu]

# patreon: # Replace with a single Patreon username

# open_collective: # Replace with a single Open Collective username

# ko_fi: # Replace with a single Ko-fi username

# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry

# liberapay: # Replace with a single Liberapay username

# issuehunt: # Replace with a single IssueHunt username

# otechie: # Replace with a single Otechie username

# lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry



custom: ['https://colorui-assest.vercel.app/mp-cu-doc/thanks.jpg','https://paypal.me/iZaiZaiA']

mp-sdk/components/app-nav-li/app-nav-li.js

+18 −14
Original line number Diff line number Diff line 
Component({

    data: {

        colorName: '',

        navurl:''

    },

    options: {

        addGlobalClass: true
@@ -11,13 +10,17 @@ Component({ 
            type: Object,

            optionalTypes: Array,

            value: {},

        },

        navurl:{

            type:String,

            value:''

        }

    },

    lifetimes: {

        attached() {

            this.setData({

                colorName: this.getColor(),

                navurl: this.getNavUrl()

                colorName: this.getColor()

 //               navurl: this.getNavUrl()

            });

        }

    },
@@ -27,16 +30,17 @@ Component({ 
            let colorArr = ['yellow', 'orange', 'red', 'pink', 'mauve', 'purple', 'blue', 'cyan', 'green', 'olive', 'grey', 'brown'];

            return colorArr[Math.floor(Math.random() * colorArr.length)]

        },

        getNavUrl(){

            let params = ''

            if(this.data.data.params !== undefined){

                for(let i in this.data.data.params){

                    params+=`${i}=${this.data.data.params[i]}&`

                };

               params = params.substr(0,params.length-1);

            };

            let url = `/pages/document/${this.data.data.name}/${this.data.data.name}?${params}`

            return url;

        }

        // getNavUrl(){

        //     let params = ''

        //     if(this.data.data.params !== undefined){

        //         for(let i in this.data.data.params){

        //             params+=`${i}=${this.data.data.params[i]}&`

        //         };

        //        params = params.substr(0,params.length-1);

        //     };

        //     let url = `/pages/document/${this.data.data.name}/${this.data.data.name}?${params}`;

        //     console.log(url);

        //     return url;

        // }

    },

})
 
 No newline at end of file

pages/demo/login/login.js

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ Page({ 
            tabCur: e.detail.index

        })

    },

    getPhoneNumber (e) {

        console.log(e.detail)

    },

    checkChange(e) {

        this.setData({

            check: e.detail

pages/demo/login/login.wxml

+3 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
        <text slot="center">登录</text>

    </ui-navbar>

    <view class="p-5">

        <view class="text-xxl">

        <!-- <view class="text-xxl">

            <view class="text-bold py-2">欢迎登录ColorUI组件库</view>

        </view>

        <view class="mt-5">
@@ -56,11 +56,10 @@ 
                <text>立即注册</text>

                <text class="cicon-round-angle-o ml-3"/>

            </view>

        </view>

        </view> -->

        <ui-fixed bottom>

            <view class="p-5">

                <ui-title title="其他登录方式" align="center" hasLine tpl="center-column"/>

                <button class="ui-btn bg-green-gradient radius lg block shadow-green" bindtap="wxloginSubmit" disabled="{{isLoading}}">

                <button class="ui-btn bg-green-gradient radius lg block shadow-green" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">

                    <text class="cicon-weixin icon-xl mr-3"/>

                    <text>微信一键登录</text>

                    <text class="cicon-loading1 icon-spin ml-3" wx:if="{{wxisLoading}}"/>

pages/document/qyDetail/qyDetail.js

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Page({ 
     * 生命周期函数--监听页面加载

     */

    onLoad: function (options) {

        if(options.type == '1'){

        if(options.type == '0'){

            this.setData({jgTitle:'机构介绍'})

        }else{

            this.setData({jgTitle:'报名指南'})