diff --git a/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js b/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js
index 8aee044d2f74ca8eb7b32d3539fa63f5ba6530bc..0d1f9db4ba8bcaf074c7ccf5854f7b5a4e06775d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js
@@ -51,31 +51,10 @@ const install = (Vue, vm) => {
             //console.log(page.route);
             // 登录信息过期或者未登录
             if (result.data === 14007 || result.data === 14006) {
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                if (page.route.indexOf('pages/login/loginBySMS/loginBySMS') < 0) {
-                    db.del("userToken");
-                    uni.showToast({
-                        title: result.msg,
-                        icon: 'none',
-                        duration: 1000,
-                        complete: function () {
-                            setTimeout(function () {
-                                uni.hideToast();
-                                uni.navigateTo({
-                                    url: '/pages/login/loginBySMS/loginBySMS'
-                                });
-                            },
-                                1000);
-                        }
-                    });
-                }
-                // #endif
-                // #ifdef MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO
                 db.del("userToken");
                 console.log("开启登录弹窗");
                 //Vue.prototype.$store.commit('showLoginTip', true);
                 Vue.prototype.$store.commit('hasLogin', false);
-                // #endif
             }
         }
 
@@ -83,8 +62,6 @@ const install = (Vue, vm) => {
         // res为服务端返回值，可能有code，result等字段
         // 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到
         // 如果配置了originalData为true，请留意这里的返回值
-
-
     }
 }
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
index 9ee458bf7c2e32a3ac45ef2994fa9a58d79b23fd..9b978782bd3eb25f678397a94d7673a6deaf7115 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
@@ -7,7 +7,6 @@
 export const apiBaseUrl = 'https://api.demo.coreshop.cn';
 //项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.cdn.coreshop.cn
 export const apiFilesUrl = 'https://files.cdn.coreshop.cn';
-export const h5Url = apiBaseUrl + "/wap/"; //H5端网站地址,
 
 // #ifdef H5
 export const baseUrl = process.env.NODE_ENV === 'development' ? window.location.origin + '/' : apiBaseUrl
@@ -22,11 +21,6 @@ export const paymentType = {
     serviceOrder: 5, //服务订单
 };
 
-// #ifdef MP-TOUTIAO
-export const ttPlatform = 'toutiao'; //toutiao=今日头条小程序, douyin=抖音小程序, pipixia=皮皮虾小程序, huoshan=火山小视频小程序
-// #endif
-
-
 //nav页面导航类型
 export const navLinkType = {
     urlLink: 1, //"URL链接"
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
index bcfa999558f2eb6c2ff566f8160f47a4e8b90c91..c2a71efd77b0dc78cf08f71dce243fbd8b32add0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
@@ -1,44 +1,6 @@
 <template>
     <view>
         <u-toast ref="uToast" />
-        <!-- #ifndef MP-WEIXIN  -->
-        <u-popup class="coreshop-bottom-popup-box" v-if="showLogin" v-model="showLogin" cathctouchmove @tap="hideModal"  mode="bottom">
-            <view class="radius coreshop-bg-white" @tap.stop style="background: none;overflow: visible;">
-                <view class="modal-box">
-                    <image class="head-bg" src="/static/images/login/nologin_bg.png" mode=""></image>
-                    <view class="detail">
-                        <view class="user-avatar">
-                            <!-- #ifndef MP-TOUTIAO -->
-                            <open-data type="userAvatarUrl"></open-data>
-                            <!-- #endif -->
-                            <!-- #ifdef MP-TOUTIAO -->
-                            <image class="toutiao-logo" :src="logoImage"></image>
-                            <!-- #endif -->
-                            <!-- #ifdef H5 || APP-PLUS -->
-                            <u-avatar :src="$store.state.config.shopLogo" size="large"></u-avatar>
-                            <!-- #endif -->
-                        </view>
-                        <open-data class="user-name" type="userNickName"></open-data>
-                        <view class="title2">为了提供更优质的服务</view>
-                        <view class="title2">需要获取您的头像昵称</view>
-                    </view>
-                    <view class="u-margin-top-80 coreshop-flex coreshop-flex-direction coreshop-align-center">
-                        <!-- #ifdef MP-ALIPAY -->
-                        <u-button  type="success"  @click="getALICode()">授权并查看</u-button>
-                        <!-- #endif -->
-                        <!-- #ifdef MP-TOUTIAO -->
-                        <u-button  type="success"  @click="ttLogin()">授权并查看</u-button>
-                        <!-- #endif -->
-                        <!-- #ifdef H5 || APP-PLUS -->
-                        <u-button  type="success"  @click="toAccountLogin()">授权并查看</u-button>
-                        <!-- #endif -->
-                         <u-button  @click="closeAuth">暂不授权</u-button>
-                    </view>
-                </view>
-            </view>
-        </u-popup>
-        <!-- #endif  -->
-        <!-- #ifdef MP-WEIXIN  -->
         <u-popup class="coreshop-bottom-popup-box" v-if="showLogin" v-model="showLogin" mode="center">
             <view class="radius coreshop-bg-white" @tap.stop style="background: none;overflow: visible;">
                 <view class="modal-box">
@@ -79,7 +41,6 @@
                 </view>
             </view>
         </u-popup>
-        <!-- #endif  -->
     </view>
 </template>
 
@@ -193,11 +154,6 @@
             hideModal() {
                 this.showLogin = false;
             },
-            // 去登录
-            toAccountLogin() {
-                this.showLogin = false;
-                this.$u.route('/pages/login/loginByAccount/loginByAccount');
-            },
             // 小程序，取消登录
             closeAuth() {
                 this.showLogin = false;
@@ -236,12 +192,7 @@
                             _this.$refs.uToast.show({ title: '登录成功', type: 'success', })
                             return false
                         } else {
-                            // #ifdef MP-WEIXIN
                             _this.sessionAuthIdTool = res.data.sessionAuthId;
-                            // #endif
-                            // #ifndef MP-WEIXIN
-                            _this.$u.route({ type: 'navigateTo', url: '/pages/login/loginBySMS/loginBySMS?sessionAuthId=' + res.data.sessionAuthId });
-                            // #endif
                         }
                     } else {
                         _this.$refs.uToast.show({ title: '登录失败，请重试', type: 'error', })
@@ -290,122 +241,7 @@
                         _this.$u.toast('登录失败，请重试')
                     }
                 })
-            },
-            // #ifdef MP-ALIPAY
-            getALICode() {
-                let that = this
-                uni.login({
-                    scopes: 'auth_user',
-                    success: (res) => {
-                        if (res.authCode) {
-                            uni.getUserInfo({
-                                provider: 'alipay',
-                                success: function (infoRes) {
-                                    if (infoRes.errMsg == "getUserInfo:ok") {
-                                        let userInfo = {
-                                            'nickname': infoRes.nickName,
-                                            'avatar': infoRes.avatar
-                                        }
-                                        that.aLiLoginStep1(res.authCode, userInfo);
-                                    }
-                                },
-                                fail: function (errorRes) {
-                                    this.$u.toast('未取得用户昵称头像信息');
-                                }
-                            });
-                        } else {
-                            this.$u.toast('未取得code');
-                        }
-                    },
-                    fail: function (res) {
-                        this.$u.toast('用户授权失败my.login');
-                    }
-                });
-            },
-            aLiLoginStep1(code, userInfo) {
-                let data = {
-                    'code': code,
-                    'userInfo': userInfo
-                }
-                this.$u.api.alilogin1(data).then(res => {
-                    this.alipayNoLogin = false;
-                    if (res.status) {
-                        this.sessionAuthIdTool = res.data.sessionAuthId
-                        //判断是否返回了token，如果没有，就说明没有绑定账号，跳转到绑定页面
-                        if (!res.data.hasOwnProperty('token')) {
-                            this.$u.route({ type: 'redirectTo', url: '/pages/login/loginBySMS/loginBySMS?sessionAuthId=' + res.data.sessionAuthId });
-                        } else {
-                            this.$db.set('userToken', res.data.token)
-                            uni.navigateBack({
-                                delta: 1
-                            });
-                        }
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                })
-            },
-            // #endif
-            // #ifdef MP-TOUTIAO
-            ttLogin() {
-                let that = this
-                uni.login({
-                    provider: 'toutiao',
-                    success: (res) => {
-                        //console.log(res);
-                        if (res.errMsg == "login:ok") {
-                            uni.getUserInfo({
-                                provider: 'toutiao',
-                                success: function (infoRes) {
-                                    //console.log(infoRes);
-                                    if (infoRes.errMsg == "getUserInfo:ok") {
-                                        let code = res.code;
-                                        let userInfo = {
-                                            'nickname': infoRes.userInfo.nickName,
-                                            'avatar': infoRes.userInfo.avatarUrl,
-                                            'gender': infoRes.userInfo.gender,
-                                            'language': infoRes.userInfo.language,
-                                            'country': infoRes.userInfo.country,
-                                            'city': infoRes.userInfo.city,
-                                            'province': infoRes.userInfo.province
-                                        }
-                                        that.ttLoginStep(code, userInfo);
-                                    }
-                                },
-                                fail: function (errorRes) {
-                                    this.$u.toast('未取得用户昵称头像信息');
-                                }
-                            });
-                        } else {
-                            this.$u.toast('未取得code');
-                        }
-                    },
-                    fail: function (res) {
-                        this.$u.toast('用户授权失败my.login');
-                    }
-                });
-            },
-            ttLoginStep(code, userInfo) {
-                let data = {
-                    'code': code,
-                    'userInfo': userInfo
-                }
-                this.$u.api.ttlogin(data).then(res => {
-                    if (res.status) {
-                        if (!res.data.hasOwnProperty('token')) {
-                            this.$u.route({ type: 'redirectTo', url: '/pages/login/loginBySMS/loginBySMS?sessionAuthId=' + res.data.userId });
-                        } else {
-                            this.$db.set('userToken', res.data.token)
-                            uni.navigateBack({
-                                delta: 1
-                            });
-                        }
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                })
             }
-            // #endif
         }
     };
 </script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue
index e050c3a2566a750de4477904a512c856c30df0db..dc35fbeef4d8aba93b4c49c078a7c07113c40544 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue
@@ -25,9 +25,7 @@
 
         },
         onReady: function (res) {
-            // #ifndef MP-ALIPAY
-            this.videoContext = uni.createVideoContext('myVideo')
-            // #endif
+
         },
         methods: {
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByAli.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByAli.vue
deleted file mode 100644
index 1a07e0b1075e0055fea8bb010f905aedd2b16f3f..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByAli.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" />
-        <view v-for="item in payments" :key="item.code" @click="toPayHandler(item.code)" v-if="!(type == 2 && item.code == 'balancepay')">
-            <view class="u-reset-button coreshop-list menu-avatar  padding-xl radius shadow shadow-lg bg-blue margin-top">
-                <view class="coreshop-list-item">
-                    <view class="coreshop-avatar radius">
-                        <u-image width="68rpx" height="68rpx" :src="item.icon" :lazy-load="false" :fade="false" duration="0"></u-image>
-                    </view>
-                    <view class="content">
-                        <view class="coreshop-text-grey">{{ item.name }}</view>
-                        <view class="coreshop-text-gray u-font-sm flex u-text-left">
-                            <view class="u-line-1">
-                                {{ item.memo }}
-                            </view>
-                        </view>
-                    </view>
-                    <view class="action">
-                        <u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
-                    </view>
-                </view>
-            </view>
-        </view>
-
-        <view class="payment-pop" v-show="popShow">
-            <view class="payment-pop-c">
-                <image src="/static/images/payments/wait-pay.png" style="width: 30px;height: 30px;"></image>
-                <view class="text">支付中，请稍后...</view>
-            </view>
-            <view class="payment-pop-b">
-                <button class="coreshop-btn coreshop-btn-c" @click="popHide">支付失败</button>
-                <button class="coreshop-btn coreshop-btn-o" @click="popHide">支付成功</button>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        props: {
-            // 如果是商品订单此参数必须
-            orderId: {
-                type: String,
-                default() {
-                    return '';
-                }
-            },
-            // 如果是充值订单此参数必须
-            recharge: {
-                type: Number,
-                default() {
-                    return 0;
-                }
-            },
-            // 用户id
-            uid: {
-                type: Number,
-                default() {
-                    return 0;
-                }
-            },
-            // 订单类型
-            type: {
-                type: Number,
-                default() {
-                    return 1;
-                }
-            }
-        },
-        data() {
-            return {
-                payments: [],
-                popShow: false
-            }
-        },
-        mounted() {
-            this.getPayments();
-        },
-        methods: {
-            // 获取可用支付方式列表
-            getPayments() {
-                this.$u.api.paymentList().then(res => {
-                    if (res.status) {
-                        this.payments = this.formatPayments(res.data);
-                    }
-                })
-            },
-            // 支付方式处理
-            formatPayments(payments) {
-                payments = payments.filter(item => item.code !== 'wechatpay');
-                // 如果是充值订单 过滤余额支付 过滤非线上支付方式
-                if (this.type === 2) {
-                    payments = payments.filter(item => item.code !== 'balancepay' || item.isOnline === false)
-                }
-                // 设置logo图片
-                payments.forEach(item => {
-                    this.$set(item, 'icon', '/static/images/payments/' + item.code + '.png')
-                });
-
-                return payments;
-            },
-            // 用户点击支付方式处理
-            toPayHandler(code) {
-                this.popShow = true;
-                let data = {
-                    payment_code: code,
-                    payment_type: this.type
-                }
-                data['ids'] = (this.type == 1 || this.type == 5 || this.type == 6) ? this.orderId : this.uid
-                // 判断订单支付类型
-                if (this.type == 2 && this.recharge) {
-                    data['params'] = {
-                        money: this.recharge,
-                        trade_type: 'JSAPI'
-                    }
-                } else if ((this.type == 5 || this.type == 6) && this.recharge) {
-                    data['params'] = {
-                        trade_type: 'JSAPI',
-                    }
-                } else {
-                    data['params'] = {
-                        trade_type: 'JSAPI'
-                    }
-                }
-                let _this = this;
-                switch (code) {
-                    case 'alipay':
-                        this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                uni.requestPayment({
-                                    provider: 'alipay',
-                                    tradeNO: res.data.trade_no,
-                                    success: function (e) {
-                                        if (e.errMsg === 'requestPayment:ok') {
-                                            _this.$refs.uToast.show({
-                                                title: res.msg, type: 'success', callback: function () {
-                                                    _this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + res.data.paymentId });
-                                                }
-                                            })
-                                        }
-                                    },
-                                    fail: function (res) {
-                                        console.log(res);
-                                    }
-                                });
-                            } else {
-                                this.$u.toast(res.msg);
-                                this.popHide();
-                            }
-                        })
-                        break
-                    case 'balancepay':
-                        //用户余额支付
-                        this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + res.data.paymentId });
-                            } else {
-                                this.$u.toast(res.msg);
-                                this.popHide();
-                            }
-                        })
-                        break;
-                    case 'offline':
-                        //线下支付
-                        this.$common.modelShow('线下支付说明', '请联系客服进行线下支付', () => { }, false, '取消', '确定')
-                        break;
-                }
-
-            },
-            // 支付中显示隐藏
-            popHide() {
-                this.popShow = false
-            }
-        }
-
-    }
-</script>
-
-
-<style lang="scss">
-    .coreshop-avatar { background: #fff; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByApp.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByApp.vue
deleted file mode 100644
index f1b4a36c0702b2ba115feaa395d4c47c5aad484f..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByApp.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" />
-        <view v-for="item in payments" :key="item.code" @click="toPayHandler(item.code)" v-if="!(type == 2 && item.code == 'balancepay')">
-            <view class="u-reset-button coreshop-list menu-avatar  padding-xl radius shadow shadow-lg bg-blue margin-top">
-                <view class="coreshop-list-item">
-                    <view class="coreshop-avatar radius">
-                        <u-image width="68rpx" height="68rpx" :src="item.icon" :lazy-load="false" :fade="false" duration="0"></u-image>
-                    </view>
-                    <view class="content">
-                        <view class="coreshop-text-grey">{{ item.name }}</view>
-                        <view class="coreshop-text-gray u-font-sm flex u-text-left">
-                            <view class="u-line-1">
-                                {{ item.memo }}
-                            </view>
-                        </view>
-                    </view>
-                    <view class="action">
-                        <u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
-                    </view>
-                </view>
-            </view>
-        </view>
-
-        <view class="payment-pop" v-show="popShow">
-            <view class="payment-pop-c">
-                <image src="/static/images/payments/wait-pay.png" style="width: 30px;height: 30px;"></image>
-                <view class="text">支付中，请稍后...</view>
-            </view>
-            <view class="payment-pop-b">
-                <button class="coreshop-btn coreshop-btn-c" @click="popHide">支付失败</button>
-                <button class="coreshop-btn coreshop-btn-o" @click="popHide">支付成功</button>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        props: {
-            // 如果是商品订单此参数必须
-            orderId: {
-                type: String,
-                default() {
-                    return ''
-                }
-            },
-            // 如果是充值订单此参数必须
-            recharge: {
-                type: Number,
-                default() {
-                    return 0
-                }
-            },
-            // 用户id
-            uid: {
-                type: Number,
-                default() {
-                    return 0
-                }
-            },
-            // 订单类型
-            type: {
-                type: Number,
-                default() {
-                    return 1
-                }
-            }
-        },
-        data() {
-            return {
-                payments: [],
-                popShow: false
-            }
-        },
-        mounted() {
-
-            this.getPayments()
-        },
-        methods: {
-            // 获取可用支付方式列表
-            getPayments() {
-                this.$u.api.paymentList().then(res => {
-                    if (res.status) {
-                        this.payments = this.formatPayments(res.data)
-                    }
-                })
-            },
-            // 支付方式处理
-            formatPayments(payments) {
-                // 如果是充值订单 过滤余额支付 过滤非线上支付方式
-                if (this.type === 2) {
-                    payments = payments.filter(item => item.code !== 'balancepay' || item.isOnline === false)
-                }
-
-                // 设置logo图片
-                payments.forEach(item => {
-                    this.$set(item, 'icon', '/static/images/payments/' + item.code + '.png')
-                })
-                return payments
-            },
-            // 用户点击支付方式处理
-            toPayHandler(code) {
-                this.popShow = true;
-                let _this = this
-
-                let data = {
-                    payment_code: code,
-                    payment_type: _this.type
-                }
-
-                data['ids'] = (this.type == 1 || this.type == 5 || this.type == 6) ? this.orderId : this.uid
-                if ((this.type == 5 || this.type == 6) && this.recharge) {
-                    data['params'] = {
-                        trade_type: 'APP',
-                    }
-                }
-                switch (code) {
-                    case 'alipay':
-                        /**
-                         * 支付宝支付需要模拟GET提交数据
-                         */
-                        if (_this.type == 1 && _this.orderId) {
-                            data['params'] = {
-                                trade_type: 'APP'
-                            }
-                        } else if (_this.type == 2 && _this.recharge) {
-                            data['params'] = {
-                                trade_type: 'APP',
-                                money: _this.recharge
-                            }
-                        }
-
-                        _this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                uni.requestPayment({
-                                    provider: "alipay",
-                                    orderInfo: res.data.data,
-                                    success: function (data) {
-                                        _this.$refs.uToast.show({
-                                            title: '支付成功', type: 'success', callback: function () {
-                                                _this.redirectHandler(res.data.paymentId)
-                                            }
-                                        })
-                                    }
-                                });
-                            } else {
-                                _this.$comon.errorToShow(res.msg)
-                                _this.popHide();
-                            }
-                        })
-                        break
-                    case 'wechatpay':
-                        // 微信 H5支付
-                        if (_this.type == 1 && _this.orderId) {
-                            data['params'] = {
-                                trade_type: 'APP'
-                            }
-                        } else if (_this.type == 2 && _this.recharge) {
-                            data['params'] = {
-                                trade_type: 'APP',
-                                money: _this.recharge
-                            }
-                        }
-
-                        // 微信app支付
-                        _this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                //console.log(JSON.stringify(res));
-                                // 调用微信支付
-                                uni.requestPayment({
-                                    provider: "wxpay",
-                                    orderInfo: {
-                                        appid: res.data.appid,
-                                        noncestr: res.data.noncestr,
-                                        package: res.data.package,
-                                        partnerid: res.data.partnerid,
-                                        prepayid: res.data.prepayid,
-                                        timestamp: res.data.timestamp,
-                                        sign: res.data.sign,
-                                    },
-                                    success: function (data) {
-                                        _this.$refs.uToast.show({
-                                            title: '支付成功', type: 'success', callback: function () {
-                                                _this.redirectHandler(res.data.paymentId)
-                                            }
-                                        })
-                                    },
-                                    fail: function (res) {
-                                        console.log(res);
-                                    }
-                                });
-                            } else {
-                                _this.$u.toast(res.msg)
-                                _this.popHide();
-                            }
-                        })
-                        break
-                    case 'balancepay':
-                        /**
-                         *  用户余额支付
-                         *
-                         */
-                        _this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                _this.redirectHandler(res.data.paymentId)
-                            } else {
-                                _this.$u.toast(res.msg)
-                                _this.popHide();
-                            }
-                        })
-                        break
-                    case 'offline':
-                        /**
-                         * 线下支付
-                         */
-                        _this.$common.modelShow('线下支付说明', '请联系客服进行线下支付', () => { }, false, '取消', '确定')
-                        break
-                }
-            },
-            // 支付成功后跳转操作
-            redirectHandler(paymentId) {
-                this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + paymentId });
-            },
-            // 支付中显示隐藏
-            popHide() {
-                this.popShow = false
-            }
-        }
-
-    }
-</script>
-
-
-<style lang="scss">
-    .coreshop-avatar { background: #fff; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByH5.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByH5.vue
deleted file mode 100644
index 91b2fd09c8da4d3371337b9e87a14e038ae8bcd3..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByH5.vue
+++ /dev/null
@@ -1,334 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" />
-        <view v-for="item in payments" :key="item.code" @click="toPayHandler(item.code)" v-if="!(type == 2 && item.code == 'balancepay')">
-            <view class="u-reset-button coreshop-list menu-avatar  padding-xl radius shadow shadow-lg bg-blue margin-top">
-                <view class="coreshop-list-item">
-                    <view class="coreshop-avatar radius">
-                        <u-image width="68rpx" height="68rpx" :src="item.icon" :lazy-load="false" :fade="false" duration="0"></u-image>
-                    </view>
-                    <view class="content">
-                        <view class="coreshop-text-grey">{{ item.name }}</view>
-                        <view class="coreshop-text-gray u-font-sm flex u-text-left">
-                            <view class="u-line-1">
-                                {{ item.memo }}
-                            </view>
-                        </view>
-                    </view>
-                    <view class="action">
-                        <u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
-                    </view>
-                </view>
-            </view>
-        </view>
-
-        <view class="payment-pop" v-show="popShow">
-            <view class="payment-pop-c">
-                <image src="/static/images/payments/wait-pay.png" style="width: 30px;height: 30px;"></image>
-                <view class="text">支付中，请稍后...</view>
-            </view>
-            <view class="payment-pop-b">
-                <button class="coreshop-btn coreshop-btn-c" @click="popHide">支付失败</button>
-                <button class="coreshop-btn coreshop-btn-o" @click="popHide">支付成功</button>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        props: {
-            // 如果是商品订单此参数必须
-            orderId: {
-                type: String,
-                default() {
-                    return ''
-                }
-            },
-            // 如果是充值订单此参数必须
-            recharge: {
-                type: Number,
-                default() {
-                    return 0
-                }
-            },
-            // 用户id
-            uid: {
-                type: Number,
-                default() {
-                    return 0
-                }
-            },
-            // 订单类型
-            type: {
-                type: Number,
-                default() {
-                    return 1
-                }
-            }
-        },
-        data() {
-            return {
-                payments: [],
-                openid: '',
-                popShow: false
-            }
-        },
-        mounted() {
-            this.getPayments()
-        },
-        methods: {
-            // 获取可用支付方式列表
-            getPayments() {
-                this.$u.api.paymentList().then(res => {
-                    if (res.status) {
-                        this.payments = this.formatPayments(res.data)
-                    }
-                })
-            },
-            // 支付方式处理
-            formatPayments(payments) {
-                // h5支付并且是在微信浏览器内 过滤支付宝支付
-                if (this.$common.isWeiXinBrowser()) {
-                    payments = payments.filter(item => item.code !== 'alipay')
-                }
-
-                // 如果是充值订单 过滤余额支付 过滤非线上支付方式
-                if (this.type === 2) {
-                    payments = payments.filter(
-                        item => item.code !== 'balancepay' || item.is_online === 1
-                    )
-                }
-
-                // 设置logo图片
-                payments.forEach(item => {
-                    this.$set(item, 'icon', '/static/images/payments/' + item.code + '.png')
-                })
-
-                return payments
-            },
-            checkWXJSBridge(data) {
-                let that = this
-                let interval = setInterval(() => {
-                    if (typeof window.WeixinJSBridge != 'undefined') {
-                        clearTimeout(interval)
-                        that.onBridgeReady(data)
-                    }
-                }, 200)
-            },
-            onBridgeReady(data) {
-                var _this = this
-                window.WeixinJSBridge.invoke(
-                    'getBrandWCPayRequest', {
-                    appId: data.appid, // 公众号名称，由商户传入
-                    timeStamp: data.timeStamp, // 时间戳，自1970年以来的秒数
-                    nonceStr: data.nonceStr, // 随机串
-                    package: data.package,
-                    signType: data.signType, // 微信签名方式：
-                    paySign: data.paySign // 微信签名
-                },
-                    function (res) {
-                        if (res.err_msg === 'get_brand_wcpay_request:ok') {
-                            _this.$common.successToShow('支付成功')
-                        } else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
-                            _this.$u.toast('取消支付')
-                        } else {
-                            _this.$u.toast('支付失败')
-                        }
-                        setTimeout(() => {
-                            _this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + data.paymentId });
-                        }, 1000)
-                    }
-                )
-            },
-            // 用户点击支付方式处理
-            toPayHandler(code) {
-                this.popShow = true;
-                let data = {
-                    payment_code: code,
-                    payment_type: this.type
-                }
-                data['ids'] = (this.type == 1 || this.type == 5 || this.type == 6) ? this.orderId : this.uid
-                switch (code) {
-                    case 'alipay':
-                        /**
-                         * 支付宝支付需要模拟GET提交数据
-                         */
-                        if (this.type == 1 && this.orderId) {
-                            data['params'] = {
-                                trade_type: 'WAP',
-                                return_url: baseUrl +
-                                    'wap/pages/payment/result/result'
-                            }
-                        } else if (this.type == 2 && this.recharge) {
-                            data['params'] = {
-                                money: this.recharge,
-                                return_url: baseUrl + 'wap/pages/payment/result/result'
-                            }
-                        } else if ((this.type == 5 || this.type == 6) && this.recharge) {
-                            data['params'] = {
-                            }
-                        }
-
-                        this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                const url = res.data.url
-                                const data = res.data.data
-
-                                // 模拟GET提交
-                                let tempForm = document.createElement('form')
-                                tempForm.id = 'aliPay'
-                                tempForm.methods = 'post'
-                                tempForm.action = url
-                                tempForm.target = '_self'
-                                let input = []
-                                for (let k in data) {
-                                    input[k] = document.createElement('input')
-                                    input[k].type = 'hidden'
-                                    input[k].name = k
-                                    input[k].value = data[k]
-                                    tempForm.appendChild(input[k])
-                                }
-                                tempForm.addEventListener('submit', function () { }, false)
-                                document.body.appendChild(tempForm)
-                                tempForm.dispatchEvent(new Event('submit'))
-                                tempForm.submit()
-                                document.body.removeChild(tempForm)
-                            }
-                        })
-                        break
-                    case 'wechatpay':
-
-                        /**
-                         * 微信支付有两种
-                         * 判断是否在微信浏览器
-                         * 	微信jsapi支付
-                         */
-                        let isWeiXin = this.$common.isWeiXinBrowser()
-
-                        if (isWeiXin) {
-                            var transitUrl =
-                                baseUrl +
-                                'wap/pages/payment/waiting/waiting?order_id=' +
-                                this.orderId +
-                                '&type=' +
-                                this.type;
-
-                            if (this.type == 1 && this.orderId) {
-                                // 微信jsapi支付
-                                // if (this.openid) {
-                                //   data['params'] = {
-                                //     trade_type: 'JSAPI_OFFICIAL',
-                                //     openid: this.openid
-                                //   }
-                                // } else {
-                                //   data['params'] = {
-                                //     trade_type: 'JSAPI_OFFICIAL',
-                                //     url: window.location.href
-                                //   }
-                                // }
-                                data['params'] = {
-                                    trade_type: 'JSAPI_OFFICIAL',
-                                    url: transitUrl
-                                }
-                            } else if (this.type == 2 && this.recharge) {
-                                data['params'] = {
-                                    trade_type: 'JSAPI_OFFICIAL',
-                                    money: this.recharge,
-                                    url: transitUrl + '&uid=' + this.uid + '&money=' + this.recharge
-                                }
-                                // if (this.openid) {
-                                //   data['params'] = {
-                                //     money: this.recharge,
-                                //     openid: this.openid
-                                //   }
-                                // } else {
-                                //   data['params'] = {
-                                //     money: this.recharge,
-                                //     url: window.location.href
-                                //   }
-                                // }
-                            } else if ((this.type == 5 || this.type == 6) && this.recharge) {
-                                data['params'] = {
-                                }
-                            }
-                            this.$u.api.pay(data).then(res => {
-                                if (!res.status && res.data == '10066') {
-                                    window.location.href = res.msg
-                                    return;
-                                }
-                                const data = res.data
-                                this.checkWXJSBridge(data)
-                            })
-                        } else {
-                            // 微信 H5支付
-                            if (this.type == 1 && this.orderId) {
-                                data['params'] = {
-                                    trade_type: 'MWEB',
-                                    return_url: baseUrl +
-                                        'wap/pages/payment/result/result'
-                                }
-                            } else if (this.type == 2 && this.recharge) {
-                                data['params'] = {
-                                    trade_type: 'MWEB',
-                                    money: this.recharge,
-                                    return_url: baseUrl + 'wap/pages/payment/result/result'
-                                }
-                            } else if ((this.type == 5 || this.type == 6) && this.recharge) {
-                                data['params'] = {
-                                }
-                            }
-                            // 微信h5支付
-                            this.$u.api.pay(data).then(res => {
-                                if (res.status) {
-                                    location.href = res.data.mweb_url
-                                } else {
-                                    this.$u.toast(res.msg)
-                                    this.popHide();
-                                }
-                            })
-                        }
-                        break
-                    case 'balancepay':
-                        /**
-                         *  用户余额支付
-                         *
-                         */
-                        if ((this.type == 5 || this.type == 6) && this.recharge) {
-                            data['params'] = {
-                            }
-                        }
-                        this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + res.data.paymentId });
-                            } else {
-                                this.$u.toast(res.msg)
-                                this.popHide();
-                            }
-                        })
-                        break
-                    case 'offline':
-                        /**
-                         * 线下支付
-                         */
-                        this.$common.modelShow(
-                            '线下支付说明',
-                            '请联系客服进行线下支付',
-                            () => { },
-                            false,
-                            '取消',
-                            '确定'
-                        )
-                        break
-                }
-            },
-            // 支付中显示隐藏
-            popHide() {
-                this.popShow = false
-            }
-        }
-    }
-</script>
-<style lang="scss">
-    .coreshop-avatar { background: #fff; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByTt.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByTt.vue
deleted file mode 100644
index 27a6d7161ae65222bf93041d7670afd62c7696fd..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByTt.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" />
-        <form v-for="item in payments" :key="item.code" @submit="toPayHandler" report-submit="true" v-if="!(type == 2 && item.code == 'balancepay')">
-            <input name="code" :value="item.code" class="hide">
-            <button class="u-reset-button coreshop-list menu-avatar  padding-xl radius shadow shadow-lg bg-blue margin-top" form-type="submit">
-                <view class="coreshop-list-item">
-                    <view class="coreshop-avatar radius">
-                        <u-image width="68rpx" height="68rpx" :src="item.icon" :lazy-load="false" :fade="false" duration="0"></u-image>
-                    </view>
-                    <view class="content">
-                        <view class="coreshop-text-grey">{{ item.name }}</view>
-                        <view class="coreshop-text-gray u-font-sm flex u-text-left">
-                            <view class="u-line-1">
-                                {{ item.memo }}
-                            </view>
-                        </view>
-                    </view>
-                    <view class="action">
-                        <u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
-                    </view>
-                </view>
-            </button>
-        </form>
-
-        <view class="payment-pop" v-show="popShow">
-            <view class="payment-pop-c">
-                <image src="/static/images/payments/wait-pay.png"></image>
-                <view class="text">支付中，请稍后...</view>
-            </view>
-            <view class="payment-pop-b">
-                <button class="coreshop-btn coreshop-btn-c" @click="popHide">支付失败</button>
-                <button class="coreshop-btn coreshop-btn-o" @click="popHide">支付成功</button>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        props: {
-            // 如果是商品订单此参数必须
-            orderId: {
-                type: String,
-                default() {
-                    return ''
-                }
-            },
-            // 如果是充值订单此参数必须
-            recharge: {
-                type: Number,
-                default() {
-                    return 0
-                }
-            },
-            // 用户id
-            uid: {
-                type: Number,
-                default() {
-                    return 0
-                }
-            },
-            // 订单类型
-            type: {
-                type: Number,
-                default() {
-                    return 1
-                }
-            }
-        },
-        data() {
-            return {
-                payments: [],
-                popShow: false
-            }
-        },
-        mounted() {
-            this.getPayments()
-        },
-        methods: {
-            // 获取可用支付方式列表
-            getPayments() {
-                this.$u.api.paymentList().then(res => {
-                    if (res.status) {
-                        this.payments = this.formatPayments(res.data)
-                    }
-                })
-            },
-            // 支付方式处理
-            formatPayments(payments) {
-                // 如果是充值订单 过滤余额支付 过滤非线上支付方式
-                if (this.type === 2) {
-                    payments = payments.filter(item => item.code !== 'balancepay' || item.isOnline === false)
-                }
-
-                // 设置logo图片
-                payments.forEach(item => {
-                    this.$set(item, 'icon', '/static/images/payments/' + item.code + '.png')
-                })
-
-                return payments
-            },
-            // 用户点击支付方式处理
-            toPayHandler(e) {
-                this.popShow = true;
-                let code = e.target.value.code;
-
-                let data = {
-                    payment_code: code,
-                    payment_type: this.type,
-                    params: {
-                        trade_type: 'TT'
-                    }
-                }
-                data['ids'] = (this.type == 1 || this.type == 5 || this.type == 6) ? this.orderId : this.uid
-
-                // 判断订单支付类型
-                if (this.type == 2 && this.recharge) {
-                    data['params']['money'] = this.recharge;
-                } else if ((this.type == 5 || this.type == 6) && this.recharge) {
-                }
-                let _this = this
-                switch (code) {
-                    case 'wechatpay':
-                        this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                uni.pay({
-                                    provider: 'wxpay',
-                                    orderInfo: res.data.tt_order_info,
-                                    service: 1,
-                                    getOrderStatus: function (es) {
-
-                                    },
-                                    success: function (e) {
-                                        if (e.code == 0) {
-                                            _this.$refs.uToast.show({
-                                                title: '支付成功', type: 'success', callback: function () {
-                                                    _this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + res.data.paymentId });
-                                                }
-                                            })
-                                        } else if (e.code == 1) {
-                                            _this.$u.toast('支付超时');
-                                            _this.popHide();
-                                        } else if (e.code == 2) {
-                                            _this.$u.toast('支付失败');
-                                            _this.popHide();
-                                        } else if (e.code == 3) {
-                                            _this.$u.toast('支付关闭');
-                                            _this.popHide();
-                                        } else if (e.code == 9) {
-                                            _this.$u.toast('支付异常，请联系客服处理。');
-                                            _this.popHide();
-                                        }
-                                    },
-                                    fail: function (res) {
-                                        console.log(res);
-                                    }
-                                });
-                            } else {
-                                this.$u.toast(res.msg);
-                            }
-                        })
-                        break
-                    case 'alipay':
-                        this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                uni.pay({
-                                    provider: 'alipay',
-                                    orderInfo: res.data.tt_order_info,
-                                    service: 1,
-                                    getOrderStatus: function (es) {
-
-                                    },
-                                    success: function (e) {
-                                        if (e.code == 0) {
-                                            _this.$refs.uToast.show({
-                                                title: '支付成功', type: 'success', callback: function () {
-                                                    _this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + res.data.paymentId });
-                                                }
-                                            })
-                                        } else if (e.code == 1) {
-                                            _this.$u.toast('支付超时');
-                                        } else if (e.code == 2) {
-                                            _this.$u.toast('支付失败');
-                                        } else if (e.code == 3) {
-                                            _this.$u.toast('支付关闭');
-                                        } else if (e.code == 9) {
-                                            _this.$u.toast('支付异常，请联系客服处理。');
-                                        }
-                                    }
-                                });
-                            } else {
-                                this.$u.toast(res.msg);
-                                _this.popHide();
-                            }
-                        })
-                        break
-                    case 'balancepay':
-                        /**
-                         *  用户余额支付
-                         *
-                         */
-                        this.$u.api.pay(data).then(res => {
-                            if (res.status) {
-                                this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + res.data.paymentId });
-                            } else {
-                                this.$u.toast(res.msg);
-                                _this.popHide();
-                            }
-                        })
-                        break
-                    case 'offline':
-                        /**
-                         * 线下支付
-                         */
-                        this.$common.modelShow('线下支付说明', '请联系客服进行线下支付', () => { }, false, '取消', '确定')
-                        break
-                }
-
-            },
-            // 支付中显示隐藏
-            popHide() {
-                this.popShow = false
-            }
-        }
-
-    }
-</script>
-
-<style lang="scss">
-    .coreshop-avatar { background: #fff; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByAli.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByAli.vue
deleted file mode 100644
index ed2459608876c3892aaca7efd037a2d35e6b3224..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByAli.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-    <view class="coreshop-share-Box">
-        <u-toast ref="uToast" />
-        <view class="coreshop-share-pop">
-            <view class="coreshop-share-item">
-                <button class="coreshop-btn" open-type="share">
-                    <u-icon label="分享给好友" label-pos="bottom" size="80" name="/static/images/common/share-friend.png"></u-icon>
-                </button>
-            </view>
-            <view class="coreshop-share-item">
-                <button class="coreshop-btn" @click="createPoster()">
-                    <u-icon label="生成海报" label-pos="bottom" size="80" name="/static/images/common/share-poster.png"></u-icon>
-                </button>
-            </view>
-        </view>
-        <view class="coreshop-bottomBox">
-            <button class="coreshop-btn coreshop-btn-w coreshop-btn-square" @click="close()">关闭</button>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        props: {
-            // 商品id
-            goodsId: {
-                type: Number,
-                default: 0
-            },
-            // 分享的图片
-            shareImg: {
-                type: String,
-                default: ''
-            },
-            // 分享标题
-            shareTitle: {
-                type: String,
-                default: ''
-            },
-            // 分享内容
-            shareContent: {
-                type: String,
-                default: ''
-            },
-            // 分享链接
-            shareHref: {
-                type: String,
-                default: ''
-            },
-            //分享类型
-            shareType: {
-                type: Number,
-                default: 1
-            },
-            //拼团id
-            groupId: {
-                type: Number,
-                default: 0
-            },
-            //拼团的团队id
-            teamId: {
-                type: Number,
-                default: 0
-            }
-        },
-        data() {
-            return {
-                providerList: [] // 分享通道 包含生成海报
-            }
-        },
-        mounted() {
-
-        },
-        methods: {
-            // 关闭弹出层
-            close() {
-                this.$emit('close')
-            },
-            // 生成海报
-            createPoster() {
-                let data = {};
-                if (this.shareType == 1) {
-                    //商品
-                    data = {
-                        page: 2, //商品
-                        url: '/pages/share/jump/jump',
-                        params: {
-                            goodsId: this.goodsId
-                        },
-                        type: 3,//海报
-                        client: 6
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                } else if (this.shareType == 3) {
-                    //拼团
-                    data = {
-                        page: 3, //商品
-                        url: '/pages/share/jump/jump',
-                        params: {
-                            goodsId: this.goodsId,
-                            groupId: this.groupId,
-                            teamId: this.teamId
-                        },
-                        type: 3,//海报
-                        client: 6
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                }
-                this.$u.api.share(data).then(res => {
-                    if (res.status) {
-                        this.close()
-                        this.$u.route('/pages/share/sharePoster/sharePoster?poster=' + encodeURIComponent(res.data))
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                });
-            },
-            // 分享操作
-            async share(e) {
-
-            }
-        }
-    }
-</script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByApp.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByApp.vue
deleted file mode 100644
index 9224587b94f7617be42beb5e020350e9cf8a7bfc..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByApp.vue
+++ /dev/null
@@ -1,265 +0,0 @@
-<template>
-    <view class="coreshop-share-Box">
-        <u-toast ref="uToast" />
-        <view class="coreshop-share-pop">
-            <view class="coreshop-share-item"
-                  v-for="(item, index) in providerList"
-                  :key="index"
-                  @click="clickHandler(item)">
-                <image :src="item.img" mode=""></image>
-                <view class="">{{ item.name }}</view>
-            </view>
-        </view>
-        <view class="coreshop-bottomBox">
-            <button class="coreshop-btn coreshop-btn-w coreshop-btn-square" @click="close()">关闭</button>
-        </view>
-    </view>
-</template>
-
-<script>
-    import { h5Url } from '@/common/setting/constVarsHelper.js'
-    export default {
-        props: {
-            // 商品id
-            goodsId: {
-                type: Number,
-                default: 0
-            },
-            // 分享的图片
-            shareImg: {
-                type: String,
-                default: ''
-            },
-            // 分享标题
-            shareTitle: {
-                type: String,
-                default: ''
-            },
-            // 分享内容
-            shareContent: {
-                type: String,
-                default: ''
-            },
-            // 分享链接
-            shareHref: {
-                type: String,
-                default: ''
-            },
-            //分享类型
-            shareType: {
-                type: Number,
-                default: 1
-            },
-            //拼团id
-            groupId: {
-                type: Number,
-                default: 0
-            },
-            //拼团的团队id
-            teamId: {
-                type: Number,
-                default: 0
-            }
-        },
-        data() {
-            return {
-                providerList: [] // 分享通道 包含生成海报
-            }
-        },
-        mounted() {
-            /**
-             *
-             *  H5+ 获取分享通道
-             *
-             */
-            uni.getProvider({
-                service: 'share',
-                success: (e) => {
-                    let data = []
-                    for (let i = 0; i < e.provider.length; i++) {
-                        switch (e.provider[i]) {
-                            case 'weixin':
-                                data.push({
-                                    name: '分享到微信好友',
-                                    cate: 'share',
-                                    id: 'weixin',
-                                    img: '/static/images/ic-wechat.png',
-                                    sort: 0
-                                })
-                                data.push({
-                                    name: '分享到微信朋友圈',
-                                    cate: 'share',
-                                    id: 'weixin',
-                                    type: 'WXSenceTimeline',
-                                    img: '/static/images/circle-of-friends.png',
-                                    sort: 1
-                                })
-                                break;
-                            case 'qq':
-                                data.push({
-                                    name: '分享到QQ',
-                                    cate: 'share',
-                                    id: 'qq',
-                                    img: '/static/images/qq.png',
-                                    sort: 3
-                                })
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-
-                    data.push({
-                        name: '生成海报',
-                        cate: 'poster',
-                        id: 'poster',
-                        img: '/static/images/poster.png',
-                        sort: 5
-                    })
-                    this.providerList = data.sort((x, y) => {
-                        return x.sort - y.sort
-                    });
-                },
-                fail: (e) => {
-                    // console.log('获取分享通道失败', e)
-                }
-            });
-        },
-        methods: {
-            // 关闭弹出层
-            close() {
-                this.$emit('close')
-            },
-            // 点击操作
-            clickHandler(e) {
-                if (e.cate === 'poster') {
-                    this.createPoster()
-                } else {
-                    // 去分享
-                    this.share(e)
-                }
-            },
-            // 生成海报
-            createPoster() {
-                let data = {};
-                if (this.shareType == 1) {
-                    //商品
-                    data = {
-                        page: 2, //商品
-                        url: 'pages/share/jump/jump',
-                        params: {
-                            goodsId: this.goodsId
-                        },
-                        type: 3,//海报
-                        client: 2
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                } else if (this.shareType == 3) {
-                    //拼团
-                    data = {
-                        page: 3, //商品
-                        url: 'pages/share/jump/jump',
-                        params: {
-                            goodsId: this.goodsId,
-                            groupId: this.groupId,
-                            teamId: this.teamId
-                        },
-                        type: 3,//海报
-                        client: 2
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                }
-                this.$u.api.share(data).then(res => {
-                    if (res.status) {
-                        this.close()
-                        this.$u.route('/pages/share/sharePoster/sharePoster?poster=' + encodeURIComponent(res.data))
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                });
-            },
-            // 分享操作
-            async share(e) {
-                let shareOPtions = {
-                    provider: e.id,
-                    scene: e.type && e.type === 'WXSenceTimeline' ? 'WXSenceTimeline' : 'WXSceneSession', //WXSceneSession”分享到聊天界面，“WXSenceTimeline”分享到朋友圈，“WXSceneFavorite”分享到微信收藏
-                    type: this.shareType,
-                    success: (e) => {
-                        uni.showModal({
-                            content: '分享成功',
-                            showCancel: false
-                        })
-                    },
-                    fail: (e) => {
-                        uni.showModal({
-                            content: e.errMsg,
-                            showCancel: false
-                        })
-                    },
-                    complete: function () {
-                        // console.log('分享操作结束!')
-                    }
-                }
-                shareOPtions.summary = this.shareContent ? this.shareContent : ''
-                shareOPtions.imageUrl = this.shareImg ? this.shareImg : ''
-                shareOPtions.title = this.shareTitle ? this.shareTitle : ''
-                shareOPtions.href = this.shareHref ? this.shareHref : ''
-
-                if (shareOPtions.type === 0 && plus.os.name === 'iOS') {//如果是图文分享，且是ios平台，则压缩图片
-                    shareOPtions.imageUrl = await this.compress()
-                }
-                if (shareOPtions.type === 1 && shareOPtions.provider === 'qq') {//如果是分享文字到qq，则必须加上href和title
-                    shareOPtions.href = this.shareHref
-                    shareOPtions.title = this.shareTitle
-                }
-                uni.share(shareOPtions);
-            },
-            // 压缩图片 图文分享要求分享图片大小不能超过20Kb
-            compress() {
-                // console.log('开始压缩');
-                let img = this.shareImg;
-                return new Promise((res) => {
-                    var localPath = plus.io.convertAbsoluteFileSystem(img.replace('file://', ''));
-                    // console.log('after' + localPath);
-                    // 压缩size
-                    plus.io.resolveLocalFileSystemURL(localPath, (entry) => {
-                        entry.file((file) => {// 可通过entry对象操作图片
-                            // console.log('getFile:' + JSON.stringify(file));
-                            if (file.size > 20480) {// 压缩后size 大于20Kb
-                                plus.zip.compressImage({
-                                    src: img,
-                                    dst: img.replace('.jpg', '2222.jpg').replace('.JPG', '2222.JPG'),
-                                    width: '10%',
-                                    height: '10%',
-                                    quality: 1,
-                                    overwrite: true
-                                }, (event) => {
-                                    // console.log('success zip****' + event.size);
-                                    let newImg = img.replace('.jpg', '2222.jpg').replace('.JPG', '2222.JPG');
-                                    res(newImg);
-                                }, function (error) {
-                                    uni.showModal({
-                                        content: '分享图片太大,需要请重新选择图片!',
-                                        showCancel: false
-                                    })
-                                });
-                            }
-                        });
-                    }, (e) => {
-                        // console.log('Resolve file URL failed: ' + e.message);
-                        uni.showModal({
-                            content: '分享图片太大,需要请重新选择图片!',
-                            showCancel: false
-                        })
-                    });
-                })
-            }
-        }
-    }
-</script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByTt.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByTt.vue
deleted file mode 100644
index 7776108f57337c5d532edd882a29d81610ea7022..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByTt.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-    <view class="coreshop-share-Box">
-        <u-toast ref="uToast" />
-        <view class="coreshop-share-pop">
-            <view class="coreshop-share-item">
-                 <button class="coreshop-btn" @click="createPoster()">
-                    <u-icon label="生成海报" label-pos="bottom" size="80" name="/static/images/common/share-poster.png"></u-icon>
-                </button>
-            </view>
-        </view>
-        <view class="coreshop-bottomBox">
-            <button class="coreshop-btn coreshop-btn-w coreshop-btn-square" @click="close()">关闭</button>
-        </view>
-    </view>
-</template>
-
-<script>
-    // #ifdef MP-TOUTIAO
-    import { ttPlatform } from '@/common/setting/constVarsHelper.js'
-    // #endif
-    export default {
-        props: {
-            // 商品id
-            goodsId: {
-                type: Number,
-                default: 0
-            },
-            // 分享的图片
-            shareImg: {
-                type: String,
-                default: ''
-            },
-            // 分享标题
-            shareTitle: {
-                type: String,
-                default: ''
-            },
-            // 分享内容
-            shareContent: {
-                type: String,
-                default: ''
-            },
-            // 分享链接
-            shareHref: {
-                type: String,
-                default: ''
-            },
-            //分享类型
-            shareType: {
-                type: Number,
-                default: 1
-            },
-            //拼团id
-            groupId: {
-                type: Number,
-                default: 0
-            },
-            //拼团的团队id
-            teamId: {
-                type: Number,
-                default: 0
-            }
-        },
-        data() {
-            return {
-                providerList: [] // 分享通道 包含生成海报
-            }
-        },
-        mounted() {
-
-        },
-        methods: {
-            // 关闭弹出层
-            close() {
-                this.$emit('close')
-            },
-            // 生成海报
-            createPoster() {
-                let data = {};
-                if (this.shareType == 1) {
-                    //商品
-                    data = {
-                        page: 2, //商品
-                        url: 'pages/share/jump/jump',
-                        params: {
-                            goodsId: this.goodsId
-                        },
-                        type: 3,//海报
-                        client: 4
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                } else if (this.shareType == 3) {
-                    //拼团
-                    data = {
-                        page: 3, //商品
-                        url: 'pages/share/jump/jump',
-                        params: {
-                            goodsId: this.goodsId,
-                            groupId: this.groupId,
-                            teamId: this.teamId
-                        },
-                        type: 3,//海报
-                        client: 4
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                }
-                this.$u.api.share(data).then(res => {
-                    if (res.status) {
-                        this.close()
-                        this.$u.route('/pages/share/sharePoster/sharePoster?poster=' + encodeURIComponent(res.data))
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                });
-            }
-        }
-    }
-</script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByh5.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByh5.vue
deleted file mode 100644
index 3b68043e3bd9402ed2fedff18b4c629f65e8323c..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByh5.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-    <view class="coreshop-share-Box">
-        <u-toast ref="uToast" />
-        <view class="coreshop-share-pop">
-            <view class="coreshop-share-item" @click="copyUrl()" v-show="!ifwx">
-                <button class="coreshop-btn">
-                    <u-icon label="复制链接" label-pos="bottom" size="80" name="/static/images/common/share-friend.png"></u-icon>
-                </button>
-            </view>
-            <view class="coreshop-share-item" @click="createPoster()">
-                <button class="coreshop-btn">
-                    <u-icon label="生成海报" label-pos="bottom" size="80" name="/static/images/common/share-poster.png"></u-icon>
-                </button>
-            </view>
-        </view>
-        <view class="coreshop-bottomBox">
-            <button class="coreshop-btn coreshop-btn-w coreshop-btn-square" @click="close()">关闭</button>
-        </view>
-    </view>
-</template>
-
-<script>
-    import { h5Url } from '@/common/setting/constVarsHelper.js'
-    export default {
-        props: {
-            // 商品id
-            goodsId: {
-                type: Number,
-                default: 0
-            },
-            // 分享的图片
-            shareImg: {
-                type: String,
-                default: ''
-            },
-            // 分享标题
-            shareTitle: {
-                type: String,
-                default: ''
-            },
-            // 分享内容
-            shareContent: {
-                type: String,
-                default: ''
-            },
-            // 分享链接
-            shareHref: {
-                type: String,
-                default: ''
-            },
-            //分享类型
-            shareType: {
-                type: Number,
-                default: 1
-            },
-            //拼团id
-            groupId: {
-                type: Number,
-                default: 0
-            },
-            //拼团的团队id
-            teamId: {
-                type: Number,
-                default: 0
-            },
-            ifwx: {
-                type: Boolean
-            }
-        },
-        mounted() {
-            /**
-             *
-             * H5端分享两种 (微信浏览器内引导用户去分享, 其他浏览器)
-             *
-             */
-        },
-        methods: {
-            // 关闭弹出层
-            close() {
-                this.$emit('close')
-            },
-            // 生成海报
-            createPoster() {
-                let data = {};
-                if (this.shareType == 1) {
-                    //商品
-                    data = {
-                        page: 2, //商品
-                        url: h5Url + 'pages/share/jump/jump',
-                        params: {
-                            goodsId: this.goodsId
-                        },
-                        type: 3,//海报
-                        client: 1
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                } else if (this.shareType == 3) {
-                    //拼团
-                    data = {
-                        page: 3, //商品
-                        url: h5Url + 'pages/share/jump/jump',
-                        params: {
-                            goodsId: this.goodsId,
-                            groupId: this.groupId,
-                            teamId: this.teamId
-                        },
-                        type: 3,//海报
-                        client: 1
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                }
-                this.$u.api.share(data).then(res => {
-                    if (res.status) {
-                        this.close()
-                        this.$u.route('/pages/share/sharePoster/sharePoster?poster=' + encodeURIComponent(res.data))
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                });
-            },
-            copyUrl() {
-                let data = {};
-                if (this.shareType == 1) {
-                    data = {
-                        page: 2, //商品
-                        url: h5Url + 'pages/share/jump/jump',
-                        params: {
-                            goodsId: this.goodsId
-                        },
-                        type: 1,//URL
-                        client: 1
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                } else if (this.shareType == 3) {
-                    data = {
-                        page: 3, //拼团
-                        url: h5Url + 'pages/share/jump/jump',
-                        params: {
-                            goodsId: this.goodsId,
-                            groupId: this.groupId,
-                            teamId: this.teamId
-                        },
-                        type: 1,//URL
-                        client: 1
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                }
-                let _this = this;
-                _this.$u.api.share(data).then(res => {
-                    if (res.status) {
-                        uni.setClipboardData({
-                            data: res.data,
-                            success: function (data) {
-                                _this.$refs.uToast.show({ title: '复制成功', type: 'success' })
-                            },
-                            fail: function (err) {
-                                _this.$u.toast('复制分享URL失败');
-                            }
-                        })
-                    } else {
-                        _this.$u.toast('复制分享URL失败');
-                    }
-                });
-            },
-            // 分享操作
-            share() {
-                // h5分享 判断是否是微信浏览器 引导用户完成分享操作
-
-                // 其他浏览器的分享
-            }
-        }
-    }
-</script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/main.js b/CoreCms.Net.Uni-App/CoreShop/main.js
index 7bef6ec8931e71f0391b1d32acfef0398b760ccd..0c4cb4aabfbada5f26b99bd073b7ae68bc64e277 100644
--- a/CoreCms.Net.Uni-App/CoreShop/main.js
+++ b/CoreCms.Net.Uni-App/CoreShop/main.js
@@ -23,6 +23,15 @@ Vue.use(uView);
 let mpShare = require('@/uview-ui/libs/mixin/mpShare.js');
 Vue.mixin(mpShare)
 
+//全局引用常量配置文件,用于template内代码使用
+Vue.mixin({
+    data() {
+        return {
+            $globalConstVars: GlobalConstVars
+        }
+    }
+})
+
 Vue.config.productionTip = false
 Vue.prototype.$upload = Upload;
 Vue.prototype.$common = Common;
diff --git a/CoreCms.Net.Uni-App/CoreShop/manifest.json b/CoreCms.Net.Uni-App/CoreShop/manifest.json
index d3a60f7730714147efcc15c3e71fe1a6aa33cc2b..4fe48522ef5942a41c26acf3895846db50f819e4 100644
--- a/CoreCms.Net.Uni-App/CoreShop/manifest.json
+++ b/CoreCms.Net.Uni-App/CoreShop/manifest.json
@@ -102,7 +102,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx11d95cdaee6058f6",
+        "appid" : "wx6fc139d4de0b470f",
         "setting" : {
             "urlCheck" : true,
             "postcss" : true,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json
index ed355c426107248b73070f0a06009357d3f33f2b..9c95269cc3c9bdb88070a64d814b9000367c28e5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages.json
+++ b/CoreCms.Net.Uni-App/CoreShop/pages.json
@@ -47,13 +47,6 @@
         "navigationBarTitleText": "会员中心"
       }
     },
-    {
-      "path": "pages/search/search",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "搜索"
-      }
-    },
     {
       "path": "pages/category/index/index",
       "style": {
@@ -67,201 +60,270 @@
         "navigationBarTextStyle": "black",
         "navigationBarTitleText": "商品列表"
       }
-    },
-    {
-      "path": "pages/goods/goodDetails/goodDetails",
-      "style": {
-        "navigationBarTextStyle": "black",
-        // #ifdef H5
-        "titleNView": false,
-        // #endif
-        "navigationBarTitleText": "商品详情",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/placeOrder/index/index",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "提交订单"
-      }
-    },
-    {
-      "path": "pages/placeOrder/invoice/invoice",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "发票"
-      }
-    },
-    {
-      "path": "pages/placeOrder/storeList/storeList",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "门店列表"
-      }
-    },
-    {
-      "path": "pages/payment/pay/pay",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "支付"
-      }
-    },
-    {
-      "path": "pages/payment/waiting/waiting",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "等待支付"
-      }
-    },
-    {
-      "path": "pages/payment/result/result",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "支付结果"
-      }
-    },
-
-    {
-      "path": "pages/article/details/details",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "文章详情"
-      }
-    },
-    {
-      "path": "pages/article/list/list",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "文章列表"
-      }
-    },
-    {
-      "path": "pages/login/loginBySMS/loginBySMS",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "授权登录"
-      }
-    },
-    {
-      "path": "pages/share/sharePoster/sharePoster",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "分享"
-      }
-    },
-    {
-      "path": "pages/activity/pinTuan/list/list",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "拼团列表"
-      }
-    },
+    }
+  ],
+  "subpackages": [
     {
-      "path": "pages/activity/pinTuan/details/details",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "拼团详情"
-      }
+      "root": "pages/share",
+      "name": "share",
+      "pages": [
+        {
+          "path": "sharePoster/sharePoster",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "分享"
+          }
+        },
+        {
+          "path": "jump/jump",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "加载中..."
+          }
+        }
+      ]
     },
     {
-      "path": "pages/activity/seckill/list/list",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "秒杀列表"
-      }
+      "root": "pages/serviceGoods",
+      "name": "serviceGoods",
+      "pages": [
+        {
+          "path": "index/index",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "服务商品列表"
+          }
+        },
+        {
+          "path": "details/details",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "服务商品详情"
+          }
+        }
+      ]
     },
     {
-      "path": "pages/activity/seckill/details/details",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "秒杀详情"
-      }
+      "root": "pages/map",
+      "name": "map",
+      "pages": [
+        {
+          "path": "map",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "地图展示"
+          }
+        }
+      ]
     },
     {
-      "path": "pages/activity/groupBuying/list/list",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "团购列表"
-      }
+      "root": "pages/reward",
+      "name": "reward",
+      "pages": [
+        {
+          "path": "reward",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "打赏"
+          }
+        }
+      ]
     },
     {
-      "path": "pages/activity/groupBuying/details/details",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "团购详情"
-      }
+      "root": "pages/search",
+      "name": "search",
+      "pages": [
+        {
+          "path": "search",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "搜索"
+          }
+        }
+      ]
     },
     {
-      "path": "pages/form/details/details",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "万能表单"
-      }
+      "root": "pages/placeOrder",
+      "name": "placeOrder",
+      "pages": [
+        {
+          "path": "index/index",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "提交订单"
+          }
+        },
+        {
+          "path": "invoice/invoice",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "发票"
+          }
+        },
+        {
+          "path": "storeList/storeList",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "门店列表"
+          }
+        }
+      ]
     },
-
     {
-      "path": "pages/share/jump/jump",
-      "style": {
-        "navigationBarTextStyle": "black",
-        // #ifdef H5
-        "titleNView": false,
-        // #endif
-        "navigationBarTitleText": "加载中..."
-      }
+      "root": "pages/payment",
+      "name": "payment",
+      "pages": [
+        {
+          "path": "pay/pay",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "支付"
+          }
+        },
+        {
+          "path": "waiting/waiting",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "等待支付"
+          }
+        },
+        {
+          "path": "result/result",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "支付结果"
+          }
+        }
+      ]
     },
     {
-      "path": "pages/storeMap/storeMap",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "门店列表"
-      }
+      "root": "pages/storeMap",
+      "name": "storeMap",
+      "pages": [
+        {
+          "path": "storeMap",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "门店列表"
+          }
+        }
+      ]
     },
-
     {
-      "path": "pages/serviceGoods/index/index",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "服务商品列表"
-      }
+      "root": "pages/goods",
+      "name": "goods",
+      "pages": [
+        {
+          "path": "goodDetails/goodDetails",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "商品详情",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "goodComments/goodComments",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "商品评论"
+          }
+        }
+      ]
     },
     {
-      "path": "pages/serviceGoods/details/details",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "服务商品详情"
-      }
+      "root": "pages/form",
+      "name": "form",
+      "pages": [
+        {
+          "path": "details/details",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "万能表单"
+          }
+        }
+      ]
     },
     {
-      "path": "pages/coupon/coupon",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "优惠券列表"
-      }
+      "root": "pages/coupon",
+      "name": "coupon",
+      "pages": [
+        {
+          "path": "coupon",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "优惠券列表"
+          }
+        }
+      ]
     },
     {
-      "path": "pages/map/map",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "地图展示"
-      }
+      "root": "pages/article",
+      "name": "article",
+      "pages": [
+        {
+          "path": "details/details",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "文章详情"
+          }
+        },
+        {
+          "path": "list/list",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "文章列表"
+          }
+        }
+      ]
     },
     {
-      "path": "pages/goods/goodComments/goodComments",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "商品评论"
-      }
+      "root": "pages/activity",
+      "name": "template",
+      "pages": [
+        {
+          "path": "pinTuan/list/list",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "拼团列表"
+          }
+        },
+        {
+          "path": "pinTuan/details/details",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "拼团详情"
+          }
+        },
+        {
+          "path": "seckill/list/list",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "秒杀列表"
+          }
+        },
+        {
+          "path": "seckill/details/details",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "秒杀详情"
+          }
+        },
+        {
+          "path": "groupBuying/list/list",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "团购列表"
+          }
+        },
+        {
+          "path": "groupBuying/details/details",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "团购详情"
+          }
+        }
+      ]
     },
-    {
-      "path": "pages/reward/reward",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "打赏"
-      }
-    }
-  ],
-  "subpackages": [
     {
       "root": "pages/member",
       "name": "member",
@@ -741,7 +803,6 @@
       },
       {
         "pagePath": "pages/index/member/member",
-        //"pagePath": "pages/login/loginByAccount/loginByAccount",
         "text": "我的",
         "iconPath": "static/images/indexMenus/index04.png",
         "selectedIconPath": "static/images/indexMenus/index04_1.png"
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue
index 07740be2b5e1de21ebcda6319c995dad6d7f69ab..c4f88a9c268730a89cec1aa8ddc23d0ebfacf965 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue
@@ -148,21 +148,7 @@
         <!-- 分享弹窗 -->
         <view class="u-padding-10">
             <u-popup  mode="bottom" v-model="shareBox" ref="share">
-                <!-- #ifdef H5 -->
-                <shareByH5 :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByH5>
-                <!-- #endif -->
-                <!-- #ifdef MP-WEIXIN -->
                 <shareByWx :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByWx>
-                <!-- #endif -->
-                <!-- #ifdef MP-ALIPAY -->
-                <shareByAli :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByAli>
-                <!-- #endif -->
-                <!-- #ifdef MP-TOUTIAO -->
-                <shareByTt :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByTt>
-                <!-- #endif -->
-                <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-                <shareByApp :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByApp>
-                <!-- #endif -->
             </u-popup>
         </view>
 
@@ -342,18 +328,11 @@
         <view class="coreshop-good-footer-fixed">
             <view class="tabbar">
                  <!-- 客服按钮 -->
-                <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-                <view class="action"  @click="showChat()">
-                    <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
-                </view>
-                <!-- #endif -->
-                <!-- #ifdef MP-WEIXIN -->
                 <view class="action" >
                     <button open-type="contact" bindcontact="showChat" class="noButtonStyle">
                         <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
                     </button>   
                 </view>
-                <!-- #endif -->
                 <view class="action"  @click="collection">
                     <u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom"></u-icon>
                 </view>
@@ -380,42 +359,14 @@
     import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js'
     import coreshopNavbarSlot from '@/components/coreshop-navbar-slot/coreshop-navbar-slot.vue';
     import spec from '@/components/coreshop-spec/coreshop-spec.vue';
-    // #ifdef H5
-    import shareByH5 from '@/components/coreshop-share/shareByh5.vue';
-    // #endif
-    // #ifdef MP-WEIXIN
     import shareByWx from '@/components/coreshop-share/shareByWx.vue';
-    // #endif
-    // #ifdef MP-TOUTIAO
-    import shareByTt from '@/components/coreshop-share/shareByTt.vue';
-    // #endif
-    // #ifdef MP-ALIPAY
-    import shareByAli from '@/components/coreshop-share/shareByAli.vue';
-    // #endif
-    // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import shareByApp from '@/components/coreshop-share/shareByApp.vue';
-    // #endif
     export default {
         mixins: [goods, articles, commonUse, tools],
         components: {
             coreshopFab,
             coreshopNavbarSlot,
             spec,
-            // #ifdef H5
-            shareByH5,
-            // #endif
-            // #ifdef MP-WEIXIN
             shareByWx,
-            // #endif
-            // #ifdef MP-TOUTIAO
-            shareByTt,
-            // #endif
-            // #ifdef MP-ALIPAY
-            shareByAli,
-            // #endif
-            // #ifdef APP-PLUS || APP-PLUS-NVUE
-            shareByApp
-            // #endif
         },
         data() {
             return {
@@ -539,12 +490,7 @@
             shareHref() {
                 let pages = getCurrentPages();
                 let page = pages[pages.length - 1];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
                 return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
-                // #endif
-                // #ifdef MP-ALIPAY
-                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
-                // #endif
             },
             defaultSpesDesc() {
                 return this.product.defaultSpecificationDescription;
@@ -816,45 +762,6 @@
             },
             //在线客服,只有手机号的，请自己替换为手机号
             showChat() {
-                // #ifdef H5
-                let _this = this;
-                window._AIHECONG('ini', {
-                    entId: this.config.entId,
-                    button: false,
-                    appearance: {
-                        panelMobile: {
-                            tone: '#FF7159',
-                            sideMargin: 30,
-                            ratio: 'part',
-                            headHeight: 50
-                        }
-                    }
-                });
-                //传递客户信息
-                window._AIHECONG('customer', {
-                    head: _this.userInfo.avatar,
-                    名称: _this.userInfo.nickname,
-                    手机: _this.userInfo.mobile
-                });
-                window._AIHECONG('showChat');
-                // #endif
-                // 客服页面
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                this.$u.route('/pages/member/customerService/index');
-                // #endif
-                // 头条系客服
-                // #ifdef MP-TOUTIAO
-                if (this.shopMobile != 0) {
-                    let _this = this;
-                    tt.makePhoneCall({
-                        phoneNumber: this.shopMobile.toString(),
-                        success(res) { },
-                        fail(res) { }
-                    });
-                } else {
-                    _this.$u.toast('暂无设置客服电话');
-                }
-                // #endif
             },
             //获取分享URL
             getShareUrl() {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue
index 73d873715da35ceeb5444c3ac5dadcd95178c7d2..849f4dafc948f7cb867947e9a0fdc5e90fa0722d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue
@@ -317,22 +317,8 @@
 
         <!-- 分享弹窗 -->
         <view class="u-padding-10">
-            <u-popup  mode="bottom" v-model="shareBox" ref="share">
-                <!-- #ifdef H5 -->
-                <shareByH5 :shareType="3" :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByH5>
-                <!-- #endif -->
-                <!-- #ifdef MP-WEIXIN -->
+            <u-popup mode="bottom" v-model="shareBox" ref="share">
                 <shareByWx :shareType="3" :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByWx>
-                <!-- #endif -->
-                <!-- #ifdef MP-ALIPAY -->
-                <shareByAli :shareType="3" :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByAli>
-                <!-- #endif -->
-                <!-- #ifdef MP-TOUTIAO -->
-                <shareByTt :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByTt>
-                <!-- #endif -->
-                <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-                <shareByApp :shareType="3" :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByApp>
-                <!-- #endif -->
             </u-popup>
             <div id="qrCode" ref="qrCodeDiv"></div>
         </view>
@@ -383,18 +369,11 @@
         <view class="coreshop-good-footer-fixed">
             <view class="tabbar">
                 <!-- 客服按钮 -->
-                <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-                <view class="action"  @click="showChat()">
-                    <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
-                </view>
-                <!-- #endif -->
-                <!-- #ifdef MP-WEIXIN -->
-                <view class="action" >
+                <view class="action">
                     <button open-type="contact" bindcontact="showChat" class="noButtonStyle">
                         <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
-                    </button>   
+                    </button>
                 </view>
-                <!-- #endif -->
                 <view class="action"  @click="collection">
                     <u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom"></u-icon>
                 </view>
@@ -512,42 +491,14 @@
     import coreshopNavbarSlot from '@/components/coreshop-navbar-slot/coreshop-navbar-slot.vue';
     import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js'
     import spec from '@/components/coreshop-spec/coreshop-spec.vue';
-    // #ifdef H5
-    import shareByH5 from '@/components/coreshop-share/shareByh5.vue';
-    // #endif
-    // #ifdef MP-WEIXIN
     import shareByWx from '@/components/coreshop-share/shareByWx.vue';
-    // #endif
-    // #ifdef MP-TOUTIAO
-    import shareByTt from '@/components/coreshop-share/shareByTt.vue';
-    // #endif
-    // #ifdef MP-ALIPAY
-    import shareByAli from '@/components/coreshop-share/shareByAli.vue';
-    // #endif
-    // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import shareByApp from '@/components/coreshop-share/shareByApp.vue';
-    // #endif
     export default {
         mixins: [goods, articles, commonUse, tools],
         components: {
             coreshopFab,
             coreshopNavbarSlot,
             spec,
-            // #ifdef H5
-            shareByH5,
-            // #endif
-            // #ifdef MP-WEIXIN
             shareByWx,
-            // #endif
-            // #ifdef MP-TOUTIAO
-            shareByTt,
-            // #endif
-            // #ifdef MP-ALIPAY
-            shareByAli,
-            // #endif
-            // #ifdef APP-PLUS || APP-PLUS-NVUE
-            shareByApp
-            // #endif
         },
         data() {
             return {
@@ -680,12 +631,7 @@
             shareHref() {
                 let pages = getCurrentPages();
                 let page = pages[pages.length - 1];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
                 return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&pinTuanId=' + this.pinTuanId;
-                // #endif
-                // #ifdef MP-ALIPAY
-                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&pinTuanId=' + this.pinTuanId;
-                // #endif
             },
             defaultSpesDesc() {
                 return this.product.defaultSpecificationDescription;
@@ -970,45 +916,6 @@
             },
             //在线客服,只有手机号的，请自己替换为手机号
             showChat() {
-                // #ifdef H5
-                let _this = this;
-                window._AIHECONG('ini', {
-                    entId: this.config.entId,
-                    button: false,
-                    appearance: {
-                        panelMobile: {
-                            tone: '#FF7159',
-                            sideMargin: 30,
-                            ratio: 'part',
-                            headHeight: 50
-                        }
-                    }
-                });
-                //传递客户信息
-                window._AIHECONG('customer', {
-                    head: _this.userInfo.avatar,
-                    名称: _this.userInfo.nickname,
-                    手机: _this.userInfo.mobile
-                });
-                window._AIHECONG('showChat');
-                // #endif
-                // 客服页面
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                this.$u.route('/pages/member/customerService/index');
-                // #endif
-                // 头条系客服
-                // #ifdef MP-TOUTIAO
-                if (this.shopMobile != 0) {
-                    let _this = this;
-                    tt.makePhoneCall({
-                        phoneNumber: this.shopMobile.toString(),
-                        success(res) { },
-                        fail(res) { }
-                    });
-                } else {
-                    _this.$u.toast('暂无设置客服电话');
-                }
-                // #endif
             },
             //获取分享URL
             getShareUrl() {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue
index ac279e66638d06426e554e67acf4ed4df172c7a7..19e9b9440ccf553650f30c146cd3db65e36c6196 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue
@@ -148,22 +148,8 @@
 
         <!-- 分享弹窗 -->
         <view class="u-padding-10">
-            <u-popup  mode="bottom" v-model="shareBox" ref="share">
-                <!-- #ifdef H5 -->
-                <shareByH5 :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" :shareType="shareType" @close="closeShare()"></shareByH5>
-                <!-- #endif -->
-                <!-- #ifdef MP-WEIXIN -->
-                <shareByWx :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" :shareType="shareType"  @close="closeShare()"></shareByWx>
-                <!-- #endif -->
-                <!-- #ifdef MP-ALIPAY -->
-                <shareByAli :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" :shareType="shareType"  @close="closeShare()"></shareByAli>
-                <!-- #endif -->
-                <!-- #ifdef MP-TOUTIAO -->
-                <shareByTt :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" :shareType="shareType"  @close="closeShare()"></shareByTt>
-                <!-- #endif -->
-                <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-                <shareByApp :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" :shareType="shareType" :shareType="shareType"  @close="closeShare()"></shareByApp>
-                <!-- #endif -->
+            <u-popup mode="bottom" v-model="shareBox" ref="share">
+                <shareByWx :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" :shareType="shareType" @close="closeShare()"></shareByWx>
             </u-popup>
         </view>
 
@@ -345,18 +331,11 @@
         <view class="coreshop-good-footer-fixed">
             <view class="tabbar">
                  <!-- 客服按钮 -->
-                <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-                <view class="action"  @click="showChat()">
-                    <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
-                </view>
-                <!-- #endif -->
-                <!-- #ifdef MP-WEIXIN -->
-                <view class="action" >
+                <view class="action">
                     <button open-type="contact" bindcontact="showChat" class="noButtonStyle">
                         <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
-                    </button>   
+                    </button>
                 </view>
-                <!-- #endif -->
                 <view class="action"  @click="collection">
                     <u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom"></u-icon>
                 </view>
@@ -384,42 +363,15 @@
     import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js'
     import spec from '@/components/coreshop-spec/coreshop-spec.vue';
     import coreshopNavbarSlot from '@/components/coreshop-navbar-slot/coreshop-navbar-slot.vue';
-    // #ifdef H5
-    import shareByH5 from '@/components/coreshop-share/shareByh5.vue';
-    // #endif
-    // #ifdef MP-WEIXIN
     import shareByWx from '@/components/coreshop-share/shareByWx.vue';
-    // #endif
-    // #ifdef MP-TOUTIAO
-    import shareByTt from '@/components/coreshop-share/shareByTt.vue';
-    // #endif
-    // #ifdef MP-ALIPAY
-    import shareByAli from '@/components/coreshop-share/shareByAli.vue';
-    // #endif
-    // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import shareByApp from '@/components/coreshop-share/shareByApp.vue';
-    // #endif
+
     export default {
         mixins: [goods, articles, commonUse, tools],
         components: {
             coreshopFab,
             coreshopNavbarSlot,
             spec,
-            // #ifdef H5
-            shareByH5,
-            // #endif
-            // #ifdef MP-WEIXIN
             shareByWx,
-            // #endif
-            // #ifdef MP-TOUTIAO
-            shareByTt,
-            // #endif
-            // #ifdef MP-ALIPAY
-            shareByAli,
-            // #endif
-            // #ifdef APP-PLUS || APP-PLUS-NVUE
-            shareByApp
-            // #endif
         },
         data() {
             return {
@@ -544,12 +496,7 @@
             shareHref() {
                 let pages = getCurrentPages();
                 let page = pages[pages.length - 1];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
                 return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
-                // #endif
-                // #ifdef MP-ALIPAY
-                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
-                // #endif
             },
             defaultSpesDesc() {
                 return this.product.defaultSpecificationDescription;
@@ -820,45 +767,6 @@
             },
             //在线客服,只有手机号的，请自己替换为手机号
             showChat() {
-                // #ifdef H5
-                let _this = this;
-                window._AIHECONG('ini', {
-                    entId: this.config.entId,
-                    button: false,
-                    appearance: {
-                        panelMobile: {
-                            tone: '#FF7159',
-                            sideMargin: 30,
-                            ratio: 'part',
-                            headHeight: 50
-                        }
-                    }
-                });
-                //传递客户信息
-                window._AIHECONG('customer', {
-                    head: _this.userInfo.avatar,
-                    名称: _this.userInfo.nickname,
-                    手机: _this.userInfo.mobile
-                });
-                window._AIHECONG('showChat');
-                // #endif
-                // 客服页面
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                this.$u.route('/pages/member/customerService/index');
-                // #endif
-                // 头条系客服
-                // #ifdef MP-TOUTIAO
-                if (this.shopMobile != 0) {
-                    let _this = this;
-                    tt.makePhoneCall({
-                        phoneNumber: this.shopMobile.toString(),
-                        success(res) { },
-                        fail(res) { }
-                    });
-                } else {
-                    _this.$u.toast('暂无设置客服电话');
-                }
-                // #endif
             },
             //获取分享URL
             getShareUrl() {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss
index 82a4615ad3a41cd62e6af0300b729fc652dcd672..0dfbf9fee1f55196bfcf0767299f5206fb32dd78 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss
@@ -1,4 +1,4 @@
-.topBox { position: sticky; z-index: 1; width: 100%; /* #ifdef APP-PLUS */ top: calc(var(--status-bar-height) + 70rpx); /* #endif */ /* #ifdef H5 */ top: calc(var(--status-bar-height) + 110rpx); /* #endif */ /* #ifdef MP */ top: calc(var(--status-bar-height) + 135rpx); /* #endif */ }
+.topBox { position: sticky; z-index: 1; width: 100%; /* #ifdef MP */ top: calc(var(--status-bar-height) + 135rpx); /* #endif */ }
 
 .good_box { border-radius: 8px; margin: 5px; background-color: #ffffff; padding: 5px; position: relative; width: calc(100% - 6px); }
 .good_image { width: 100%; border-radius: 4px; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
index 1efb791fd7ec1fff40d3608b6a7b03486f75cd4d..f8d92ac1f9347c0afd88a87c95cb42eb2dda195f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
@@ -501,7 +501,6 @@
             goSearch() {
                 let pages = getCurrentPages();
                 let prevPage = pages[pages.length - 2];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
                 if (prevPage && prevPage.route) {
                     let search_flag = prevPage.route;
                     if (search_flag == 'pages/search/search') {
@@ -514,22 +513,6 @@
                 } else {
                     this.$u.route('/pages/search/search');
                 }
-                // #endif
-
-                // #ifdef MP-ALIPAY
-                if (prevPage && prevPage.__proto__.route) {
-                    let search_flag = prevPage.__proto__.route;
-                    if (search_flag == 'pages/search/search') {
-                        uni.navigateBack({
-                            delta: 1
-                        });
-                    } else {
-                        this.$u.route('/pages/search/search');
-                    }
-                } else {
-                    this.$u.route('/pages/search/search');
-                }
-                // #endif
             },
             //取消筛选
             filterNo() {
@@ -636,21 +619,7 @@
             closeDropdown() {
                 this.$refs.uDropdown.close();
             }
-        },
-        // #ifdef MP-ALIPAY
-        onChangeShowState_show: function () {
-            var that = this;
-            that.setData({
-                showView: (that.showView = true)
-            });
-        },
-        onChangeShowState_hid: function () {
-            var that = this;
-            that.setData({
-                showView: (that.showView = false)
-            });
         }
-        // #endif
     };
 </script>
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
index 122905f2441c4df2a7639c5adb8ef2b7e6169312..e2dc6b9e6c2cc083dad318f9d11f769e96fa5f7d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
@@ -200,22 +200,8 @@
 
         <!-- 分享弹窗 -->
         <view class="u-padding-10">
-            <u-popup  mode="bottom" v-model="shareBox" ref="share">
-                <!-- #ifdef H5 -->
-                <shareByH5 :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByH5>
-                <!-- #endif -->
-                <!-- #ifdef MP-WEIXIN -->
+            <u-popup mode="bottom" v-model="shareBox" ref="share">
                 <shareByWx :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByWx>
-                <!-- #endif -->
-                <!-- #ifdef MP-ALIPAY -->
-                <shareByAli :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByAli>
-                <!-- #endif -->
-                <!-- #ifdef MP-TOUTIAO -->
-                <shareByTt :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByTt>
-                <!-- #endif -->
-                <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-                <shareByApp :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></shareByApp>
-                <!-- #endif -->
             </u-popup>
             <div id="qrCode" ref="qrCodeDiv"></div>
         </view>
@@ -287,18 +273,11 @@
         <view class="coreshop-good-footer-fixed">
             <view class="tabbar">
                 <!-- 客服按钮 -->
-                <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-                <view class="action"  @click="showChat()">
-                    <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
-                </view>
-                <!-- #endif -->
-                <!-- #ifdef MP-WEIXIN -->
                 <view class="action">
-                   <button open-type="contact" bindcontact="showChat" class="noButtonStyle">
+                    <button open-type="contact" bindcontact="showChat" class="noButtonStyle">
                         <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom"></u-icon>
                     </button>
                 </view>
-                <!-- #endif -->
                 <view class="action"  @click="collection">
                     <u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom"></u-icon>
                 </view>
@@ -400,42 +379,15 @@
     import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js'
     import coreshopNavbarSlot from '@/components/coreshop-navbar-slot/coreshop-navbar-slot.vue';
     import spec from '@/components/coreshop-spec/coreshop-spec.vue'
-    // #ifdef H5
-    import shareByH5 from '@/components/coreshop-share/shareByh5.vue'
-    // #endif
-    // #ifdef MP-WEIXIN
-    import shareByWx from '@/components/coreshop-share/shareByWx.vue'
-    // #endif
-    // #ifdef MP-TOUTIAO
-    import shareByTt from '@/components/coreshop-share/shareByTt.vue'
-    // #endif
-    // #ifdef MP-ALIPAY
-    import shareByAli from '@/components/coreshop-share/shareByAli.vue'
-    // #endif
-    // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import shareByApp from '@/components/coreshop-share/shareByApp.vue'
-    // #endif
+    import shareByWx from '@/components/coreshop-share/shareByWx.vue';
+
     export default {
         mixins: [goods, articles, commonUse, tools],
         components: {
             coreshopFab,
             coreshopNavbarSlot,
             spec,
-            // #ifdef H5
-            shareByH5,
-            // #endif
-            // #ifdef MP-WEIXIN
             shareByWx,
-            // #endif
-            // #ifdef MP-TOUTIAO
-            shareByTt,
-            // #endif
-            // #ifdef MP-ALIPAY
-            shareByAli,
-            // #endif
-            // #ifdef APP-PLUS || APP-PLUS-NVUE
-            shareByApp,
-            // #endif
         },
         data() {
             return {
@@ -495,13 +447,11 @@
                     if (res.status) {
                         _this.userInfo = res.data
                         _this.hasLogin = true;
-                        // #ifdef MP-WEIXIN
                         //微信小程序打开客服时，传递用户信息
                         var kefupara = {}
                         kefupara.nickName = res.data.nickname
                         kefupara.tel = res.data.mobile
                         _this.kefupara = JSON.stringify(kefupara)
-                        // #endif
                     }
                 })
             };
@@ -571,12 +521,7 @@
             shareHref() {
                 let pages = getCurrentPages()
                 let page = pages[pages.length - 1]
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
                 return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId;
-                // #endif
-                // #ifdef MP-ALIPAY
-                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId;
-                // #endif
             },
             defaultSpesDesc() {
                 return this.product.defaultSpecificationDescription;
@@ -874,45 +819,6 @@
             },
             //在线客服,只有手机号的，请自己替换为手机号
             showChat() {
-                let _this = this;
-                // #ifdef H5
-                window._AIHECONG('ini', {
-                    entId: this.config.entId,
-                    button: false,
-                    appearance: {
-                        panelMobile: {
-                            tone: '#FF7159',
-                            sideMargin: 30,
-                            ratio: 'part',
-                            headHeight: 50
-                        }
-                    }
-                })
-                //传递客户信息
-                window._AIHECONG('customer', {
-                    head: _this.userInfo.avatar,
-                    '名称': _this.userInfo.nickname,
-                    '手机': _this.userInfo.mobile
-                })
-                window._AIHECONG('showChat')
-                // #endif
-                // 客服页面
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                this.$u.route('/pages/member/customerService/index');
-                // #endif
-                // 头条系客服
-                // #ifdef MP-TOUTIAO
-                if (this.shopMobile != 0) {
-                    let _this = this;
-                    tt.makePhoneCall({
-                        phoneNumber: this.shopMobile.toString(),
-                        success(res) { },
-                        fail(res) { }
-                    });
-                } else {
-                    _this.$u.toast('暂无设置客服电话');
-                }
-                // #endif
             },
             //获取分享URL
             getShareUrl() {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue
index 452c63ff99f637403b8eae6678997707569840a8..9be2acac170f4eb54fe489bd3be457cdf8417635 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue
@@ -13,22 +13,9 @@
         <!--版权组件-->
         <copyright v-if="copy"></copyright>
         <!--客服组件-->
-        <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-        <view class="floatingButton" @click="showChat()">
-            <u-icon name="server-man" color="#e54d42" size="60"></u-icon>
-        </view>
-        <!-- #endif -->
-        <!-- #ifdef MP-WEIXIN -->
         <button class="floatingButton" hover-class="none" open-type="contact" bindcontact="showChat" :session-from="kefupara">
             <u-icon name="server-man" color="#e54d42" size="60"></u-icon>
         </button>
-        <!-- #endif -->
-        <!-- #ifdef MP-ALIPAY -->
-        <contact-button class="floatingButton icon" icon="/static/images/common/seller-content.png" size="80rpx*80rpx" tnt-inst-id="" scene="" hover-class="none" />
-        <!-- #endif -->
-        <!-- #ifdef MP-TOUTIAO -->
-        <!-- 头条客服 -->
-        <!-- #endif -->
         <!--返回顶部组件-->
         <u-back-top :scroll-top="scrollTop" :duration="500"></u-back-top>
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue
index e56df65ba6a8bd6e437e90213f1192e68a25b3b6..53c2af68584dc80613db9bc13f16339fa62473ca 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue
@@ -13,22 +13,9 @@
         <!--版权组件-->
         <copyright></copyright>
         <!--客服组件-->
-        <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-        <view class="floatingButton" @click="showChat()">
-            <u-icon name="server-man" color="#e54d42" size="60"></u-icon>
-        </view>
-        <!-- #endif -->
-        <!-- #ifdef MP-WEIXIN -->
         <button class="floatingButton" hover-class="none" open-type="contact" bindcontact="showChat" :session-from="kefupara">
             <u-icon name="server-man" color="#e54d42" size="60"></u-icon>
         </button>
-        <!-- #endif -->
-        <!-- #ifdef MP-ALIPAY -->
-        <contact-button class="floatingButton icon" icon="/static/images/common/seller-content.png" size="80rpx*80rpx" tnt-inst-id="" scene="" hover-class="none" />
-        <!-- #endif -->
-        <!-- #ifdef MP-TOUTIAO -->
-        <!-- 头条客服 -->
-        <!-- #endif -->
         <!--返回顶部组件-->
         <u-back-top :scroll-top="scrollTop" :duration="500"></u-back-top>
 
@@ -181,47 +168,6 @@
             },
             //在线客服,只有手机号的，请自己替换为手机号
             showChat() {
-                // #ifdef H5
-                let _this = this;
-                window._AIHECONG('ini', {
-                    entId: this.$store.state.config.entId,
-                    button: false,
-                    appearance: {
-                        panelMobile: {
-                            tone: '#FF7159',
-                            sideMargin: 30,
-                            ratio: 'part',
-                            headHeight: 50
-                        }
-                    }
-                });
-                //传递客户信息
-                window._AIHECONG('customer', {
-                    head: _this.userInfo.avatarImage,
-                    名称: _this.userInfo.nickName,
-                    手机: _this.userInfo.mobile
-                });
-                window._AIHECONG('showChat');
-                // #endif
-
-                // 客服页面
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                this.$u.route('/pages/member/customerService/index');
-                // #endif
-
-                // 头条系客服
-                // #ifdef MP-TOUTIAO
-                if (this.shopMobile != 0) {
-                    let _this = this;
-                    tt.makePhoneCall({
-                        phoneNumber: this.shopMobile.toString(),
-                        success(res) { },
-                        fail(res) { }
-                    });
-                } else {
-                    _this.$u.toast('暂无设置客服电话');
-                }
-                // #endif
             },
             //获取分享URL
             getShareUrl() {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
index 89c6d2cb220634f43a93967563e7944ec91e2148..b69bfde6c8f7f781345535392081c3c73723440b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
@@ -10,32 +10,12 @@
             <view class="user-info-box">
                 <!--未登陆-->
                 <view class="login-user-view" v-if="!hasLogin">
-                    <!-- #ifdef H5 || APP-PLUS -->
-                    <view class="login-user-avatar-view">
-                        <u-avatar :src="$store.state.config.shopLogo" size="large"></u-avatar>
-                    </view>
-                    <u-button type="default" size="mini" @click="toLogin()">立即登录</u-button>
-                    <!-- #endif -->
-                    <!-- #ifdef MP-WEIXIN -->
                     <view class="login-user-avatar-view">
                         <view class="account-face grace-box-shadow">
                             <open-data type="userAvatarUrl"></open-data>
                         </view>
                     </view>
                     <u-button type="default" size="mini" @click="goLogin()">立即登录</u-button>
-                    <!-- #endif -->
-                    <!-- #ifdef MP-ALIPAY -->
-                    <view class="login-user-avatar-view">
-                        <u-avatar :src="userInfo.avatarImage" size="large"></u-avatar>
-                    </view>
-                    <u-button type="default" size="mini" @click="goLogin()">立即登录</u-button>
-                    <!-- #endif -->
-                    <!-- #ifdef MP-TOUTIAO -->
-                    <view class="login-user-avatar-view">
-                        <u-avatar :src="$store.state.config.shopLogo" size="large"></u-avatar>
-                    </view>
-                    <u-button type="default" size="mini" @click="goLogin()">立即登录</u-button>
-                    <!-- #endif -->
                 </view>
 
                 <!--已登陆-->
@@ -54,23 +34,12 @@
                                 <text>余额 {{ userInfo.balance }}</text>
                             </view>
                         </view>
-                        <!-- #ifndef MP-WEIXIN -->
-                        <view class="u-m-l-10 u-p-10">
-                            <u-icon name="scan" color="#969799" size="28"></u-icon>
-                        </view>
-                        <view class="u-m-l-10 u-p-10" @tap="navigateToHandle('/pages/member/setting/userInfo/index')">
-                            <u-icon name="arrow-right" color="#969799" size="28"></u-icon>
-                        </view>
-                        <!-- #endif -->
-                        <!-- #ifdef MP-WEIXIN -->
                         <view class="u-m-l-10 u-m-r-20 u-p-10" @click="syncWeChatInfo()">
                             <u-icon name="reload" color="#fff" size="32"></u-icon>
                         </view>
                         <view class="u-m-l-20 u-p-10" @tap="navigateToHandle('/pages/member/setting/userInfo/index')">
                             <u-icon name="arrow-right" color="#fff" size="32"></u-icon>
                         </view>
-                        <!-- #endif -->
-
                     </view>
                 </view>
             </view>
@@ -194,33 +163,15 @@
                     <view class="coreshop-text-black coreshop-text-bold u-font-lg tools-title">其他</view>
                 </view>
                 <view class="coreshop-tools-list-box">
-
                     <u-grid :col="4" :border="false">
                         <u-grid-item @click="goArticleList()">
                             <u-icon name="question-circle" :size="50" color="#666"></u-icon>
                             <view class="grid-text">帮助中心</view>
                         </u-grid-item>
-
                         <u-grid-item v-for="(item,i) in other" :key="i" v-if="item.showItem" @click="navigateToHandle(item.router)">
                             <u-icon :name="item.icon" :size="50" color="#666"></u-icon>
                             <view class="grid-text">{{ item.name }}</view>
                         </u-grid-item>
-                        <!-- #ifdef H5 || APP-PLUS || APP-PLUS-NVUE -->
-                        <u-grid-item @click="showChat">
-                            <u-icon name="server-man" :size="50" color="#666"></u-icon>
-                            <view class="grid-text">联系客服</view>
-                        </u-grid-item>
-                        <!-- #endif -->
-                        <!-- #ifdef MP-WEIXIN -->
-                        <!-- todo:: 微信客服 -->
-                        <!-- #endif -->
-                        <!-- #ifdef MP-TOUTIAO -->
-                        <!-- todo:: 头条客服 -->
-                        <!-- #endif -->
-                        <!-- #ifdef MP-ALIPAY -->
-                        <!-- todo:: 支付宝客服 -->
-                        <!-- #endif -->
-
                     </u-grid>
                 </view>
             </view>
@@ -473,9 +424,6 @@
             goLogin() {
                 this.$store.commit('showLoginTip', true);
             },
-            toLogin() {
-                this.$u.route('/pages/member/login/login/loginByAccount')
-            },
             initData() {
                 var _this = this
                 //判断是开启分销还是原始推广
@@ -562,24 +510,6 @@
             },
             //在线客服,只有手机号的，请自己替换为手机号
             showChat() {
-                // #ifdef H5
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                this.$u.route('/pages/member/customerService/index');
-                // #endif
-                // 头条系客服
-                // #ifdef MP-TOUTIAO
-                if (this.shopMobile != 0) {
-                    let _this = this;
-                    tt.makePhoneCall({
-                        phoneNumber: this.shopMobile.toString(),
-                        success(res) { },
-                        fail(res) { }
-                    });
-                } else {
-                    _this.$u.toast('暂无设置客服电话');
-                }
-                // #endif
             },
             //同步微信昵称数据
             syncWeChatInfo() {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/forget/forget.vue b/CoreCms.Net.Uni-App/CoreShop/pages/login/forget/forget.vue
deleted file mode 100644
index 9d1c979263be32b70dbe8b04837d6d8f0573d789..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/login/forget/forget.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar title="找回密码"></u-navbar>
-        <view class="content">
-            <view class="reg-t"><image class="reg-logo" :src="logoImage" mode="aspectFill"></image></view>
-            <view class="reg-m">
-                <view class="reg-item">
-                    <input type="number" v-model="mobile" :maxlength="maxMobile" placeholder="请输入手机号码" focus placeholder-class="login-item-i-p fsz26" />
-                </view>
-                <view class="reg-item flc">
-                    <input class="reg-item-input" placeholder-class="login-item-i-p fsz26" type="text" v-model="code" placeholder="请输入验证码" />
-                    <view :class="sendCodeBtn" @click="sendCode" v-if="verification">发送验证码</view>
-                    <view class="coreshop-btn coreshop-btn-g" v-if="!verification">{{ timer }} 秒后重新获取</view>
-                </view>
-                <view class="reg-item">
-                    <input class="login-item-input" :password="true" placeholder-class="login-item-i-p fsz26" type="text" v-model="pwd" placeholder="请输入6-16位密码" />
-                </view>
-                <view class="reg-item">
-                    <input class="login-item-input" :password="true" placeholder-class="login-item-i-p fsz26" type="text" v-model="repwd" placeholder="请确认密码" />
-                </view>
-            </view>
-            <view class="reg-b">
-                <button :class="regButtonClass" @click="toReg()" hover-class="coreshop-btn-hover">确认</button>
-                <!-- <view class="color-9 fsz24 agreement">
-                    注册即代表你同意 <text @click="goUserAgreementPage()" class="color-o">用户协议</text> 和 <text @click="goUserPrivacyPolicy()" class="color-o">隐私政策</text>
-                </view> -->
-            </view>
-            <!-- <view class="registered-item">
-                <view class="coreshop-btn coreshop-btn-g coreshop-btn-square registered" @click="toLogin">已有账号，立即登录</view>
-            </view> -->
-        </view>
-    </view>
-</template>
-
-<script>
-    import { commonUse, articles } from '@/common/mixins/mixinsHelper.js';
-    export default {
-        mixins: [commonUse, articles],
-        data() {
-            return {
-                maxMobile: 11,
-                mobile: '', // 用户手机号
-                code: '', // 短信验证码
-                pwd: '', // 用户密码
-                repwd: '', //确认密码
-                verification: true, // 通过v-show控制显示获取还是倒计时
-                timer: 60, // 定义初始时间为60s
-                btnb: 'coreshop-btn coreshop-btn-c coreshop-btn-square coreshop-btn-all' //按钮背景
-            };
-        },
-        onLoad(options) {
-            let _this = this;
-            _this.timer = parseInt(_this.$db.get('timer'));
-            if (_this.timer != null && _this.timer > 0) {
-                _this.countDown();
-                _this.verification = false;
-            }
-
-            if (options.invitecode) {
-                this.$db.set('invitecode', options.invitecode);
-            }
-        },
-        computed: {
-            // 验证手机号
-            rightMobile() {
-                let res = {};
-                if (!this.mobile) {
-                    res.status = false;
-                    res.msg = '请输入手机号';
-                } else if (!/^1[3456789]{1}\d{9}$/gi.test(this.mobile)) {
-                    res.status = false;
-                    res.msg = '手机号格式不正确';
-                } else {
-                    res.status = true;
-                }
-                return res;
-            },
-            // 动态更改登录按钮bg
-            regButtonClass() {
-                return this.mobile && this.mobile.length === 11 && this.pwd && this.code ? this.btnb + ' coreshop-btn-b' : this.btnb;
-            },
-            // 动态修改发送验证码按钮
-            sendCodeBtn() {
-                let btn = 'coreshop-btn coreshop-btn-g';
-                if (this.mobile.length === this.maxMobile && this.rightMobile.status) {
-                    return btn + ' coreshop-btn-b';
-                } else {
-                    return btn;
-                }
-            },
-            logoImage() {
-                return this.$store.state.config.shopLogo;
-            }
-        },
-        onShow() {
-            let _this = this;
-            let userToken = _this.$db.get('userToken');
-            if (userToken && userToken != '') {
-                this.$u.route({
-                    type: 'switchTab',
-                    url: '/pages/index/member/member'
-                });
-                return true;
-            }
-            _this.timer = parseInt(_this.$db.get('timer'));
-            if (_this.timer != null && _this.timer > 0) {
-                _this.countDown();
-                _this.verification = false;
-            }
-        },
-        methods: {
-            // 发送短信验证码
-            sendCode() {
-                if (!this.rightMobile.status) {
-                    this.$u.toast(this.rightMobile.msg);
-                } else {
-                    uni.showToast({ title: '发送中...', icon: 'loading' })
-                    setTimeout(() => {
-                        uni.hideToast();
-                        this.$u.api.sms({ mobile: this.mobile, code: 'veri' }).then(res => {
-                            if (res.status) {
-                                this.timer = 60;
-                                this.verification = false;
-                                this.$refs.uToast.show({ title: res.msg, type: 'success', back: false });
-                                this.countDown(); // 执行验证码计时
-                                this.btnb = 'coreshop-btn coreshop-btn-square coreshop-btn-all coreshop-btn-b';
-                            } else {
-                                this.$u.toast(res.msg);
-                            }
-                        });
-                    }, 1000);
-                }
-            },
-            // 验证码倒计时
-            countDown() {
-                let auth_timer = setInterval(() => {
-                    // 定时器设置每秒递减
-                    this.timer--; // 递减时间
-                    uni.setStorage({
-                        key: 'timer',
-                        data: this.timer,
-                        success: function () { }
-                    });
-                    if (this.timer <= 0) {
-                        this.verification = true; // 60s时间结束还原v-show状态并清除定时器
-                        clearInterval(auth_timer);
-                    }
-                }, 1000);
-            },
-            toReg() {
-                if (!this.rightMobile.status) {
-                    this.$u.toast(this.rightMobile.msg);
-                } else if (!this.code) {
-                    this.$u.toast('请输入短信验证码');
-                } else if (!this.pwd) {
-                    this.$u.toast('请输入6-16位密码');
-                } else if (!this.repwd) {
-                    this.$u.toast('请确认密码');
-                } else {
-                    let data = {
-                        mobile: this.mobile,
-                        code: this.code,
-                        newpwd: this.pwd,
-                        repwd: this.repwd
-                    };
-                    this.$u.api.userForgetpwd(data).then(res => {
-                        if (res.status) {
-                            this.$refs.uToast.show({
-                                title: res.msg, type: 'success', callback: function () {
-                                    this.$u.route('/pages/login/loginByAccount/loginByAccount');
-                                }
-                            })
-                        } else {
-                            this.$u.toast(res.msg);
-                        }
-                    });
-                }
-            },
-            toLogin() {
-                this.$u.route('/pages/login/loginByAccount/loginByAccount');
-            },
-        }
-    };
-</script>
-
-<style lang="scss" scoped>
-    view { box-sizing: border-box; }
-    .content { /*  #ifdef  H5  */ height: calc(100vh - 90upx); /*  #endif  */ /*  #ifndef  H5  */ height: 100vh; /*  #endif  */ background-color: #fff; padding: 0upx 100upx; }
-    .reg-t { text-align: center; padding: 50upx 0; }
-    .reg-logo { width: 180upx; height: 180upx; border-radius: 20upx; background-color: #f8f8f8; }
-    .reg-m { margin-bottom: 100upx; }
-    .reg-item { border-bottom: 2upx solid #d0d0d0; overflow: hidden; padding: 10upx; color: #333; margin-bottom: 30upx; }
-    .coreshop-btn { border: none; width: 40%; text-align: right; }
-    .coreshop-btn-b { background: none; color: #333 !important; }
-    .reg-item-input { flex: 1; }
-    .reg-b .coreshop-btn { color: #999; }
-    .registered-item { overflow: hidden; width: 100%; }
-    .registered { float: right; }
-    .coreshop-btn-square { color: #333; height: 80upx; line-height: 80upx; padding: 0; font-size: $fz12; }
-    .agreement { margin: 20rpx 0; text-align: center; }
-    .color-o { margin: 0 10rpx; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginByAccount/loginByAccount.vue b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginByAccount/loginByAccount.vue
deleted file mode 100644
index 61d65c75d0418fc611d453a7f08d62827cee0656..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginByAccount/loginByAccount.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar title="账户登录"></u-navbar>
-        <view class="content">
-            <view class="login-t"><image class="login-logo" :src="logoImage" mode="aspectFill"></image></view>
-            <view>
-                <view class="login-m">
-                    <view class="login-item">
-                        <input type="number" v-model="mobile" :maxlength="maxMobile" placeholder="请输入手机号码" placeholder-class="login-item-i-p fsz26" />
-                    </view>
-                    <view class="login-item flc">
-                        <input class="login-item-input" :password="true" placeholder-class="login-item-i-p fsz26" type="text" v-model="pwd" placeholder="请输入密码" />
-                    </view>
-                    <view class="login-item" v-if="isCaptcha">
-                        <input class="login-item-input" placeholder-class="login-item-i-p fsz26" type="text" v-model="captcha" placeholder="输入验证码" />
-                        <img class="codeimg" :src="captchaUrl" alt="" />
-                    </view>
-                    <view class="goforgetpwd color-9 fsz24" @click="goForgetpwd()">忘记密码？</view>
-                </view>
-                <view class="login-b">
-                    <button :class="loginButtonClass" @click="loginHandler" hover-class="coreshop-btn-hover">登录</button>
-                    <view class="color-9 fsz24 agreement">
-                        登录即代表你同意
-                        <text @click="goUserAgreementPage()" class="color-o">用户协议</text>
-                        和
-                        <text @click="goUserPrivacyPolicy()" class="color-o">隐私政策</text>
-                    </view>
-                    <view class="login-other flc">
-                        <view class="fz12 item" @click="selectLoginType">验证码登录</view>
-                    </view>
-                </view>
-            </view>
-            <!--  微信浏览器里 -->
-            <!-- #ifdef H5 -->
-            <template v-if="weixinBrowser">
-                <view class="fz12 g5">第三方账号登录：</view>
-                <view class="flc third-block">
-                    <view class="third-item" v-for="(item, key, index) in thirdPartyLogins" :key="index" @click="handleThirdLogin(item)">
-                        <image class="third-item-img" :src="getThirdLoginImg(key)" mode="aspectFill"></image>
-                    </view>
-                </view>
-            </template>
-            <!-- #endif -->
-            <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-            <view class="fz12 g5">第三方账号登录：</view>
-            <view class="flc third-block" v-if="thirdPartyLogins.length > 0">
-                <view class="third-item" v-for="(item, key, index) in thirdPartyLogins" :key="key" @click="handleThirdLoginApp(item)">
-                    <image class="third-item-img" src="/static/images/ic-wechat.png" mode="aspectFill" v-if="item == 'weixin'"></image>
-                </view>
-            </view>
-            <!-- #endif -->
-        </view>
-    </view>
-</template>
-
-<script>
-    import { baseUrl } from '@/common/setting/constVarsHelper.js';
-    import { commonUse, articles } from '@/common/mixins/mixinsHelper.js';
-    export default {
-        mixins: [commonUse, articles],
-        data() {
-            return {
-                maxMobile: 11,
-                mobile: '', // 手机号
-                pwd: '', // 密码
-                isCaptcha: false, // 是否需要验证码
-                captcha: '', // 输入的验证码
-                captchaUrl: '', // 验证码图片地址
-                btnb: 'coreshop-btn coreshop-btn-square coreshop-btn-c coreshop-btn-all', // 按钮bg
-                weixinBrowser: false, // 是否是微信浏览器
-                thirdPartyLogins: [] // 第三方登录列表
-            };
-        },
-        onLoad(options) {
-            if (options.invitecode) {
-                this.$db.set('invitecode', options.invitecode);
-            }
-            // 判断浏览器环境
-            this.weixinBrowser = this.$common.isWeiXinBrowser();
-
-            if (this.weixinBrowser) {
-                this.getAuths();
-            }
-            // #ifdef APP-PLUS || APP-PLUS-NVUE
-            this.getAppAuths();
-            // #endif
-        },
-        onShow() {
-            //if (this.$db.get('userToken')) {
-            //    this.$u.route({
-            //        type: 'switchTab',
-            //        url: '/pages/index/default/default'
-            //    });
-            //}
-        },
-        computed: {
-            // 动态更改登录按钮bg
-            loginButtonClass() {
-                return this.mobile && this.mobile.length === 11 && this.pwd ? this.btnb + ' coreshop-btn-b' : this.btnb;
-            },
-            logoImage() {
-                return this.$store.state.config.shopLogo;
-            },
-            getThirdLoginImg(key) {
-                return key => {
-                    if (key == 'Wxofficial') {
-                        return '/static/images/ic-wechat.png';
-                    } else if (key == 'weixin') {
-                        return '/static/images/ic-wechat.png';
-                    }
-                };
-            }
-        },
-        methods: {
-            // 验证手机号
-            rightMobile() {
-                let res = {};
-                if (!this.mobile) {
-                    res.status = false;
-                    res.msg = '请输入手机号';
-                } else if (!/^1[3456789]{1}\d{9}$/gi.test(this.mobile)) {
-                    res.status = false;
-                    res.msg = '手机号格式不正确';
-                } else if (!this.pwd) {
-                    res.status = false;
-                    res.msg = '请输入密码';
-                } else {
-                    res.status = true;
-                }
-                return res;
-            },
-            // 登录处理
-            loginHandler() {
-                if (this.mobile && this.mobile.length === 11 && this.pwd) {
-                    if (!this.rightMobile().status) {
-                        this.$u.toast(this.rightMobile().msg);
-                    } else {
-                        this.toLogin();
-                    }
-                }
-            },
-            // 获取验证码图片地址
-            getCaptchaUrl() {
-                this.captchaUrl = this.$config.apiBaseUrl + 'captcha.html';
-            },
-            // 去登录
-            toLogin() {
-                let _this = this;
-                let data = {
-                    mobile: this.mobile,
-                    password: this.pwd
-                };
-
-                if (this.isCaptcha) {
-                    data.captcha = this.captcha;
-                }
-
-                // 获取邀请码
-                let invicode = this.$db.get('invitecode');
-                if (invicode) {
-                    data.invitecode = invicode;
-                }
-
-                this.$u.api.login(data).then(res => {
-                    if (res.status) {
-                        this.$db.set('userToken', res.data);
-                        this.redirectHandler();
-                    } else {
-
-                        _this.$refs.uToast.show({
-                            title: res.msg, type: 'error', back: true, callback: function () {
-                                // 需要输入验证码 或者 验证码错误刷新
-                                if (res.data === 10013 || res.data === 10012) {
-                                    _this.isCaptcha = true;
-                                }
-                                // 登录需要验证码
-                                if (_this.isCaptcha) {
-                                    _this.getCaptchaUrl();
-                                }
-                            }
-                        })
-                    }
-                });
-            },
-            // 重定向跳转 或者返回上一个页面
-            redirectHandler() {
-                this.$db.del('invitecode');
-                this.toLoginSuccessHandleBack();
-            },
-            // 登录方式切换
-            selectLoginType() {
-                this.$u.route({ type: 'redirectTo', url: '/pages/login/loginBySMS/loginBySMS' });
-            },
-            // 获取第三方登录列表
-            getAuths() {
-                let data = {
-                    url: baseUrl + 'wap/pages/login/author/author'
-                };
-                this.$u.api.getTrustLogin(data).then(res => {
-                    if (res.status) {
-                        this.thirdPartyLogins = res.data;
-                    }
-                });
-            },
-            // 第三方登录授权
-            handleThirdLogin(url) {
-                this.$u.route({ type: 'redirectTo', url: '' });
-                let redirect = this.$store.state.redirectPage;
-                this.$db.set('redirectPage', redirect);
-                window.location.href = url;
-            },
-            //获取APP信任登录
-            getAppAuths() {
-                let _this = this;
-                _this.thirdPartyLogins = [];
-                uni.getProvider({
-                    service: 'oauth',
-                    success: function (res) {
-                        if (res.errMsg == 'getProvider:ok') {
-                            _this.thirdPartyLogins = res.provider;
-                        }
-                    }
-                });
-            },
-            //app第三方登录
-            handleThirdLoginApp(type) {
-                uni.showLoading({
-                    title: '加载中'
-                });
-                let _this = this;
-                uni.login({
-                    provider: type,
-                    success: function (loginRes) {
-                        // 获取用户信息
-                        uni.getUserInfo({
-                            provider: type,
-                            success: function (infoRes) {
-                                if (infoRes.errMsg == 'getUserInfo:ok') {
-                                    var data = {
-                                        user: infoRes.userInfo,
-                                        type: type
-                                    };
-                                    var invitecode = _this.$db.get('invitecode');
-                                    if (invitecode) {
-                                        data.invitecode = invitecode;
-                                    }
-                                    _this.$u.api.appTrustLogin(data).then(res => {
-                                        uni.hideLoading();
-                                        if (res.status) {
-                                            //判断是否返回了token，如果没有，就说明没有绑定账号，跳转到绑定页面
-                                            if (typeof res.data.token == 'undefined') {
-                                                _this.$u.route({ type: 'redirectTo', url: '/pages/login/loginBySMS/loginBySMS?sessionAuthId=' + res.data.sessionAuthId });
-                                            } else {
-                                                //登陆成功，设置token，并返回上一页
-                                                _this.$db.set('userToken', res.data.token);
-                                                uni.navigateBack({
-                                                    delta: 1
-                                                });
-                                                return false;
-                                            }
-                                        } else {
-                                            _this.$u.toast('登录失败，请重试');
-                                        }
-                                    });
-                                } else {
-                                    uni.hideLoading();
-                                    _this.$u.toast('登录失败，请重试');
-                                }
-                            }
-                        });
-                    }
-                });
-            },
-            goForgetpwd() {
-                this.$u.route('/pages/login/forget/forget');
-            }
-        }
-    };
-</script>
-
-<style lang="scss" scoped>
-    view { box-sizing: border-box; }
-    .content { /*  #ifdef  H5  */ height: calc(100vh - 90upx); /*  #endif  */ /*  #ifndef  H5  */ height: 100vh; /*  #endif  */ background-color: #fff; padding: 0upx 100upx; }
-    .login-t { text-align: center; padding: 50upx 0; }
-    .login-logo { width: 180upx; height: 180upx; border-radius: 20upx; background-color: #f8f8f8; }
-    .login-m { margin-bottom: 100upx; }
-    .login-item { border-bottom: 2upx solid #d0d0d0; overflow: hidden; padding: 10upx; font-size: 28upx; color: #333; margin-bottom: 30upx; display: flex; align-items: center; }
-    .login-item-input { display: inline-block; flex: 1; box-sizing: border-box; }
-    .codeimg { width: 210rpx; }
-    .login-item .coreshop-btn { display: inline-block; font-size: 28upx; border: none; width: 40%; padding: 0; line-height: 1.7; float: right; }
-    .login-b .coreshop-btn { color: #999; }
-    .coreshop-btn-b { color: #fff !important; }
-    .registered-item { overflow: hidden; width: 100%; }
-    .registered { float: right; }
-    .registered-item .coreshop-btn-square { color: #333; }
-    .third-block { justify-content: center; padding-top: 40upx; }
-    .third-item { width: 80upx; height: 80upx; background: $g2; border-radius: 50%; padding: 16upx; }
-        .third-item img { display: block; width: 100%; height: 100%; }
-
-    .login-other { margin-bottom: 40upx; }
-    .login-othe .item { padding: 20upx 0; }
-
-
-    .agreement { margin: 20rpx 0; text-align: center; }
-        .agreement .color-o { margin: 0 10rpx; }
-
-    .goforgetpwd { width: 100%; text-align: right; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.scss b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.scss
deleted file mode 100644
index 28df07a5e3e9b19154c958b1931eb515267b262b..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-.wrap { font-size: 28rpx;
-    .content { width: 600rpx; margin: 80rpx auto 0;
-
-        .title { text-align: left; font-size: 50rpx; font-weight: 500; margin-bottom: 100rpx; }
-        input { text-align: left; margin-bottom: 10rpx; padding-bottom: 6rpx; }
-        .tips { color: $u-type-info; margin-bottom: 60rpx; margin-top: 8rpx; }
-        .getCaptcha { background-color: rgb(253, 243, 208); color: $u-tips-color; border: none; font-size: 30rpx; padding: 12rpx 0;
-
-            &::after { border: none; }
-        }
-        .alternative { color: $u-tips-color; display: flex; justify-content: space-between; margin-top: 30rpx; }
-    }
-    .buttom {
-        .loginType { display: flex; padding: 350rpx 150rpx 150rpx 150rpx; justify-content: center;
-
-            .item { display: flex; flex-direction: column; align-items: center; color: $u-content-color; font-size: 28rpx; }
-        }
-
-        .hint { padding: 20rpx 40rpx; font-size: 22rpx; color: $u-tips-color;
-
-            .link { color: $u-type-warning; }
-        }
-    }
-}
-
-
-.wrapkey { padding: 80rpx 70rpx; }
-.box { margin: 30rpx 0; font-size: 30rpx; color: 555; }
-.key-input { padding: 30rpx 0;
-    text { display: none; }
-    .error { display: block; color: red; font-size: 30rpx; margin: 20rpx 0; }
-}
-.title { font-size: 50rpx; color: #333; }
-.key-input .tips { font-size: 30rpx; color: #333; margin-top: 20rpx; margin-bottom: 60rpx; }
-.captcha { color: $u-type-warning; font-size: 30rpx; margin-top: 40rpx;
-    .noCaptcha { display: block; }
-    .regain { display: block; }
-}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue
deleted file mode 100644
index 9fd9b0cf14134b2a502c5ae9dca03bc5ba4f5a54..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<template>
-    <view class="wrap">
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar title="短信登录"></u-navbar>
-        <view v-if="!showCodeBox">
-            <view class="top"></view>
-            <view class="content">
-                <view class="title">欢迎登录{{appTitle}}</view>
-                <input class="u-border-bottom" type="number" v-model="mobile" placeholder="请输入手机号" />
-                <view class="tips">未注册的手机号验证后自动创建平台账号</view>
-                <button @tap="submit" :style="[inputStyle]" class="getCaptcha">获取短信验证码</button>
-                <view class="alternative">
-                    <!--<view class="password">密码登录</view>-->
-                    <view class="issue">遇到问题</view>
-                </view>
-            </view>
-            <view class="buttom">
-                <view class="loginType">
-                    <!--#ifdef MP-WEIXIN-->
-                    <view class="wechat item" @tap="goLoginByGetPhoneNumber()">
-                        <view class="icon"><u-icon size="70" name="weixin-fill" color="rgb(83,194,64)"></u-icon></view>
-                        微信手机号绑定
-                    </view>
-                    <!--#endif-->
-                </view>
-                <view class="hint">
-                    登录即代表你同意
-                    <text @click="goUserAgreementPage()">用户协议</text>
-                    和
-                    <text @click="goUserPrivacyPolicy()">隐私政策</text>，
-                    并授权使用您的{{appTitle}}账号信息（如昵称、头像、收获地址）以便您统一管理
-                </view>
-            </view>
-        </view>
-        <view class="wrapkey" v-if="showCodeBox">
-            <view class="key-input">
-                <view class="title">输入验证码</view>
-                <view class="tips">验证码已发送至 +{{mobile}}</view>
-                <u-message-input :focus="true" :value="value" @change="change" @finish="finish" mode="bottomLine" :maxlength="maxlength"></u-message-input>
-                <text :class="{ error: error }">{{errorMsg}}</text>
-                <view class="captcha">
-                    <text :class="{ noCaptcha: verification }" @tap="noCaptcha">收不到验证码点这里</text>
-                    <text :class="{ regain: !verification }">{{ timer }}秒后重新获取验证码</text>
-                </view>
-            </view>
-        </view>
-
-    </view>
-</template>
-
-<script>
-    import { commonUse, articles } from '@/common/mixins/mixinsHelper.js';
-    export default {
-        mixins: [commonUse, articles],
-        data() {
-            return {
-                maxMobile: 11,
-                mobile: '', // 用户手机号
-                code: '', // 短信验证码
-                sessionAuthId: '', //授权id
-                verification: true, // 通过v-show控制显示获取还是倒计时
-                timer: 60, // 定义初始时间为60s
-                btnb: 'coreshop-btn coreshop-btn-square coreshop-btn-c coreshop-btn-all', //按钮背景
-                type: '', // 有值是第三方登录账号绑定
-                isWeixinBrowser: this.$common.isWeiXinBrowser(),
-                showCodeBox: false,
-
-                maxlength: 6,
-                value: '',
-                error: false,
-                errorMsg: '验证码错误，请重新输入',
-            };
-        },
-        onLoad(option) {
-            if (option.sessionAuthId) {
-                this.sessionAuthId = option.sessionAuthId;
-            }
-        },
-        computed: {
-            logoImage() {
-                return this.$store.state.config.shopLogo
-            },
-            appTitle() {
-                return this.$store.state.config.shopName;
-            },
-            inputStyle() {
-                let style = {};
-                if (this.mobile) {
-                    style.color = "#fff";
-                    style.backgroundColor = this.$u.color['warning'];
-                }
-                return style;
-            },
-            // 验证手机号
-            rightMobile() {
-                let res = {};
-                if (!this.mobile) {
-                    res.status = false;
-                    res.msg = '请输入手机号';
-                } else if (!this.$u.test.mobile(this.mobile)) {
-                    res.status = false;
-                    res.msg = '手机号格式不正确';
-                } else {
-                    res.status = true;
-                }
-                return res;
-            },
-            // 动态计算发送验证码按钮样式
-            sendCodeBtn() {
-                let btn = 'coreshop-btn coreshop-btn-g';
-                if (this.mobile.length === this.maxMobile && this.rightMobile.status) {
-                    return btn + ' coreshop-btn-b';
-                } else {
-                    return btn;
-                }
-            },
-            // 动态更改登录按钮bg
-            regButtonClass() {
-                return this.mobile && this.mobile.length === this.maxMobile && this.code ? this.btnb + ' coreshop-btn-b' : this.btnb;
-            },
-            logoImage() {
-                return this.$store.state.config.shopLogo;
-            }
-        },
-        onShow() {
-            let _this = this;
-            let userToken = _this.$db.get('userToken');
-            if (userToken) {
-                this.$u.route({
-                    type: 'switchTab',
-                    url: '/pages/index/member/member'
-                });
-                return true;
-            }
-            _this.timer = parseInt(_this.$db.get('timer'));
-            if (_this.timer != null && _this.timer > 0) {
-                _this.countDown();
-                _this.verification = false;
-            }
-        },
-        methods: {
-            goLoginByGetPhoneNumber() {
-                this.$u.route({ type: 'redirectTo', url: '/pages/login/loginByGetPhoneNumber/loginByGetPhoneNumber?sessionAuthId=' + this.sessionAuthId });
-            },
-            submit() {
-                if (this.$u.test.mobile(this.mobile)) {
-                    this.sendCode();
-                } else {
-                    this.$u.toast('请输入合法的手机号码!');
-                }
-            },
-            // 收不到验证码选择时的选择
-            noCaptcha() {
-                var _this = this;
-                uni.showActionSheet({
-                    itemList: ['重新获取验证码'],
-                    success: function (res) {
-                        _this.sendCode();
-                    },
-                    fail: function (res) {
-                        this.$u.toast('重发失败!');
-                    }
-                });
-            },
-            // change事件侦听
-            change(value) {
-                console.log('change', value);
-            },
-            // 输入完验证码最后一位执行
-            finish(value) {
-                this.code = value;
-                // #ifdef H5|APP-PLUS|APP-PLUS-NVUE
-                if (this.sessionAuthId) {
-                    this.toBind();
-                } else {
-                    this.login();
-                }
-                // #endif
-                // #ifdef MP
-                this.showTopTips();
-                // #endif
-                console.log('finish', value);
-            },
-            // 发送短信验证码
-            sendCode() {
-                if (!this.rightMobile.status) {
-                    this.$u.toast(this.rightMobile.msg);
-                } else {
-                    uni.showToast({ title: '发送中...', icon: 'loading' })
-                    setTimeout(() => {
-                        uni.hideToast();
-                        this.$u.api.sms({ mobile: this.mobile, code: 'login' }).then(res => {
-                            if (res.status) {
-                                this.showCodeBox = true;
-                                this.timer = 60;
-                                this.verification = false;
-                                this.$refs.uToast.show({ title: res.msg, type: 'success' });
-                                this.countDown(); // 执行验证码计时
-                            } else {
-                                this.$u.toast(res.msg);
-                            }
-                        });
-                    }, 1000);
-                }
-            },
-            // 验证码倒计时
-            countDown() {
-                let auth_timer = setInterval(() => {
-                    // 定时器设置每秒递减
-                    this.timer--; // 递减时间
-                    uni.setStorage({
-                        key: 'timer',
-                        data: this.timer,
-                        success: function () { }
-                    });
-                    if (this.timer <= 0) {
-                        this.verification = true; // 60s时间结束还原v-show状态并清除定时器
-                        clearInterval(auth_timer);
-                    }
-                }, 1000);
-            },
-            // 登录
-            login() {
-                var _this = this;
-                if (!_this.rightMobile.status) {
-                    _this.$u.toast(_this.rightMobile.msg);
-                } else {
-                    // 短信验证码登录
-                    if (!_this.code) {
-                        _this.$u.toast('请输入短信验证码!');
-                    } else {
-                        let data = {
-                            mobile: _this.mobile,
-                            code: _this.code
-                        };
-
-                        let invicode = _this.$db.get('invitecode');
-                        if (invicode) {
-                            data.invitecode = invicode;
-                        }
-
-                        _this.$u.api.smsLogin(data).then(res => {
-                            if (res.status) {
-                                this.$db.set('userToken', res.data.token);
-                                _this.redirectHandler(res.msg);
-                            } else {
-                                _this.$u.toast(res.msg);
-                                _this.error = true;
-                                _this.errorMsg = res.msg;
-                            }
-                        });
-                    }
-                }
-            },
-            // 重定向跳转 或者返回上一个页面
-            redirectHandler(msg) {
-                let _this = this;
-                this.$refs.uToast.show({
-                    title: msg, type: 'success', callback: function () {
-                        _this.$db.set('timer', 0);
-                        _this.$db.del('invitecode');
-                        _this.toLoginSuccessHandleBack();
-                    }
-                })
-            },
-            // 跳转到普通登录
-            toLogin() {
-                uni.navigateTo({
-                    url: '../../login/login/loginByAccount'
-                });
-            },
-            //提交按钮
-            showTopTips: function () {
-                let _this = this;
-                if (_this.mobile == '') {
-                    _this.$u.toast('请输入手机号码');
-                    return false;
-                }
-                if (this.code == '') {
-                    _this.$u.toast('请输入验证码');
-                    return false;
-                }
-                //if (_this.sessionAuthId == 0) {
-                //    this.$refs.uToast.show({ title: '登录失败，请稍后再试', type: 'error', back: true });
-                //    return false;
-                //}
-                var platform = 2;
-                //1就是h5登陆（h5端和微信公众号端），2就是微信小程序登陆，3是支付宝小程序，4是app，5是pc
-                // #ifdef MP-ALIPAY
-                platform = 3;
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                platform = 4;
-                // #endif
-                var data = {
-                    mobile: _this.mobile,
-                    code: _this.code,
-                    platform: platform, //平台id，标识是小程序登陆的
-                    sessionAuthId: _this.sessionAuthId //微信小程序接口存不了session，所以要绑定的id只能传到前台
-                };
-                //有推荐码的话，带上
-                var invitecode = _this.$db.get('invitecode');
-                if (invitecode) {
-                    data.invitecode = invitecode;
-                }
-                _this.$u.api.smsLogin(data).then(res => {
-                    if (res.status) {
-                        _this.$db.set('userToken', res.data.token);
-                        _this.redirectHandler(res.msg);
-                    } else {
-                        //报错了
-                        _this.$u.toast(res.msg);
-                        _this.error = true;
-                        _this.errorMsg = res.msg;
-                    }
-                });
-            },
-            // 公众号第三方登录账号绑定
-            toBind() {
-                if (this.mobile == '') {
-                    this.$u.toast('请输入手机号码');
-                    return false;
-                }
-                if (this.code == '') {
-                    this.$u.toast('请输入验证码');
-                    return false;
-                }
-
-                let data = {
-                    mobile: this.mobile,
-                    code: this.code,
-                    sessionAuthId: this.sessionAuthId
-                };
-
-                // 获取邀请码
-                let invicode = this.$db.get('invitecode');
-                if (invicode) {
-                    data.invitecode = invicode;
-                }
-
-                this.$u.api.smsLogin(data).then(res => {
-                    if (res.status) {
-                        this.$db.set('userToken', res.data);
-                        this.redirectHandler(res.msg);
-                    } else {
-                        this.$u.toast(res.msg);
-                        this.error = true;
-                        this.errorMsg = res.msg;
-                    }
-                });
-            },
-            // 切换登录方式
-            selectLoginType() {
-                this.$u.route({ type: 'redirectTo', url: '/pages/login/loginByAccount/loginByAccount' });
-            },
-            goForgetpwd() {
-                this.$u.route('/pages/login/forget/forget');
-            }
-        }
-    };
-</script>
-
-<style lang="scss" scoped>
-    @import 'loginBySMS.scss';
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
index ad4e5eb7bff75ad4bb0a37bfe387bc0e5db09968..f530a1e6ba83718a5e9c11656c01ebbc3659b30b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
@@ -69,18 +69,8 @@
                     let pages = getCurrentPages();//当前页
                     let beforePage = pages[pages.length - 2];//上个页面
 
-                    // #ifdef MP-ALIPAY || MP-TOUTIAO
-                    this.$db.set('addressUserShip', data, true);
-                    // #endif
-
-                    // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                    this.$store.commit("userShip", data)
-                    // #endif
-
-                    // #ifdef MP-WEIXIN
                     beforePage.$vm.userShip = data;
                     beforePage.$vm.params.areaId = data.areaId;
-                    // #endif
 
                     uni.navigateBack({
                         delta: 1
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss
index 4f15d1756dad3aaea633687d211dfc528d741869..435c84ea57a3ad3bca6d47844f3ec6605ca2c7c0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss
@@ -16,13 +16,6 @@
 .cell-header { padding: 10rpxpx 0; margin: 0; margin-left: 20rpx; font-size: 28rpx; font-weight: 550; }
 .mr5 { margin-right: 10rpx; }
 .inputStyle { display: inline-block; border: 2rpx solid #ccc; height: 13rpx; line-height: 13rpx; width: 60rpx; text-align: center; font-size: 24rpx; vertical-align: middle; }
-/* #ifdef MP-ALIPAY */
-
-/* #endif */
-/* #ifdef MP-TOUTIAO */
-.goods-item-c { height: 1.5rem; }
-.goods-buy { height: 100%; }
-/* #endif */
 .refund-price { border-bottom: none; }
 .refund-tip { padding: 0 26rpx 10rpx; text-align: right; }
 
@@ -42,4 +35,4 @@
 
 uni-checkbox.checkboxNo .uni-checkbox-input { background-color: #e1e1e1 !important; border-color: #e1e1e1 !important; }
 
-.icon { width: 50upx; height: 50upx; /* #ifdef MP-ALIPAY */ background-size: 100% 100%; /* #endif */ }
+.icon { width: 50upx; height: 50upx; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
index f62b8731a890f98fda7b30b297171bc38e62a2eb..072da8c45b70f20aef7122a78c1f33d8fa57c1c0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
@@ -64,7 +64,6 @@
                             </view>
                             <view class='coreshop-cell-item-ft'>
                                 <view class="uni-form-item uni-column invoice-type">
-                                    <!-- #ifndef MP-ALIPAY -->
                                     <radio-group class="uni-list" @change="radioChange">
                                         <label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in typeList" :key="index">
                                             <view class="invoice-type-icon">
@@ -79,21 +78,6 @@
                                             </view>
                                         </label>
                                     </radio-group>
-                                    <!-- #endif -->
-                                    <!-- #ifdef MP-ALIPAY -->
-                                    <radio-group class="uni-list" @change="radioChange">
-                                        <label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in typeListByAli" :key="index">
-                                            <view class="invoice-type-icon">
-                                                <radio class="a-radio" :id="item.name" :value="item.value" :checked="item.checked" :disabled="item.disabled"></radio>
-                                            </view>
-                                            <view class="invoice-type-c">
-                                                <label class="label-2-text" :for="item.name">
-                                                    <text>{{item.name}}</text>
-                                                </label>
-                                            </view>
-                                        </label>
-                                    </radio-group>
-                                    <!-- #endif -->
                                 </view>
                             </view>
                         </view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
index ab3a5359cd3d5059e2f1aae80c4eed54c932facd..eac3dda08b9c739f9efd44d87bf0d3c5ed2010ef 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
@@ -15,26 +15,9 @@
                         <view class="u-font-xl">{{totalGoods}}</view>
                         <text class='coreshop-item-text'>全部宝贝</text>
                     </view>
-                    <!-- #ifdef MP-TOUTIAO -->
-                    <view class='coreshop-item' @click="createPoster()">
-                        <u-icon name="star" size="36" label="分享店铺" label-pos="bottom" margin-top="15"></u-icon>
-                    </view>
-                    <!-- #endif -->
-                    <!-- #ifndef MP-TOUTIAO -->
-                    <view class='coreshop-item' @click="openPopup()">
-                        <u-icon name="star" size="36" label="收藏本店" label-pos="bottom" margin-top="15"></u-icon>
-                    </view>
-                    <!-- #endif -->
-                    <!-- #ifndef MP-WEIXIN -->
                     <view class='coreshop-item' @click="createPoster()">
                         <u-icon name="grid" size="36" label="二维码" label-pos="bottom" margin-top="15"></u-icon>
                     </view>
-                    <!-- #endif -->
-                    <!-- #ifdef MP-WEIXIN -->
-                    <view class='coreshop-item' @click="createPoster()">
-                        <u-icon name="grid" size="36" label="二维码" label-pos="bottom" margin-top="15"></u-icon>
-                    </view>
-                    <!-- #endif -->
                 </view>
             </view>
             <view class="u-padding-15 u-margin-bottom-15 coreshop-bg-white u-border-bottom" @tap="goSearch()">
@@ -44,15 +27,7 @@
             <u-popup mode="top" v-model="lvvpopref">
                 <view class="collect-pop">
                     <image v-if="isWeixinBrowser" src="/static/images/distribution/wxh5.png" mode="widthFix"></image>
-                    <!-- #ifdef MP-WEIXIN -->
                     <image src="/static/images/distribution/wxxcx.png" mode="widthFix"></image>
-                    <!-- #endif -->
-                    <!-- #ifdef H5 -->
-                    <view class="h5-tip color-f fsz38">
-                        <view>请将此页面添加浏览器书签</view>
-                        <view>方便下次浏览</view>
-                    </view>
-                    <!-- #endif -->
                 </view>
             </u-popup>
         </view>
@@ -148,18 +123,8 @@
             this.getGoods();
         },
         mounted() {
-            // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-            window.addEventListener('scroll', this.handleScroll)
-            // #endif
         },
         updated() {
-            // #ifndef MP-WEIXIN || MP-TOUTIAO || MP-ALIPAY
-            // 获取上半部分的整体高度
-            this.$nextTick(() => {
-                let h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; //浏览器高度
-                this.top_height = this.$refs.myStore.$el.clientHeight;
-            })
-            // #endif
         },
         methods: {
             // 显示modal弹出框
@@ -174,7 +139,6 @@
             goSearch() {
                 let pages = getCurrentPages();
                 let prevPage = pages[pages.length - 2];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
                 if (prevPage && prevPage.route) {
                     let search_flag = prevPage.route;
                     if (search_flag == 'pages/search/search') {
@@ -187,21 +151,6 @@
                 } else {
                     this.$u.route('/pages/search/search');
                 }
-                // #endif
-                // #ifdef MP-ALIPAY
-                if (prevPage && prevPage.__proto__.route) {
-                    let search_flag = prevPage.__proto__.route;
-                    if (search_flag == 'pages/search/search') {
-                        uni.navigateBack({
-                            delta: 1
-                        });
-                    } else {
-                        this.$u.route('/pages/search/search');
-                    }
-                } else {
-                    this.$u.route('/pages/search/search');
-                }
-                // #endif
             },
 
             //取得商品数据
@@ -265,25 +214,7 @@
                     page: 11,
                 }
                 let pageUrl = 'pages/share/jump/jump';
-                // #ifdef H5
-                data.client = 1;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-WEIXIN
                 data.client = 2;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 3;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                data.client = 5;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 6;
-                // #endif
                 let userToken = this.$db.get('userToken')
                 if (userToken && userToken != '') {
                     data.token = userToken
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
index 80affeff83dc10d6dfd0f98877d91f5f83acd6f0..1485399d3cdb0494456782b1c6f5fe47ecdd0d25 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
@@ -184,25 +184,8 @@
                     page: 11,
                 }
                 let pageUrl = 'pages/share/jump/jump';
-                // #ifdef H5
-                data.client = 1;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-WEIXIN
                 data.client = 2;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 3;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                data.client = 5;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 6;
-                // #endif
+
                 let userToken = this.$db.get('userToken')
                 if (userToken && userToken != '') {
                     data.token = userToken
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue
index 556741df65f0ef2191b35a8e0d1899bcc9983958..49722058a9b7aa8efefef6e4d2a16376c5420ad5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue
@@ -121,17 +121,7 @@
                 let pages = getCurrentPages();//当前页
                 let beforePage = pages[pages.length - 2];//上个页面
 
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                beforePage.cardInfo = this.cards[index]
-                // #endif
-
-                // #ifdef MP-WEIXIN
                 beforePage.$vm.cardInfo = this.cards[index]
-                // #endif
-
-                // #ifdef MP-ALIPAY || MP-TOUTIAO
-                this.$db.set('userCardInfo', this.cards[index], true);
-                // #endif
 
                 uni.navigateBack({
                     delta: 1
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.scss
index ebbafd29824f06967de42a3c050b4bd01a46f518..95b8b371eb211fdff1bdfbaf87a8b8ef37d2f449 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.scss
@@ -4,8 +4,4 @@
 .withdrawcash-input { display: flex; align-items: center; font-size: 50upx; border-bottom: 2upx solid #e8e8e8; padding-bottom: 20upx; width: 95%; max-width: 95%;
     text { font-size: 40upx; }
     input { display: inline-block; min-width: 500upx; padding-left: 20upx; }
-}
-
-/* #ifdef MP-ALIPAY */
-.coreshop-cell-hd-title input { font-size: 24px; height: 18px; }
-/* #endif */
+}
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue
index 0a2640d7200b1b82acc9d66b61ca55c0571c0113..4e2b5aa0c0219d09e594c72d77e395d911c78a06 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue
@@ -75,13 +75,6 @@
             this.userInfo()
         },
         onShow() {
-            // #ifdef MP-ALIPAY || MP-TOUTIAO
-            let userCardInfo = this.$db.get('userCardInfo', true);
-            if (userCardInfo) {
-                this.cardInfo = userCardInfo;
-                this.$db.del('userCardInfo', true);
-            }
-            // #endif
         },
         computed: {
             userbankCard() {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
index 07dc3621eccc35ba48695edb7b79aea3aa102762..90470ffcd19055371ab68eb7e3d9c60e4db500ef 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
@@ -15,26 +15,9 @@
                         <text class="u-font-xl">{{totalGoods}}</text>
                         <text class='coreshop-item-text'>全部宝贝</text>
                     </view>
-                    <!-- #ifdef MP-TOUTIAO -->
-                    <view class='coreshop-item' @click="createPoster()">
-                        <u-icon name="star" size="36" label="分享店铺" label-pos="bottom" margin-top="15"></u-icon>
-                    </view>
-                    <!-- #endif -->
-                    <!-- #ifndef MP-TOUTIAO -->
-                    <view class='coreshop-item' @click="openPopup()">
-                        <u-icon name="star" size="36" label="收藏本店" label-pos="bottom" margin-top="15"></u-icon>
-                    </view>
-                    <!-- #endif -->
-                    <!-- #ifndef MP-WEIXIN -->
                     <view class='coreshop-item' @click="createPoster()">
                         <u-icon name="grid" size="36" label="二维码" label-pos="bottom" margin-top="15"></u-icon>
                     </view>
-                    <!-- #endif -->
-                    <!-- #ifdef MP-WEIXIN -->
-                    <view class='coreshop-item' @click="createPoster()">
-                        <u-icon name="grid" size="36" label="二维码" label-pos="bottom" margin-top="15"></u-icon>
-                    </view>
-                    <!-- #endif -->
                 </view>
             </view>
 
@@ -45,15 +28,7 @@
             <u-popup mode="top" v-model="lvvpopref">
                 <view class="collect-pop">
                     <image v-if="isWeixinBrowser" src="/static/images/distribution/wxh5.png" mode="widthFix"></image>
-                    <!-- #ifdef MP-WEIXIN -->
                     <image src="/static/images/distribution/wxxcx.png" mode="widthFix"></image>
-                    <!-- #endif -->
-                    <!-- #ifdef H5 -->
-                    <view class="h5-tip color-f fsz38">
-                        <view>请将此页面添加浏览器书签</view>
-                        <view>方便下次浏览</view>
-                    </view>
-                    <!-- #endif -->
                 </view>
             </u-popup>
         </view>
@@ -148,18 +123,8 @@
             this.getGoods();
         },
         mounted() {
-            // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-            window.addEventListener('scroll', this.handleScroll)
-            // #endif
         },
         updated() {
-            // #ifndef MP-WEIXIN || MP-TOUTIAO || MP-ALIPAY
-            // 获取上半部分的整体高度
-            this.$nextTick(() => {
-                let h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; //浏览器高度
-                this.top_height = this.$refs.myStore.$el.clientHeight;
-            })
-            // #endif
         },
         methods: {
             // 显示modal弹出框
@@ -174,7 +139,6 @@
             goSearch() {
                 let pages = getCurrentPages();
                 let prevPage = pages[pages.length - 2];
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
                 if (prevPage && prevPage.route) {
                     let search_flag = prevPage.route;
                     if (search_flag == 'pages/search/search') {
@@ -187,21 +151,6 @@
                 } else {
                     this.$u.route('/pages/search/search');
                 }
-                // #endif
-                // #ifdef MP-ALIPAY
-                if (prevPage && prevPage.__proto__.route) {
-                    let search_flag = prevPage.__proto__.route;
-                    if (search_flag == 'pages/search/search') {
-                        uni.navigateBack({
-                            delta: 1
-                        });
-                    } else {
-                        this.$u.route('/pages/search/search');
-                    }
-                } else {
-                    this.$u.route('/pages/search/search');
-                }
-                // #endif
             },
 
             //取得商品数据
@@ -266,25 +215,8 @@
                 let pages = getCurrentPages()
                 let page = pages[pages.length - 1]
                 let pageUrl = 'pages/share/jump/jump';
-                // #ifdef H5
-                data.client = 1;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-WEIXIN
                 data.client = 2;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 3;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                data.client = 5;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 6;
-                // #endif
+
                 let userToken = this.$db.get('userToken')
                 if (userToken && userToken != '') {
                     data.token = userToken
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
index 455e1e573ee3cabc24536f99487ec6c2c6c714ce..68f1c8b188c21927208ba13e838d00fca3166822 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
@@ -183,25 +183,8 @@
                     page: 4,
                 }
                 let pageUrl = 'pages/share/jump/jump';
-                // #ifdef H5
-                data.client = 1;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-WEIXIN
                 data.client = 2;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 3;
-                data.url = pageUrl;
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                data.client = 5;
-                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 6;
-                // #endif
+
                 let userToken = this.$db.get('userToken')
                 if (userToken && userToken != '') {
                     data.token = userToken
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue
index 6e8d75cad8e67e45430d0232e9c5dbad012d1376..ccde8d717d8ba8783702e920cc0087c1f361d803 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue
@@ -27,16 +27,9 @@
                 <view class='invite-w-btn' @click="setMyInvite">提交</view>
             </view>
             <view class='invite-btn'>
-                <!-- #ifdef MP-WEIXIN -->
                 <button class='share coreshop-btn' open-type="share">
                     <u-icon name="weixin-fill" size="90" top="4"></u-icon>
                 </button>
-                <!-- #endif -->
-                <!-- #ifdef H5 -->
-                <button class='share coreshop-btn' @click="copyUrl()" v-show="!ifwx">
-                    <u-icon name="zhuanfa" size="90" top="4"></u-icon>
-                </button>
-                <!-- #endif -->
                 <button class='share coreshop-btn' @click="createPoster()">
                     <u-icon name="moments" size="90" top="4"></u-icon>
                 </button>
@@ -46,10 +39,7 @@
 
 </template>
 <script>
-    import { h5Url } from '@/common/setting/constVarsHelper.js'
-    // #ifdef MP-TOUTIAO
-    import { ttPlatform } from '@/common/setting/constVarsHelper.js'
-    // #endif
+
     export default {
         data() {
             return {
@@ -118,22 +108,8 @@
                 if (userToken) {
                     data.token = userToken
                 }
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                data.client = 1;
-                data.url = h5Url + 'pages/share/jump/jump'
-                // #endif
-                // #ifdef MP-WEIXIN
                 data.client = 2;
                 data.url = 'pages/share/jump/jump'
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 4;
-                data.url = 'pages/share/jump/jump'
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 6;
-                data.url = 'pages/share/jump/jump'
-                // #endif
                 this.$u.api.share(data).then(res => {
                     if (res.status) {
                         this.$u.route('/pages/share/sharePoster/sharePoster?poster=' + encodeURIComponent(res.data))
@@ -152,22 +128,8 @@
                 if (userToken) {
                     data.token = userToken
                 }
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                data.client = 1;
-                data.url = h5Url + 'pages/share/jump/jump'
-                // #endif
-                // #ifdef MP-WEIXIN
                 data.client = 2;
                 data.url = 'pages/share/jump/jump'
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data.client = 4;
-                data.url = '/pages/share/jump/jump'
-                // #endif
-                // #ifdef MP-ALIPAY
-                data.client = 6;
-                data.url = '/pages/share/jump/jump'
-                // #endif
                 let _this = this;
                 this.$u.api.share(data).then(res => {
                     if (res.status) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
index 4a2f8e4e494ee5afe6578f807baf671b8b487e7a..5b45e45f3e89a9037d91b8e19a23f3ee2614eadb 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
@@ -578,15 +578,7 @@
                                     let pages = getCurrentPages(); // 当前页
                                     let beforePage = pages[pages.length - 2]; // 上个页面
                                     if (beforePage !== undefined && beforePage.route === 'pages/member/order/index/index') {
-                                        // #ifdef MP-WEIXIN
                                         beforePage.$vm.isReload = true
-                                        // #endif
-                                        // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                                        beforePage.isReload = true
-                                        // #endif
-                                        // #ifdef MP-ALIPAY || MP-TOUTIAO
-                                        _this.$db.set('orderUserShip', true, true);
-                                        // #endif
                                     }
                                     _this.orderDetail()
                                 }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.scss
index 9eb9eac4bbd89d2e383df8f74422eb94defc8b0d..bb8944c7e97dc62db40091103bfdb409a00a9906 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.scss
@@ -4,7 +4,7 @@
 .evaluate-c-t { width: 100%; height: 140rpx; }
     .evaluate-c-t textarea { width: 100%; height: 100%; font-size: 26rpx; padding: 10rpx; }
 .evaluate-c-b { overflow: hidden; }
-.upload-img { width: 146rpx; height: 146rpx; margin: 14rpx; text-align: center; color: #999999; font-size: 22rpx; border: 2rpx solid #E1E1E1; /* #ifdef MP-ALIPAY */ border-top: 8rpx solid #E1E1E1; /* #endif */ border-radius: 4rpx; display: inline-block; float: left; padding: 24rpx 0; }
+.upload-img { width: 146rpx; height: 146rpx; margin: 14rpx; text-align: center; color: #999999; font-size: 22rpx; border: 2rpx solid #E1E1E1; border-radius: 4rpx; display: inline-block; float: left; padding: 24rpx 0; }
 .goods-img-item { width: 174rpx; height: 174rpx; padding: 14rpx; float: left; position: relative; }
     .goods-img-item:nth-child(4n) { margin-right: 0; }
     .goods-img-item image { width: 100%; height: 100%; }
@@ -12,7 +12,7 @@
 .evaluate-num-t { color: #333; font-size: 28rpx; margin-bottom: 20rpx; }
 .coreshop-bottomBox .coreshop-btn { width: 100%; }
 
-.icon { width: 50rpx; height: 50rpx; /* #ifdef MP-ALIPAY */ background-size: 100% 100%; /* #endif */ }
+.icon { width: 50rpx; height: 50rpx;  }
 
 
 .coreshop-card-box { padding: 0; box-shadow: 0 0 14.54rpx #f1f1f1; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue
index bb113d81352931f8210cfb6cf7869d87c0c66876..4e9092642bc57f1df8251e228127726bcf671e89 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue
@@ -178,28 +178,12 @@
                                 let beforePage = pages[pages.length - 2]; // 上个页面
 
                                 if (beforePage !== undefined && beforePage.route === 'pages/member/order/index/index') {
-                                    // #ifdef MP-WEIXIN
                                     beforePage.$vm.isReload = true
-                                    // #endif
-                                    // #ifdef H5
-                                    beforePage.isReload = true
-                                    // #endif
-                                    // #ifdef MP-ALIPAY || MP-TOUTIAO
-                                    _this.$db.set('orderUserEvaluate', true, true);
-                                    // #endif
                                 }
 
                                 let before = pages[pages.length - 3]; // 上个页面
                                 if (before !== undefined && before.route === 'pages/member/order/index/index') {
-                                    // #ifdef MP-WEIXIN
                                     before.$vm.isReload = true
-                                    // #endif
-                                    // #ifdef H5
-                                    before.isReload = true
-                                    // #endif
-                                    // #ifdef MP-ALIPAY || MP-TOUTIAO
-                                    _this.$db.set('orderUserEvaluate', true, true);
-                                    // #endif
                                 }
                                 uni.navigateBack({
                                     delta: 1,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
index cbefd884dc2c3b953f597cdc4b1ded610fe31141..a31f5a97bd2b29e347a5f6f67f96908b963d09e5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
@@ -100,18 +100,6 @@
             }
         },
         onShow() {
-            // #ifdef MP-ALIPAY || MP-TOUTIAO
-            let orderUserShip = this.$db.get('orderUserShip', true);
-            if (orderUserShip) {
-                this.isReload = orderUserShip;
-                this.$db.del('orderUserShip', true);
-            }
-            let orderUserEvaluate = this.$db.get('orderUserEvaluate', true);
-            if (orderUserEvaluate) {
-                this.isReload = orderUserEvaluate;
-                this.$db.del('orderUserEvaluate', true);
-            }
-            // #endif
         },
         methods: {
             // tab点击切换
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue
index e1a4763b8e34cdf2980497208b550ddfe186ced2..14cd5d59d0add5457cc1a1458cd3928c10488c3e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue
@@ -30,31 +30,9 @@
             <!-- 弹出层 -->
             <view class="u-padding-10">
                 <u-popup mode="bottom" v-model="shareBox" ref="share">
-                    <!-- #ifdef H5 -->
-                    <shareByH5 :shareType='3' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId"
-                               :shareImg="goodsInfo.image_url" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref"
-                               @close="closeShare()"></shareByH5>
-                    <!-- #endif -->
-                    <!-- #ifdef MP-WEIXIN -->
                     <shareByWx :shareType='3' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId"
                                :shareImg="goodsInfo.image_url" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref"
                                @close="closeShare()"></shareByWx>
-                    <!-- #endif -->
-                    <!-- #ifdef MP-ALIPAY -->
-                    <shareByAli :shareType='3' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId"
-                                :shareImg="goodsInfo.image_url" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref"
-                                @close="closeShare()"></shareByAli>
-                    <!-- #endif -->
-                    <!-- #ifdef MP-TOUTIAO -->
-                    <shareByTt :shareType='3' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId"
-                               :shareImg="goodsInfo.image_url" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref"
-                               @close="closeShare()"></shareByTt>
-                    <!-- #endif -->
-                    <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-                    <shareByApp :shareType='3' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId"
-                                :shareImg="goodsInfo.image_url" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref"
-                                @close="closeShare()"></shareByApp>
-                    <!-- #endif -->
                 </u-popup>
             </view>
 
@@ -91,40 +69,11 @@
 </template>
 
 <script>
-    // #ifdef H5
-    import shareByH5 from '@/components/coreshop-share/shareByh5.vue'
-    // #endif
-    // #ifdef MP-WEIXIN
     import shareByWx from '@/components/coreshop-share/shareByWx.vue'
-    // #endif
-    // #ifdef MP-ALIPAY
-    import shareByAli from '@/components/coreshop-share/shareByAli.vue'
-    // #endif
-    // #ifdef MP-TOUTIAO
-    import shareByTt from '@/components/coreshop-share/shareByTt.vue'
-    // #endif
-    // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import shareByApp from '@/components/coreshop-share/shareByApp.vue'
-    // #endif
 
     export default {
         components: {
-            // #ifdef H5
-            shareByH5,
-            // #endif
-            // #ifdef MP-WEIXIN
-            shareByWx,
-            // #endif
-            // #ifdef MP-ALIPAY
-            shareByAli,
-            // #endif
-            // #ifdef MP-TOUTIAO
-            shareByTt,
-            // #endif
-            // #ifdef APP-PLUS || APP-PLUS-NVUE
-            shareByApp,
-            // #endif
-            // spec
+            shareByWx
         },
         data() {
             return {
@@ -153,18 +102,8 @@
             let pages = getCurrentPages()
             let pre = pages[pages.length - 2]
             if (typeof pre != 'undefined') {
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                teamInfo = pre.teamInfo
-                orderInfo = pre.orderInfo
-                // #endif
-                // #ifdef MP-WEIXIN
                 teamInfo = pre.$vm.teamInfo
                 orderInfo = pre.$vm.orderInfo
-                // #endif
-                // #ifdef MP-ALIPAY || MP-TOUTIAO
-                teamInfo = pre.data.teamInfo;
-                orderInfo = pre.data.orderInfo
-                // #endif
             }
             if (teamInfo && orderInfo) {
                 this.teamInfo = teamInfo;
@@ -180,13 +119,7 @@
             shareHref() {
                 let pages = getCurrentPages()
                 let page = pages[pages.length - 1]
-                // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
                 return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?scene=' + this.query;
-                // #endif
-
-                // #ifdef MP-ALIPAY
-                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?scene=' + this.query;
-                // #endif
             }
         },
         methods: {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/index/index.vue
index 7ec78c17092751357349d73b152f0861724fcaaf..a38fb3f4de252aac305dd99ce210aa8249601f97 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/index/index.vue
@@ -13,13 +13,12 @@
             <u-cell-item icon="order" title="用户协议" @click="goUserAgreementPage()"></u-cell-item>
             <u-cell-item icon="eye-off" title="隐私政策" @click="goUserPrivacyPolicy()"></u-cell-item>
             <u-cell-item icon="trash" title="清除缓存" @click="clearCache"></u-cell-item>
-            <u-cell-item icon="account" title="切换账号" @click="changeAccount"></u-cell-item>
         </u-cell-group>
 
         <!--按钮-->
         <view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
             <view class="flex u-padding-20 flex-direction">
-                <u-button :custom-style="customStyle" type="error" size="medium" @click="logOff">退出登录</u-button>
+                <u-button :custom-style="customStyle" type="error" size="medium" @click="logOff">重新登录</u-button>
             </view>
         </view>
     </view>
@@ -106,13 +105,6 @@
                     })
                 })
             },
-            // 切换账号
-            changeAccount() {
-                this.$common.modelShow('切换', '确认切换登录账号吗?', () => {
-                    this.$db.del('userToken')
-                    this.$u.route({url: '/pages/login/loginBySMS/loginBySMS',});
-                })
-            }
         }
     }
 </script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue b/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue
index 26151b9f78eac9442b1b14b220961615f44ebed1..c89c530a7aee4cba3e7c8cb89eaca51e32af244b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue
@@ -84,21 +84,7 @@
 
         <!--支付方式-->
         <view class="content">
-            <!-- #ifdef H5 -->
-            <payments-by-h5 :orderId="orderId" :recharge="recharge" :type="type" :uid="userInfo.id"></payments-by-h5>
-            <!-- #endif -->
-            <!-- #ifdef MP-WEIXIN -->
             <payments-by-wx :orderId="orderId" :recharge="recharge" :type="type" :uid="userInfo.id"></payments-by-wx>
-            <!-- #endif -->
-            <!-- #ifdef MP-ALIPAY -->
-            <payments-by-ali :orderId="orderId" :recharge="recharge" :type="type" :uid="userInfo.id"></payments-by-ali>
-            <!-- #endif -->
-            <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-            <payments-by-app :orderId="orderId" :recharge="recharge" :type="type" :uid="userInfo.id"></payments-by-app>
-            <!-- #endif -->
-            <!-- #ifdef MP-TOUTIAO -->
-            <payments-by-tt :orderId="orderId" :recharge="recharge" :type="type" :uid="userInfo.id"></payments-by-tt>
-            <!-- #endif -->
         </view>
 
         <!--提示信息-->
@@ -110,25 +96,7 @@
     </view>
 </template>
 <script>
-    // #ifdef H5
-    import paymentsByH5 from '@/components/coreshop-payments/coreshop-paymentsByH5.vue';
-    // #endif
-
-    // #ifdef MP-WEIXIN
     import paymentsByWx from '@/components/coreshop-payments/coreshop-paymentsByWx.vue';
-    // #endif
-
-    // #ifdef MP-ALIPAY
-    import paymentsByAli from '@/components/coreshop-payments/coreshop-paymentsByAli.vue';
-    // #endif
-
-    // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import paymentsByApp from '@/components/coreshop-payments/coreshop-paymentsByApp.vue';
-    // #endif
-
-    // #ifdef MP-TOUTIAO
-    import paymentsByTt from '@/components/coreshop-payments/coreshop-paymentsByTt.vue';
-    // #endif
 
     import { orders } from '@/common/mixins/mixinsHelper.js';
     export default {
@@ -146,21 +114,7 @@
             };
         },
         components: {
-            // #ifdef H5
-            paymentsByH5,
-            // #endif
-            // #ifdef MP-WEIXIN
-            paymentsByWx,
-            // #endif
-            // #ifdef MP-ALIPAY
-            paymentsByAli,
-            // #endif
-            // #ifdef APP-PLUS || APP-PLUS-NVUE
-            paymentsByApp,
-            // #endif
-            // #ifdef MP-TOUTIAO
-            paymentsByTt
-            // #endif
+            paymentsByWx
         },
         onLoad(options) {
             console.log(options);
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
index dac663bd023b52fad69d79a11cc60ca107d99f60..92a9a7e697422f1c38ec0d00dbee0451987e9d88 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
@@ -323,25 +323,6 @@
 
         },
         onShow() {
-            // #ifdef MP-ALIPAY || MP-TOUTIAO
-            let userShip = this.$db.get('addressUserShip', true);
-            if (userShip) {
-                this.userShip = userShip;
-                this.params.areaId = userShip.areaId;
-                this.$db.del('addressUserShip', true);
-            }
-            let userInvoice = this.$db.get('userInvoice', true);
-            if (userInvoice) {
-                this.invoice = userInvoice;
-                this.$db.del('userInvoice', true);
-            }
-            let userStore = this.$db.get('userStore', true);
-            if (userStore) {
-                this.store = userStore;
-                this.$db.del('userStore', true);
-            }
-            // #endif
-            // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
             let userShip = this.$store.state.userShip;
             if (userShip) {
                 this.userShip = userShip;
@@ -351,7 +332,6 @@
             if (userInvoice) {
                 this.invoice = userInvoice;
             }
-            // #endif
         },
         methods: {
             // 切换门店
@@ -415,15 +395,8 @@
                             })
                         }
                         // 所有价格转换
-                        //data.amount = this.$common.formatMoney(data.amount);
-                        //data.goodsAmount = this.$common.formatMoney(data.goodsAmount);
                         data.goodsPromotionMoneyOld = data.goodsPromotionMoney;
-                        //data.goodsPromotionMoney = this.$common.formatMoney(data.goodsPromotionMoney);
-                        //data.couponPromotionMoney = this.$common.formatMoney(data.couponPromotionMoney);
                         data.orderPromotionMoneyOld = data.orderPromotionMoney;
-                        //data.orderPromotionMoney = this.$common.formatMoney(data.orderPromotionMoney);
-                        //data.pointExchangeMoney = this.$common.formatMoney(data.pointExchangeMoney);
-                        //data.costFreight = this.$common.formatMoney(data.costFreight);
                         // 购物车详情
                         this.cartData = data
                         // 商品详情
@@ -628,21 +601,7 @@
                 data['taxType'] = this.invoice.type
                 data['taxName'] = this.invoice.name
                 data['taxCode'] = this.invoice.code
-                // #ifdef H5
-                data['source'] = 2;
-                // #endif
-                // #ifdef MP-WEIXIN
                 data['source'] = 3;
-                // #endif
-                // #ifdef MP-ALIPAY
-                data['source'] = 4;
-                // #endif
-                // #ifdef APP-PLUS || APP-PLUS-NVUE
-                data['source'] = 5;
-                // #endif
-                // #ifdef MP-TOUTIAO
-                data['source'] = 6;
-                // #endif
                 data = Object.assign(data, delivery)
                 this.$u.api.createOrder(data).then(res => {
                     this.submitStatus = false;
@@ -654,10 +613,7 @@
                         } else {
                             this.$u.route({ type: 'redirectTo', url: '/pages/payment/pay/pay?orderId=' + res.data.orderId + '&type=' + this.orderType });
                         }
-                        //发起订阅
-                        // #ifdef MP-WEIXIN
                         this.subscription();
-                        // #endif
                     } else {
                         this.$u.toast(res.msg);
                     }
@@ -758,21 +714,14 @@
             },
             // 判断是否开启发票功能
             invoiceSwitch() {
-                //console.log("发票功能:" + this.$store.state.config.invoiceSwitch);
                 return this.$store.state.config.invoiceSwitch || 2;
             },
             // 判断店铺开关
             storeSwitch() {
-                //var status = this.$store.state.config.storeSwitch || 2;
-                //if (status == 2) {
-                //    this.typeItem = ['快递物流', '同城配送']
-                //}
-                //console.log(status);
                 return this.$store.state.config.storeSwitch || 2;
             },
             // 根据接口返回数据判断是否使用优惠券
             couponIsUsed() {
-                //console.log(this.cartData.coupon);
                 return this.cartData.coupon && this.cartData.coupon.length > 0;
             },
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.vue b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.vue
index b407754d4d196dd5b60fee5ce8d125dd100ca20a..fa803be3e40ebc5ac51d5f4e52f07854b69f1904 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.vue
@@ -115,15 +115,7 @@
             let pre = pages[pages.length - 2]
             console.log(pre);
             if (pre != undefined) {
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                invoice = pre.invoice
-                // #endif
-                // #ifdef MP-WEIXIN
                 invoice = pre.$vm.invoice
-                // #endif
-                // #ifdef MP-ALIPAY || MP-TOUTIAO
-                invoice = pre.data.invoice;
-                // #endif
                 if (invoice && invoice.hasOwnProperty('type') && invoice.type !== '1') {
                     // 发票不是未使用, 展示发票信息
                     this.model.name = invoice.name;
@@ -157,20 +149,6 @@
             },
             // 保存发票信息
             saveInvoice() {
-                //if (this.type === '1' || this.type === 1) {
-                //    this.$u.toast('请选择发票类型')
-                //    return false
-                //}
-                //if (!this.model.name) {
-                //    this.$u.toast('请输入发票抬头')
-                //    return false
-                //}
-                //// 企业类型需要输入税号
-                //if (this.type === '3' && !this.model.code) {
-                //    this.$u.toast('请输入发票税号信息')
-                //    return false
-                //}
-
                 this.$refs.uForm.validate(valid => {
                     if (valid) {
                         console.log('验证通过');
@@ -196,16 +174,7 @@
                 let pages = getCurrentPages(); //当前页
                 let beforePage = pages[pages.length - 2]; //上个页面
                 if (beforePage != undefined) {
-                    // #ifdef MP-ALIPAY || MP-TOUTIAO
-                    this.$db.set('userInvoice', data, true);
-                    // #endif
-                    // #ifdef MP-WEIXIN
                     beforePage.$vm.invoice = data;
-                    // #endif
-                    // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                    // beforePage.invoice = data;
-                    this.$store.commit('invoice', data)
-                    // #endif
                     uni.navigateBack({
                         delta: 1
                     })
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.vue b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.vue
index eb3c38a7185be0939d43b11c2d54e8a97af5ba76..d0e540f82665c485e5f5cfb2158825ec4b05d1a8 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.vue
@@ -111,17 +111,8 @@
                 store['mobile'] = mobile;
                 store['address'] = address;
 
-                // #ifdef MP-ALIPAY || MP-TOUTIAO
-                this.$db.set('userStore', store, true);
-                // #endif
-
-                // #ifdef MP-WEIXIN
                 pre.$vm.store = store
-                // #endif
 
-                // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                pre.store = store
-                // #endif
 
                 uni.navigateBack({
                     delta: 1
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
index 44925089b1a3c71fe4963e5006bcd57872139499..a58056d13b18a9a281f8d80bbe7f6464656355e2 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
@@ -44,13 +44,7 @@
             // 保存海报到本地
             savePoster() {
                 let _this = this;
-                // #ifdef H5
-                _this.downloadIamge(_this.poster, 'image');
-                // #endif
-
-                // #ifdef MP || MP-ALIPAY || APP-PLUS || APP-PLUS-NVUE
                 _this.downloadImageOfMp(_this.poster)
-                // #endif
             },
             //下载图片地址和图片名
             downloadIamge(imgsrc, name) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
index 9540cc0377531fc995ceef77b52eb4814e4e0926..920d392f1b8c61572d623cb3398c4bc767c370e5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
@@ -242,7 +242,7 @@ page, .bg-page { background: #f7f7f7; }
 .coreshop-cell-group { background-color: #fff;
     .coreshop-cell-item { padding: 20rpx 26rpx 20rpx 20rpx; border-bottom: 2rpx solid #f3f3f3; position: relative; background-color: #fff; color: #333; display: flex; min-height: 90rpx; align-items: center; justify-content: space-between;
         .coreshop-cell-item-hd { display: flex; align-items: center; font-size: 28rpx; position: relative;
-            .coreshop-cell-hd-title { display: inline-block; position: relative; /* #ifdef MP-ALIPAY */ top: 4rpx; /* #endif */ }
+            .coreshop-cell-hd-title { display: inline-block; position: relative; }
             .coreshop-cell-bd-input { display: inline-block; float: left; font-size: 26rpx; }
         }
         .coreshop-cell-item-bd { display: flex; min-height: 30rpx; overflow: hidden; align-items: center; padding-right: 30rpx;
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-calendar/u-calendar.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-calendar/u-calendar.vue
index 2b3018426bca0b184c6236c83a7a328acb335915..70059cbe4138f3047680c757490ab76378479ffa 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-calendar/u-calendar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-calendar/u-calendar.vue
@@ -288,6 +288,10 @@
 			},
 			init() {
 				let now = new Date();
+				let minDate = new Date(this.minDate);
+				let maxDate = new Date(this.maxDate);
+				if (now < minDate) now = minDate;
+				if (now > maxDate) now = maxDate;
 				this.year = now.getFullYear();
 				this.month = now.getMonth() + 1;
 				this.day = now.getDate();
@@ -636,4 +640,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-collapse-item/u-collapse-item.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-collapse-item/u-collapse-item.vue
index 3b66bfa5583883cc5f779cab7f7cb9d96f7a5d41..66566576f1b10ebffc1ba645e33938344acbe969 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-collapse-item/u-collapse-item.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-collapse-item/u-collapse-item.vue
@@ -110,7 +110,8 @@
 				this.parent = this.$u.$parent.call(this, 'u-collapse');
 				if(this.parent) {
 					this.nameSync = this.name ? this.name : this.parent.childrens.length;
-					this.parent.childrens.push(this);
+					// 不存在时才添加本实例
+					!this.parent.childrens.includes(this) && this.parent.childrens.push(this);
 					this.headStyle = this.parent.headStyle;
 					this.bodyStyle = this.parent.bodyStyle;
 					this.arrowColor = this.parent.arrowColor;
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-image/u-image.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-image/u-image.vue
index c729c3c804e741c67443451f4574a62889b808ac..8a890be58e3772243ae4922b02e18c122687053f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-image/u-image.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-image/u-image.vue
@@ -172,6 +172,7 @@ export default {
 					this.loading = false;
 				} else {
 					this.isError = false;
+					this.loading = true;
 				}
 			}
 		}
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-input/u-input.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-input/u-input.vue
index f2aea72fe294f62223dbdbd9185a703acc81d90d..301e80023bc1423dfbfdca143205ca7e1e327958 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-input/u-input.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-input/u-input.vue
@@ -50,6 +50,7 @@
 			:selection-end="uSelectionEnd"
 			:selection-start="uSelectionStart"
 			:show-confirm-bar="showConfirmbar"
+			:adjust-position="adjustPosition"
 			@focus="onFocus"
 			@blur="handleBlur"
 			@input="handleInput"
@@ -213,6 +214,11 @@ export default {
 		showConfirmbar:{
 			type:Boolean,
 			default:true
+		},
+		// 弹出键盘时是否自动调节高度，uni-app默认值是true
+		adjustPosition: {
+			type: Boolean,
+			default: true
 		}
 	},
 	data() {
@@ -300,11 +306,12 @@ export default {
 		handleBlur(event) {
 			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
 			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+			let value = event.detail.value;
 			setTimeout(() => {
 				this.focused = false;
 			}, 100)
 			// vue 原生的方法 return 出去
-			this.$emit('blur', event.detail.value);
+			this.$emit('blur', value);
 			setTimeout(() => {
 				// 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
 				// #ifdef MP-TOUTIAO
@@ -312,7 +319,7 @@ export default {
 				this.lastValue = value;
 				// #endif
 				// 将当前的值发送到 u-form-item 进行校验
-				this.dispatch('u-form-item', 'on-form-blur', event.detail.value);
+				this.dispatch('u-form-item', 'on-form-blur', value);
 			}, 40)
 		},
 		onFormItemError(status) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-number-box/u-number-box.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-number-box/u-number-box.vue
index 54a679eb5b0b5f75b6b00fcfe29d73507a7dd0ca..3b8e8bfabf1c92eee64c883be6b66e51f197bbd3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-number-box/u-number-box.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-number-box/u-number-box.vue
@@ -10,7 +10,7 @@
 		</view>
 		<input :disabled="disabledInput || disabled" :cursor-spacing="getCursorSpacing" :class="{ 'u-input-disabled': disabled }"
 		    v-model="inputVal" class="u-number-input" @blur="onBlur" @focus="onFocus"
-		    type="number" :style="{
+		    type="digit" :style="{
 				color: color,
 				fontSize: size + 'rpx',
 				background: bgColor,
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-parse/libs/trees.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-parse/libs/trees.vue
index 3ecb6d7da421ff55451223ffcc55634df8ee980f..2b2482061ba62012fd4b8109520df0c77524658a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-parse/libs/trees.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-parse/libs/trees.vue
@@ -301,7 +301,7 @@
 	}
 
 	._img {
-		/*display: inline-block;*/
+		display: inline-block;
 		max-width: 100%;
 		overflow: hidden;
 	}
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-select/u-select.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-select/u-select.vue
index 1285845e06547a161067c61b542a85a79425ed8d..accf68c2f19e4b07daeb26f9154c83b95a715887 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-select/u-select.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-select/u-select.vue
@@ -36,7 +36,7 @@
 					</view>
 				</view>
 				<view class="u-select__body">
-					<picker-view @change="columnChange" class="u-select__body__picker-view" :value="defaultSelector" @pickstart="pickstart" @pickend="pickend">
+					<picker-view @change="columnChange" class="u-select__body__picker-view" :value="defaultSelector" @pickstart="pickstart" @pickend="pickend" v-if="value">
 						<picker-view-column v-for="(item, index) in columnData" :key="index">
 							<view class="u-select__body__picker-view__item" v-for="(item1, index1) in item" :key="index1">
 								<view class="u-line-1">{{ item1[labelName] }}</view>
@@ -278,12 +278,13 @@ export default {
 			let columnIndex = e.detail.value;
 			// 由于后面是需要push进数组的，所以需要先清空数组
 			this.selectValue = [];
+			this.defaultSelector = columnIndex;
 			if(this.mode == 'mutil-column-auto') {
 				// 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化
 				this.lastSelectIndex.map((val, idx) => {
 					if (val != columnIndex[idx]) index = idx;
 				});
-				this.defaultSelector = columnIndex;
+				
 				for (let i = index + 1; i < this.columnNum; i++) {
 					// 当前变化列的下一列的数据，需要获取上一列的数据，同时需要指定是上一列的第几个的children，再往后的
 					// 默认是队列的第一个为默认选项
@@ -333,6 +334,8 @@ export default {
 		},
 		close() {
 			this.$emit('input', false);
+			// 重置default-value默认值
+			this.$set(this, 'defaultSelector', [0]);
 		},
 		// 点击确定或者取消
 		getResult(event = null) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-tabs/u-tabs.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-tabs/u-tabs.vue
index 0c596585386183522883c11a24d81cc198de24b3..3775fcd419122c62a9db60d0213b051f0faf8cff 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-tabs/u-tabs.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-tabs/u-tabs.vue
@@ -3,9 +3,9 @@
 		background: bgColor
 	}">
 		<!-- $u.getRect()对组件根节点无效，因为写了.in(this)，故这里获取内层接点尺寸 -->
-		<view :id="id">
+		<view>
 			<scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation>
-				<view class="u-scroll-box" :class="{'u-tabs-scorll-flex': !isScroll}">
+				<view class="u-scroll-box" :id="id" :class="{'u-tabs-scorll-flex': !isScroll}">
 					<view class="u-tab-item u-line-1" :id="'u-tab-item-' + index" v-for="(item, index) in list" :key="index" @tap="clickTab(index)"
 					 :style="[tabItemStyle(index)]">
 						<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-th/u-th.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-th/u-th.vue
index 9fe5a164ad2dae1bf4d70fb71c7ee1b38ef166a5..c736b9b1145c1de1af5790b6d100dad13d960bbc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-th/u-th.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-th/u-th.vue
@@ -39,7 +39,7 @@
 				style.padding = this.parent.padding;
 				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
 				style.borderRight = `solid 1px ${this.parent.borderColor}`;
-				Object.assign(style, this.parent.style);
+				Object.assign(style, this.parent.thStyle);
 				this.thStyle = style;
 			}
 		}
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-upload/u-upload.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-upload/u-upload.vue
index f4d4b763efc45cbd38cfd751a243799b491eadbd..c7a9f059ee72e9549e440adb06e8f9d4fcb388fb 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-upload/u-upload.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-upload/u-upload.vue
@@ -21,7 +21,7 @@
 				<u-icon class="u-icon" :name="delIcon" size="20" :color="delColor"></u-icon>
 			</view>
 			<u-line-progress
-				v-if="showProgress && item.progress > 0 && !item.error"
+				v-if="showProgress && item.progress > 0 && item.progress != 100 && !item.error"
 				:show-percent="false"
 				height="16"
 				class="u-progress"
@@ -421,6 +421,9 @@ export default {
 				name: this.name,
 				formData: this.formData,
 				header: this.header,
+				// #ifdef MP-ALIPAY
+				fileType:'image',
+				// #endif
 				success: res => {
 					// 判断是否json字符串，将其转为json格式
 					let data = this.toJson && this.$u.test.jsonString(res.data) ? JSON.parse(res.data) : res.data;
@@ -498,7 +501,7 @@ export default {
 		// 执行移除图片的动作，上方代码只是判断是否可以移除
 		handlerDeleteItem(index) {
 			// 如果文件正在上传中，终止上传任务，进度在0 < progress < 100则意味着正在上传
-			if (this.lists[index].process < 100 && this.lists[index].process > 0) {
+			if (this.lists[index].progress < 100 && this.lists[index].progress > 0) {
 				typeof this.lists[index].uploadTask != 'undefined' && this.lists[index].uploadTask.abort();
 			}
 			this.lists.splice(index, 1);
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/uview-v1/uview-v1.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/uview-v1/uview-v1.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/config/config.js b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/config/config.js
index 44925a1d3d5ef603fd5b63287ee6736ff79c6372..d77e97130b360d32a083319803779440da85afdc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/config/config.js
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/config/config.js
@@ -1,5 +1,5 @@
-// 此版本发布于2020-03-17
-let version = '1.8.4';
+// 此版本发布于2022-04-19
+let version = '1.8.6';
 
 export default {
 	v: version,
@@ -12,4 +12,4 @@ export default {
 		'error',
 		'warning'
 	]
-}
\ No newline at end of file
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/guid.js b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/guid.js
index 8497664aabb7a776294eb681b934d3c4ec7f2bfa..e04190aa380349e571cab3e89f9719606d1265d6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/guid.js
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/guid.js
@@ -6,7 +6,7 @@
  * v-for的时候,推荐使用后端返回的id而不是循环的index
  * @param {Number} len uuid的长度
  * @param {Boolean} firstU 将返回的首字母置为"u"
- * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
+ * @param {Number} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
  */
 function guid(len = 32, firstU = true, radix = null) {
 	let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
@@ -29,7 +29,7 @@ function guid(len = 32, firstU = true, radix = null) {
 			}
 		}
 	}
-	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guid不能用作id或者class
 	if (firstU) {
 		uuid.shift();
 		return 'u' + uuid.join('');
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/test.js b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/test.js
index fd25e180ffcdd65981248e903ef286040c0a4937..1fde462156cc60f0d412adcc4ed38f7dff183c87 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/test.js
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/test.js
@@ -2,7 +2,7 @@
  * 验证电子邮箱格式
  */
 function email(value) {
-	return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value);
+	return /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(value);
 }
 
 /**
@@ -37,7 +37,7 @@ function dateISO(value) {
  * 验证十进制数字
  */
 function number(value) {
-	return /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value)
+	return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value)
 }
 
 /**
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/mixin/mixin.js b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/mixin/mixin.js
index e6ceed1a1dc636d855bda435ce985958f2a8deff..cb6454512588265b335a8ef073a5a5c4542a9c11 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/mixin/mixin.js
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/mixin/mixin.js
@@ -1,11 +1,6 @@
-import * as GlobalConstVars from '@/common/setting/constVarsHelper.js'
-
-
 module.exports = {
 	data() {
-        return {
-			$globalConstVars: GlobalConstVars
-        }
+		return {}
 	},
 	onLoad() {
 		// getRect挂载到$u上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出
@@ -53,7 +48,7 @@ module.exports = {
 		uni.$emit('uOnReachBottom')
 	},
 	beforeDestroy() {
-		// 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况
+		// 判断当前页面是否存在parent和children，一般在checkbox和checkbox-group父子联动的场景会有此情况
 		// 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱
 		if(this.parent && uni.$u.test.array(this.parent.children)) {
 			// 组件销毁时，移除父组件中的children数组中对应的实例
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/util/async-validator.js b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/util/async-validator.js
index d7215b9f80dd0aa45a9f5f100edd0100cbf774ea..6183d0a3e10c948fd5feae056c19a1fdee109889 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/util/async-validator.js
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/util/async-validator.js
@@ -437,7 +437,7 @@ function range(rule, value, source, errors, options) {
 	}
 
 	if (str) {
-		// 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".lenght !== 3
+		// 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".length !== 3
 		val = value.replace(spRegexp, '_').length;
 	}
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json b/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json
index 431d58596364bb6774068c60a57adaa39136a5f8..f911d315892363e3021add4bb3693e0f4921f8cd 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json
+++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json
@@ -1,39 +1,31 @@
 {
-	"name": "uview-ui",
-	"version": "1.8.4",
-	"description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
-	"main": "index.js",
-	"keywords": [
-		"uview",
-		"uView",
-		"uni-app",
-		"uni-app ui",
-		"uniapp",
-		"uviewui",
-		"uview ui",
-		"uviewUI",
-		"uViewui",
-		"uViewUI",
-		"uView UI",
-		"uni ui",
-		"uni UI",
-		"uniapp ui",
-		"ui",
-		"UI框架",
-		"uniapp ui框架",
-		"uniapp UI"
-	],
-	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1"
-	},
-	"repository": {
-		"type": "git",
-		"url": ""
-	},
-	"devDependencies": {
-		"node-sass": "^4.14.0",
-		"sass-loader": "^8.0.2"
-	},
-	"author": "uView",
-	"license": "MIT"
-}
+    "name": "uView",
+    "version": "1.8.6",
+    "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
+    "main": "index.js",
+    "keywords": [
+        "uview",
+        "ui",
+        "uni-app"
+    ],
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "repository": {
+        "type": "git",
+        "url": ""
+    },
+    "devDependencies": {
+        "node-sass": "^4.14.0",
+        "sass-loader": "^8.0.2"
+    },
+    "author": "uView",
+    "license": "MIT",
+    "id": "uview-v1",
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    }
+}
\ No newline at end of file