diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs
index 1c55591eaa813ee5992ca8439640a48e16bd5ccd..6e375ed68d523ca5e5fa71f7648fb6b12fec4200 100644
--- a/CoreCms.Net.Configuration/GlobalEnumVars.cs
+++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs
@@ -1641,7 +1641,7 @@ namespace CoreCms.Net.Configuration
             /// 智能表单
             /// </summary>
             [Description("智能表单")]
-            IntelligenceForm = 4
+            IntelligenceForm = 5
         }
 
         /// <summary>
@@ -2521,20 +2521,20 @@ namespace CoreCms.Net.Configuration
         #region 页面设计相关
 
         /// <summary>
-        /// 页面类型
+        /// 是否默认
         /// </summary>
         public enum PagesType
         {
             /// <summary>
-            /// 移动端
+            /// 是
             /// </summary>
-            [Description("移动端")]
+            [Description("是")]
             Mobile = 1,
             /// <summary>
-            /// PC端
+            /// 否
             /// </summary>
-            [Description("PC")]
-            PC = 2,
+            [Description("否")]
+            否 = 2,
         }
 
         /// <summary>
diff --git a/CoreCms.Net.IRepository/Shop/ICoreCmsPagesRepository.cs b/CoreCms.Net.IRepository/Shop/ICoreCmsPagesRepository.cs
index 5abeef7ed5eb63c2b928361d61fb5d8b97e7e78b..44c1c88ae6db9e10473c2df9f740373f15766a7a 100644
--- a/CoreCms.Net.IRepository/Shop/ICoreCmsPagesRepository.cs
+++ b/CoreCms.Net.IRepository/Shop/ICoreCmsPagesRepository.cs
@@ -21,10 +21,39 @@ namespace CoreCms.Net.IRepository
     public interface ICoreCmsPagesRepository : IBaseRepository<CoreCmsPages>
     {
         /// <summary>
-        ///     重写异步更新方法
+        /// 重写异步插入方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        Task<AdminUiCallBack> UpdateAsync(FmPagesUpdate entity);
+        new Task<AdminUiCallBack> InsertAsync(CoreCmsPages entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> UpdateAsync(CoreCmsPages entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(int id);
+
+        /// <summary>
+        ///     更新设计
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateDesignAsync(FmPagesUpdate entity);
+
+        /// <summary>
+        /// 复制生成一个新的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> CopyByIdAsync(int id);
+
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.IServices/Shop/ICoreCmsPagesServices.cs b/CoreCms.Net.IServices/Shop/ICoreCmsPagesServices.cs
index e2b6ef26155c1f51b64324bafae418c632993bd0..a0b6f900bf81cd85017e080db24fe953d466e1d6 100644
--- a/CoreCms.Net.IServices/Shop/ICoreCmsPagesServices.cs
+++ b/CoreCms.Net.IServices/Shop/ICoreCmsPagesServices.cs
@@ -8,6 +8,7 @@
  *        Description: 暂无
  ***********************************************************************/
 
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.FromBody;
@@ -20,13 +21,35 @@ namespace CoreCms.Net.IServices
     /// </summary>
     public interface ICoreCmsPagesServices : IBaseServices<CoreCmsPages>
     {
+
         /// <summary>
-        ///     重写异步更新方法方法
+        /// 重写异步插入方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        Task<AdminUiCallBack> UpdateAsync(FmPagesUpdate entity);
+        new Task<AdminUiCallBack> InsertAsync(CoreCmsPages entity);
 
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        new Task<AdminUiCallBack> UpdateAsync(CoreCmsPages entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(int id);
+
+
+        /// <summary>
+        ///     更新设计
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateDesignAsync(FmPagesUpdate entity);
 
         /// <summary>
         ///     获取首页数据
@@ -34,5 +57,14 @@ namespace CoreCms.Net.IServices
         /// <param name="code">查询编码</param>
         /// <returns></returns>
         Task<WebApiCallBack> GetPageConfig(string code);
+
+
+        /// <summary>
+        /// 复制生成一个新的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> CopyByIdAsync(int id);
+
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Repository/Shop/CoreCmsPagesRepository.cs b/CoreCms.Net.Repository/Shop/CoreCmsPagesRepository.cs
index d87ad471437ad74bc9394b7ec4e29d07784f7650..b8a15a5e4e986868ee3db9f7b8df8224b9328084 100644
--- a/CoreCms.Net.Repository/Shop/CoreCmsPagesRepository.cs
+++ b/CoreCms.Net.Repository/Shop/CoreCmsPagesRepository.cs
@@ -19,10 +19,10 @@ using CoreCms.Net.Loging;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.FromBody;
 using CoreCms.Net.Model.ViewModels.UI;
-using CoreCms.Net.Model.ViewModels.DTO;
 using CoreCms.Net.Utility.Extensions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using SqlSugar;
 
 namespace CoreCms.Net.Repository
 {
@@ -35,14 +35,188 @@ namespace CoreCms.Net.Repository
         {
         }
 
-        #region 重写异步更新方法方法==========================================================
 
         /// <summary>
-        /// 重写异步更新方法方法
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public new async Task<AdminUiCallBack> InsertAsync(CoreCmsPages entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var have = await DbClient.Queryable<CoreCmsPages>().Where(p => p.code == entity.code).With(SqlWith.NoLock).AnyAsync();
+            if (have)
+            {
+                jm.msg = "存在相同【区域编码】请更正";
+                return jm;
+            }
+
+            entity.code = entity.code.Trim();
+
+            var id = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync();
+            var bl = id > 0;
+
+            if (bl && entity.type == 1)
+            {
+                //如果设为新默认，则修改其他为非默认。
+                await DbClient.Updateable<CoreCmsPages>().Where(p => p.type == 1 && p.id != id).SetColumns(p => new CoreCmsPages() { type = 2 }).ExecuteCommandAsync();
+            }
+
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写异步更新方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        public async Task<AdminUiCallBack> UpdateAsync(FmPagesUpdate entity)
+        public new async Task<AdminUiCallBack> UpdateAsync(CoreCmsPages entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var have = await DbClient.Queryable<CoreCmsPages>().Where(p => p.code == entity.code && p.id != entity.id).With(SqlWith.NoLock).AnyAsync();
+            if (have)
+            {
+                jm.msg = "存在相同【区域编码】请更正";
+                return jm;
+            }
+            var oldModel = await DbClient.Queryable<CoreCmsPages>().In(entity.id).SingleAsync();
+            if (oldModel == null)
+            {
+                jm.msg = "不存在此信息";
+                return jm;
+            }
+            //事物处理过程开始
+            var oldType = oldModel.type;
+            var newType = entity.type;
+
+            oldModel.code = entity.code;
+            oldModel.name = entity.name;
+            oldModel.description = entity.description;
+            oldModel.layout = entity.layout;
+            oldModel.type = entity.type;
+
+            //事物处理过程结束
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
+
+            if (bl)
+            {
+                //如果不是默认的情况下
+                if (oldType == 1 && newType != 1)
+                {
+                    //判断修改当前，而是否其他有默认
+                    var haveDefault = await DbClient.Queryable<CoreCmsPages>().Where(p => p.type == 1 && p.id != oldModel.id).With(SqlWith.NoLock).AnyAsync();
+                    //如果不存在，则当前不能调整为非默认。
+                    if (!haveDefault)
+                    {
+                        await DbClient.Updateable<CoreCmsPages>().Where(p => p.id == oldModel.id).SetColumns(p => new CoreCmsPages() { type = 1 }).ExecuteCommandAsync();
+                    }
+                }
+                //如果设为新默认，则修改其他为非默认。
+                if (newType == 1)
+                {
+                    await DbClient.Updateable<CoreCmsPages>().Where(p => p.id != oldModel.id).SetColumns(p => new CoreCmsPages() { type = 2 }).ExecuteCommandAsync();
+                }
+            }
+
+
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdAsync(int id)
+        {
+            var jm = new AdminUiCallBack();
+
+            var model = await DbClient.Queryable<CoreCmsPages>().Where(p => p.id == id).FirstAsync();
+            if (model == null)
+            {
+                jm.msg = GlobalConstVars.DataisNo;
+                return jm;
+            }
+            if (model.type == 1)
+            {
+                jm.msg = "默认页面禁止删除";
+                return jm;
+            }
+
+            var count = await DbClient.Queryable<CoreCmsPages>().CountAsync();
+            if (count == 1)
+            {
+                jm.msg = "只有一个页面了，别删了。";
+                return jm;
+            }
+
+            var bl = await DbClient.Deleteable<CoreCmsPages>(id).ExecuteCommandHasChangeAsync();
+            if (bl)
+            {
+                await DbClient.Deleteable<CoreCmsPagesItems>().Where(p => p.pageCode == model.code).ExecuteCommandAsync();
+            }
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+
+            return jm;
+        }
+
+
+        /// <summary>
+        /// 复制一个同样的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> CopyByIdAsync(int id)
+        {
+            var jm = new AdminUiCallBack();
+
+            var model = await DbClient.Queryable<CoreCmsPages>().Where(p => p.id == id).FirstAsync();
+            if (model == null)
+            {
+                jm.msg = GlobalConstVars.DataisNo;
+                return jm;
+            }
+            var oldCode = model.code;
+            model.type = 2;
+            model.code = model.code + DateTime.Now.ToString("yyyyMMddHHmmssfffff");
+            model.name = model.name + "（复制）";
+
+            var items = await DbClient.Queryable<CoreCmsPagesItems>().Where(p => p.pageCode == oldCode).ToListAsync();
+            foreach (var item in items)
+            {
+                item.pageCode = model.code;
+            }
+
+            var bl = await DbClient.Insertable<CoreCmsPages>(model).ExecuteReturnIdentityAsync() > 0;
+            if (bl)
+            {
+                await DbClient.Insertable<CoreCmsPagesItems>(items).ExecuteCommandAsync();
+            }
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+
+            return jm;
+        }
+
+
+
+        #region 更新设计==========================================================
+
+        /// <summary>
+        /// 更新设计
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateDesignAsync(FmPagesUpdate entity)
         {
             var jm = new AdminUiCallBack();
 
@@ -85,21 +259,6 @@ namespace CoreCms.Net.Repository
             return jm;
         }
 
-
         #endregion
-
-
-        ///// <summary>
-        ///// 获取首页数据
-        ///// </summary>
-        ///// <param name="entity">实体数据</param>
-        ///// <returns></returns>
-        //public async Task<WebApiCallBack> GetPageConfig(string code)
-        //{
-        //    var jm = new WebApiCallBack();
-
-        //    return jm;
-        //}
-
     }
 }
diff --git a/CoreCms.Net.Services/Financial/CoreCmsInvoiceServices.cs b/CoreCms.Net.Services/Financial/CoreCmsInvoiceServices.cs
index e58c992e12afd9800bc43f0f0a3c3d56ae6280d2..0ac8845dac725dbac3cdfa3992072f228f32eb2b 100644
--- a/CoreCms.Net.Services/Financial/CoreCmsInvoiceServices.cs
+++ b/CoreCms.Net.Services/Financial/CoreCmsInvoiceServices.cs
@@ -50,6 +50,7 @@ namespace CoreCms.Net.Services
 
             var model = await base.QueryByClauseAsync(p => p.sourceId == orderId && p.category == (int)GlobalEnumVars.OrderTaxCategory.Order);
             jm.status = model != null;
+            jm.data = model;
             jm.msg = jm.status ? GlobalConstVars.GetDataSuccess : GlobalConstVars.GetDataFailure;
 
             return jm;
diff --git a/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs b/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs
index 00574278714acddbba92d8a6e93c73a699fd38b4..79a03478854936a02e21215b26a49b7b84527084 100644
--- a/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs
+++ b/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs
@@ -20,9 +20,8 @@ using CoreCms.Net.Loging;
 using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.Entities.Expression;
 using CoreCms.Net.Model.FromBody;
-using CoreCms.Net.Model.ViewModels.Basics;
-using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Model.ViewModels.DTO;
+using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Utility.Extensions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -70,17 +69,59 @@ namespace CoreCms.Net.Services
         }
 
 
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public new async Task<AdminUiCallBack> InsertAsync(CoreCmsPages entity)
+        {
+            return await _dal.InsertAsync(entity);
+        }
+
         /// <summary>
         /// 重写异步更新方法方法
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        public async Task<AdminUiCallBack> UpdateAsync(FmPagesUpdate entity)
+        public new async Task<AdminUiCallBack> UpdateAsync(CoreCmsPages entity)
         {
             return await _dal.UpdateAsync(entity);
         }
 
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdAsync(int id)
+        {
+            return await _dal.DeleteByIdAsync(id);
+        }
 
+        /// <summary>
+        /// 更新设计
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateDesignAsync(FmPagesUpdate entity)
+        {
+            return await _dal.UpdateDesignAsync(entity);
+        }
+
+
+        /// <summary>
+        /// 复制一个同样的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> CopyByIdAsync(int id)
+        {
+            return await _dal.CopyByIdAsync(id);
+        }
+
+
+        #region 获取首页数据
         /// <summary>
         /// 获取首页数据
         /// </summary>
@@ -91,13 +132,17 @@ namespace CoreCms.Net.Services
 
             var jm = new WebApiCallBack();
 
-            var model = await _dal.QueryByClauseAsync(p => p.code == code);
+            var wherePage = PredicateBuilder.True<CoreCmsPages>();
+
+            wherePage = code == "mobile_home" ? wherePage.And(p => p.type == 1) : wherePage.And(p => p.code == code);
+
+            var model = await _dal.QueryByClauseAsync(wherePage);
             if (model == null)
             {
                 return jm;
             }
             jm.status = true;
-            var items = await _pagesItemsRepository.QueryListByClauseAsync(p => p.pageCode == code, p => p.sort, OrderByType.Asc);
+            var items = await _pagesItemsRepository.QueryListByClauseAsync(p => p.pageCode == model.code, p => p.sort, OrderByType.Asc);
 
             var itemsDto = new List<PagesItemsDto>();
             foreach (var item in items)
@@ -610,5 +655,11 @@ namespace CoreCms.Net.Services
 
             return jm;
         }
+
+        #endregion
+
+
+
+
     }
 }
diff --git a/CoreCms.Net.Task/HangfireDispose.cs b/CoreCms.Net.Task/HangfireDispose.cs
index 983a5f3e4cc1288441e1412b476b0e90f04a57c2..69ad424be046139773849fc52e749845c26cd7a3 100644
--- a/CoreCms.Net.Task/HangfireDispose.cs
+++ b/CoreCms.Net.Task/HangfireDispose.cs
@@ -42,29 +42,29 @@ namespace CoreCms.Net.Task
 
 
             //自动取消订单任务
-            RecurringJob.AddOrUpdate<AutoCancelOrderJob>(s => s.Execute(), "0 0/5 * * * ? ", TimeZoneInfo.Local); // 每5分钟取消一次订单
+            RecurringJob.AddOrUpdate<AutoCancelOrderJob>(s => s.Execute(), "0 0/5 * * * ? ", TimeZoneInfo.Utc); // 每5分钟取消一次订单
 
             //自动完成订单任务
-            RecurringJob.AddOrUpdate<CompleteOrderJob>(s => s.Execute(), Cron.Hourly, TimeZoneInfo.Local); // 每小时自动完成订单
+            RecurringJob.AddOrUpdate<CompleteOrderJob>(s => s.Execute(), Cron.Hourly, TimeZoneInfo.Utc); // 每小时自动完成订单
 
             //自动评价订单任务
-            RecurringJob.AddOrUpdate<EvaluateOrderJob>(s => s.Execute(), Cron.Hourly, TimeZoneInfo.Local); // 每小时自动完成订单
+            RecurringJob.AddOrUpdate<EvaluateOrderJob>(s => s.Execute(), Cron.Hourly, TimeZoneInfo.Utc); // 每小时自动完成订单
 
             //自动签收订单任务
-            RecurringJob.AddOrUpdate<AutoSignOrderJob>(s => s.Execute(), Cron.Hourly, TimeZoneInfo.Local); // 每小时自动完成订单
+            RecurringJob.AddOrUpdate<AutoSignOrderJob>(s => s.Execute(), Cron.Hourly, TimeZoneInfo.Utc); // 每小时自动完成订单
 
             //催付款订单
-            RecurringJob.AddOrUpdate<RemindOrderPayJob>(s => s.Execute(), "0 0/5 * * * ? ", TimeZoneInfo.Local); // 每5分钟催付款订单
+            RecurringJob.AddOrUpdate<RemindOrderPayJob>(s => s.Execute(), "0 0/5 * * * ? ", TimeZoneInfo.Utc); // 每5分钟催付款订单
 
             //拼团自动取消到期团（每分钟执行一次）
-            RecurringJob.AddOrUpdate<AutoCanclePinTuanJob>(s => s.Execute(), Cron.Minutely, TimeZoneInfo.Local); // 每分钟取消一次订单
+            RecurringJob.AddOrUpdate<AutoCanclePinTuanJob>(s => s.Execute(), Cron.Minutely, TimeZoneInfo.Utc); // 每分钟取消一次订单
 
             //每天凌晨5点定期清理7天前操作日志
-            RecurringJob.AddOrUpdate<RemoveOperationLogJob>(s => s.Execute(), "0 0 5 * * ? ", TimeZoneInfo.Local); // 每天5点固定时间清理一次
+            RecurringJob.AddOrUpdate<RemoveOperationLogJob>(s => s.Execute(), "0 0 5 * * ? ", TimeZoneInfo.Utc); // 每天5点固定时间清理一次
 
 
             //定时刷新获取微信AccessToken
-            RecurringJob.AddOrUpdate<RefreshWeChatAccessTokenJob>(s => s.Execute(), "0 0/2 * * * ? ", TimeZoneInfo.Local); // 每2分钟刷新获取微信AccessToken
+            RecurringJob.AddOrUpdate<RefreshWeChatAccessTokenJob>(s => s.Execute(), "0 0/2 * * * ? ", TimeZoneInfo.Utc); // 每2分钟刷新获取微信AccessToken
 
         }
 
diff --git a/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj b/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj
index 5d7a958f62cf1b535b20d3e2c651b82e48098064..be4f08940da2d1f40602b0935ef4878ee9f419fa 100644
--- a/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj
+++ b/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj
@@ -5,8 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="CoreShop\.hbuilderx\**" />
     <Compile Remove="CoreShop\unpackage\**" />
+    <EmbeddedResource Remove="CoreShop\.hbuilderx\**" />
     <EmbeddedResource Remove="CoreShop\unpackage\**" />
+    <None Remove="CoreShop\.hbuilderx\**" />
     <None Remove="CoreShop\unpackage\**" />
   </ItemGroup>
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/.hbuilderx/launch.json b/CoreCms.Net.Uni-App/CoreShop/.hbuilderx/launch.json
index c9abd4b1d2e9ef6a99b5d6963b8992080a903c91..81f13f4f4025c3f1d4a881de5addd979dff6ae15 100644
--- a/CoreCms.Net.Uni-App/CoreShop/.hbuilderx/launch.json
+++ b/CoreCms.Net.Uni-App/CoreShop/.hbuilderx/launch.json
@@ -2,10 +2,15 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "local"
-            }
-        }
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }
diff --git a/CoreCms.Net.Uni-App/CoreShop/App.vue b/CoreCms.Net.Uni-App/CoreShop/App.vue
index 09a0c6d00569b3164732c45597b6c043f97edb1e..f82868ada7ab80ad93519b2fbfcc3e350ed4d68c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/App.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/App.vue
@@ -11,30 +11,6 @@
             this.checkVersion()
             // #endif
 
-
-            //配合corlorUI头部使用
-            uni.getSystemInfo({
-                success: function (e) {
-                    // #ifndef MP
-                    Vue.prototype.StatusBar = e.statusBarHeight;
-                    if (e.platform == 'android') {
-                        Vue.prototype.CustomBar = e.statusBarHeight + 50;
-                    } else {
-                        Vue.prototype.CustomBar = e.statusBarHeight + 45;
-                    };
-                    // #endif
-                    // #ifdef MP-WEIXIN
-                    Vue.prototype.StatusBar = e.statusBarHeight;
-                    let custom = wx.getMenuButtonBoundingClientRect();
-                    Vue.prototype.Custom = custom;
-                    Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight;
-                    // #endif
-                    // #ifdef MP-ALIPAY
-                    Vue.prototype.StatusBar = e.statusBarHeight;
-                    Vue.prototype.CustomBar = e.statusBarHeight + e.titleBarHeight;
-                    // #endif
-                }
-            })
             // 获取店铺配置信息  全局只请求一次
             this.$u.api.shopConfigV2().then(res => {
                 this.$store.commit('config', res.data)
@@ -54,10 +30,12 @@
                 }
             });
 
-
-
         },
-        onShow: function () {
+        onShow: function (obj) {
+            // #ifdef MP-WEIXIN
+            this.$store.commit('scene', obj.scene)
+            console.log(obj);
+            // #endif
             //console.log('App Show')
         },
         onHide: function () {
@@ -173,11 +151,8 @@
     }
 </script>
 <style lang="scss">
-    /*加载CorlorUI*/
-    @import "static/colorui/main.css";
-    @import "static/colorui/icon.css";
     /*加载UViewUI*/
     @import "uview-ui/index.scss";
     /*公共css */
-    @import 'static/style/common.scss';
+    @import 'static/style/coreCommon.scss';
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js
index 0538ee6cd84c94f132657d31c9face32e1d2327e..9eca068c07fb220cbffc3de8e7f34b9fee91283b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js
@@ -84,7 +84,7 @@ export const orders = {
     methods: {
         // 查看订单详情
         goOrderDetail(orderId) {
-            this.$u.route('/pages/member/order/orderdetail', { orderId: orderId });
+            this.$u.route('/pages/member/order/detail/detail', { orderId: orderId });
         },
         // 取消订单
 
@@ -96,7 +96,7 @@ export const orders = {
 
         // 去评价
         toEvaluate(orderId) {
-            this.$u.route('/pages/member/order/evaluate', { orderId: orderId });
+            this.$u.route('/pages/member/order/evaluate/evaluate', { orderId: orderId });
         },
         // 申请售后
 
@@ -105,7 +105,7 @@ export const orders = {
             let params = encodeURIComponent(
                 'code=' + code + '&no=' + no + '&add=' + address + '&mobile=' + mobile
             )
-            this.$u.route('/pages/member/order/expressDelivery', { params: params });
+            this.$u.route('/pages/member/order/expressDelivery/expressDelivery', { params: params });
         }
     }
 }
@@ -208,7 +208,7 @@ export const services = {
         },
         // 查看个人详情
         goServicesUserDetail(serviceId) {
-            this.$u.route('/pages/member/serviceOrder/details', { id: serviceId });
+            this.$u.route('/pages/member/serviceOrder/details/details', { id: serviceId });
         },
     }
 }
@@ -245,5 +245,22 @@ export const tools = {
                 });
             }
         },
+        goBack() {
+            //处理兼容，如果没有上一级界面则返回首页
+            const pages = getCurrentPages();
+            if (pages.length === 2) {
+                uni.navigateBack({
+                    delta: 1
+                });
+            } else if (pages.length === 1) {
+                uni.switchTab({
+                    url: '/pages/index/default/default',
+                })
+            } else {
+                uni.navigateBack({
+                    delta: 1
+                });
+            }
+        },
     }
 }
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 f2fb4bb1c2c57bb5b575adfabe6496dce54e066d..8aee044d2f74ca8eb7b32d3539fa63f5ba6530bc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js
@@ -1,5 +1,4 @@
 import { apiBaseUrl } from '@/common/setting/constVarsHelper.js';
-import * as common from '@/common/utils/commonHelper.js' //引入common
 import * as db from '@/common/utils/dbHelper.js' //引入common
 
 
@@ -53,7 +52,7 @@ const install = (Vue, vm) => {
             // 登录信息过期或者未登录
             if (result.data === 14007 || result.data === 14006) {
                 // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
-                if (page.route.indexOf('pages/login/loginByAccount/loginByAccount') < 0) {
+                if (page.route.indexOf('pages/login/loginBySMS/loginBySMS') < 0) {
                     db.del("userToken");
                     uni.showToast({
                         title: result.msg,
@@ -63,7 +62,7 @@ const install = (Vue, vm) => {
                             setTimeout(function () {
                                 uni.hideToast();
                                 uni.navigateTo({
-                                    url: '/pages/login/loginByAccount/loginByAccount'
+                                    url: '/pages/login/loginBySMS/loginBySMS'
                                 });
                             },
                                 1000);
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
index e6d140b49792015ba4dfacb1b5dcc2e4acaa5883..4bcd5e4c5981b82b77f7518d4f01d40e3d8f21df 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
@@ -1,7 +1,8 @@
 /**
- *  CoreShop全局配置文件
+ *  全局配置文件
  *  @version 1.0.0
  */
+
 //接口请求地址，如果需要不部署接口端的情况下测试uni-app，可以直接替换为官方测试接口：https://api.demo.coreshop.cn
 export const apiBaseUrl = 'https://api.demo.coreshop.cn';
 //项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.cdn.coreshop.cn
@@ -12,6 +13,7 @@ export const h5Url = apiBaseUrl + "wap/"; //H5端网站地址,
 // #ifdef H5
 export const baseUrl = process.env.NODE_ENV === 'development' ? window.location.origin + '/' : apiBaseUrl
 // #endif
+
 export const paymentType = {
     //支付单类型
     order: 1, //订单
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/coreThemeHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/coreThemeHelper.js
new file mode 100644
index 0000000000000000000000000000000000000000..900f00c7daae532b49d99f8884180a1da6e47644
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/coreThemeHelper.js
@@ -0,0 +1,25 @@
+/**
+ *  很多无法css实现的换肤效果，通过此模块实现
+ *  使用方法，在代码中直接使用 this.$coreTheme.mainNabBar.background
+ *  @version 1.0.0
+ */
+
+//通用头部背景样式
+export const mainNabBar = {
+    background: {
+        //颜色
+        backgroundColor: '#e54d42',
+        // 导航栏背景图
+        // background: 'url(https://cdn.uviewui.com/uview/swiper/1.jpg) no-repeat',
+        // 还可以设置背景图size属性
+        // backgroundSize: 'cover',
+
+        // 渐变色
+        //backgroundImage: 'linear-gradient(45deg, rgb(28, 187, 180), rgb(141, 198, 63))'
+    },
+    //通用头部文字颜色
+    titleColor: "#fff",
+    //通用头部文字颜色
+    backIconColor: "#fff",
+};
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/store/index.js b/CoreCms.Net.Uni-App/CoreShop/common/store/index.js
index 13aa5564ade13f9abfde1dcdb58b2d605751bc1d..a0cf5f05b1de53c204a68b945dd45c3a38c55934 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/store/index.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/store/index.js
@@ -6,9 +6,10 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
     state: {
         config: {
-            shopLogo:"/static/images/common/tab-ic-me-selected.png"
+            shopLogo: "/static/images/logo/logo.png"
         }, // 店铺配置信息 //添加一个前端项目中的图片地址
         orderTab: 0, // 选中的订单tab页
+        scene: 0, // 选中的订单tab页
         redirectPage: '',
         uuid: '',//当前客户端
         searchStyle: '',
@@ -27,6 +28,9 @@ const store = new Vuex.Store({
         orderTab(state, tab) {
             state.orderTab = tab
         },
+        scene(state, tab) {
+            state.scene = tab
+        },
         redirect(state, payload) {
             state.redirectPage = payload.page
         },
@@ -60,6 +64,7 @@ const store = new Vuex.Store({
     },
     getters: {
         shopConfig: state => state.config,
+        scene: state => state.scene,
         userInfo: state => state.userInfo,
         uuid: state => state.uuid,
         hasLogin: state => state.hasLogin,
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js
index 8c1f6cab7c8e0ab7cd8d545545268077cc0eab28..c2518ec8bbf2c2ad36bcc614b06cbfc57362766c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/utils/commonHelper.js
@@ -1,5 +1,3 @@
-import * as db from './dbHelper.js' //引入common
-import store from '@/common/store'
 
 // 提示框
 function modelShow(
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/utils/dbHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/utils/dbHelper.js
index efeee3abc0ee0b9edea51693acf050ea12617eeb..e3443fd94d4ec192b289a03d2929ccf30f204972 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/utils/dbHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/utils/dbHelper.js
@@ -1,4 +1,3 @@
-import * as common from './commonHelper.js' //引入common
 
 //取值
 function get(key, sync = true) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/utils/uploadHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/utils/uploadHelper.js
index f8d82d444f0d6b5d3da3ebc54d56344e09acb0cd..0772d56fca3c7e17bfb12b04850d5e64fd347034 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/utils/uploadHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/utils/uploadHelper.js
@@ -1,5 +1,4 @@
 import { apiBaseUrl } from '@/common/setting/constVarsHelper.js';
-import * as common from './commonHelper.js' //引入common
 import * as db from './dbHelper.js' //引入common
 
 const showError = error => {
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/checkBtn/checkBtn.vue b/CoreCms.Net.Uni-App/CoreShop/components/checkBtn/checkBtn.vue
deleted file mode 100644
index 87c1d6dff6fa0aa31da580f534707a96ba38e806..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/checkBtn/checkBtn.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-    <view class="corecms-nowrap corecms-flex-vcenter" :style="{width:width}" @tap.stop="changeStatus">
-        <view :class="['corecms-check-btn', status ? 'corecms-check-checked' : '']"
-              :style="{fontSize:size+'rpx', lineHeight:size+'rpx', color : status ? checkedColor : color}"></view>
-        <view class="corecms-check-lable"><slot></slot></view>
-    </view>
-</template>
-<script>
-    export default {
-        props: {
-            width: {
-                type: String,
-                default: '100%'
-            },
-            size: {
-                type: Number,
-                default: 38
-            },
-            color: {
-                type: String,
-                default: '#EEEEEE'
-            },
-            checked: {
-                type: Boolean,
-                default: false
-            },
-            checkedColor: {
-                type: String,
-                default: '#FF0036'
-            },
-            parameter: {
-                type: Array,
-                default: function () {
-                    return []
-                }
-            }
-        },
-        data() {
-            return {
-                status: false
-            }
-        },
-        watch: {
-            checked: function (val, old) {
-                this.status = val;
-            }
-        },
-        created: function () {
-            this.status = this.checked;
-        },
-        methods: {
-            changeStatus: function () {
-                this.status = !this.status;
-                this.$emit('change', [this.status, this.parameter]);
-            }
-        }
-    }
-</script>
-<style scoped lang="scss">
-    .corecms-check-btn { color: #999999; flex-shrink: 0; }
-        .corecms-check-btn:after { content: '\2713'; display: inline-block; vertical-align: 20rpx; width: 38rpx; height: 38rpx; margin-right: 20rpx; border-radius: 20rpx; background: #fff; text-indent: 8rpx; line-height: .65; border: 1rpx #c7c6c6 solid; }
-    .corecms-check-checked:after { content: '\2713'; background: #ff0000; color: #fff; border: 1rpx #ff0000 solid; }
-    .corecms-check-lable { color: #555555; margin-left: 20rpx; font-size: 26rpx; width: 700rpx; }
-    .corecms-nowrap { display: flex; flex-direction: row; flex-wrap: nowrap; }
-    .corecms-flex-vcenter { align-items: center; }
-</style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-lvv-popup/corecms-lvv-popup.vue b/CoreCms.Net.Uni-App/CoreShop/components/corecms-lvv-popup/corecms-lvv-popup.vue
deleted file mode 100644
index 99d12a1c793741c55041bdd412a3fd6db975fae6..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-lvv-popup/corecms-lvv-popup.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-	<view class="lvv-popup" v-show="popshow" @touchmove.prevent>
-		<view class="lvv-popupmark" :class="position=='top'&&!hideanimation?'pt':position=='left'&&!hideanimation?'pl':position=='right'&&!hideanimation?'pr':position=='bottom'&&!hideanimation?'pc':position=='top'&&hideanimation?'ht':position=='left'&&hideanimation?'hl':position=='right'&&hideanimation?'hr':position=='bottom'&&hideanimation?'hc':''" @click="close"></view>
-		<view class="lvv-popupcontent" @click="close" :class="position=='top'&&!hideanimation?'pt':position=='left'&&!hideanimation?'pl':position=='right'&&!hideanimation?'pr':position=='bottom'&&!hideanimation?'pb':position=='top'&&hideanimation?'ht':position=='left'&&hideanimation?'hl':position=='right'&&hideanimation?'hr':position=='bottom'&&hideanimation?'hb':''">
-			<view class="realcontent" @click.stop="">
-				<slot></slot>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	export default {
-		props:{
-			position:{
-				type:String,
-				default:null 
-			}
-		},
-		data() { 
-			return { 
-				popshow:false,
-				hideanimation:false,
-			};
-		},
-		methods:{
-			// Toshow popup page
-			show:function(){
-				this.popshow = true;
-			},
-			// Tohide popup page
-			close:function(){
-				let that = this;
-				this.$emit("close");
-				that.hideanimation = true;
-				if(that.position==null){
-					that.popshow = false;
-				}else{
-					setTimeout(function(){
-						that.popshow = false;
-						that.hideanimation = false;
-					},500)
-				}
-			}
-		},
-	}
-</script>
-
-<style scoped lang="scss">
-    .lvv-popup { top: 0; left: 0; width: 100%; height: 100%; position: fixed; z-index: 98; }
-        .lvv-popup .lvv-popupmark { top: 0; left: 0; width: 100%; height: 100%; z-index: 99; position: absolute; background: rgba(0, 0, 0, 0.5); }
-            .lvv-popup .lvv-popupmark.pt, .lvv-popup .lvv-popupmark.ht { background: none; }
-        .lvv-popup .lvv-popupcontent { width: 100%; height: 100%; top: 0; left: 0; position: absolute; z-index: 100; }
-        .lvv-popup .pt { animation: showtop 0.5s; }
-        .lvv-popup .pl { animation: showleft 0.5s; }
-        .lvv-popup .pr { animation: showright 0.5s; }
-        .lvv-popup .pb { animation: showbottom .5s; }
-        .lvv-popup .ht { animation: hidetop 0.5s; }
-        .lvv-popup .hl { animation: hideleft 0.55s; }
-        .lvv-popup .hr { animation: hideright 0.55s; }
-        .lvv-popup .hb { animation: hidebottom 1s; }
-        .lvv-popup .pc { animation: showcontent .55s; }
-        .lvv-popup .hc { animation: hidecontent .55s; }
-
-    @keyframes showtop {
-        0% { transform: translateY(-100%); opacity: 1; }
-        100% { top: 0px; transform: translateY(0%); opacity: 1; }
-    }
-
-    @keyframes showleft {
-        0% { transform: translateX(-100%); opacity: 1; }
-        50% { opacity: 0; }
-        100% { transform: translateX(0); }
-    }
-
-    @keyframes showright {
-        0% { transform: translateX(100%); opacity: 1; }
-        50% { opacity: 0; }
-        100% { transform: translateX(0); }
-    }
-
-    @keyframes showbottom {
-        0% { transform: translateY(100%); opacity: 1; }
-        50% { opacity: 0.5; }
-        100% { transform: translateY(0); }
-    }
-
-    @keyframes hidetop {
-        0% { transform: translateY(0%); opacity: 1; }
-        100% { transform: translateY(-100%); opacity: 1; }
-    }
-
-    @keyframes hideleft {
-        0% { transform: translateX(0); }
-        50% { opacity: 0; }
-        100% { transform: translateX(-100%); opacity: 1; }
-    }
-
-    @keyframes hideright {
-        0% { transform: translateX(0); }
-        50% { opacity: 0; }
-        100% { transform: translateX(100%); opacity: 1; }
-    }
-
-    @keyframes hidebottom {
-        0% { transform: translateY(0); }
-        50% { opacity: 0; }
-        100% { transform: translateY(100%); opacity: 1; }
-    }
-
-    @keyframes showcontent {
-        0% { opacity: 0; }
-        100% { opacity: 1; }
-    }
-
-    @keyframes hidecontent {
-        0% { opacity: 1; }
-        100% { opacity: 0; }
-    }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms.vue b/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms.vue
deleted file mode 100644
index 0f3c70dc9d428203fa3cc4b1ffea17d02fae76a2..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-    <view>
-        <block v-for="(item,index) in corecmsdata" :key="index">
-            <!--�������޸���-->
-            <corecmssearch :corecmsdata="item" v-if="item.widgetCode=='search' "></corecmssearch>
-            <!--�л�-->
-            <corecmstabbar :corecmsdata="item" v-if="item.widgetCode=='tabBar' "></corecmstabbar>
-            <!--���棨�޸���-->
-            <corecmsnotice :corecmsdata="item" v-if="item.widgetCode=='notice' "></corecmsnotice>
-            <!--ͼƬ�ֲ����޸���-->
-            <corecmsimgSlide :corecmsdata="item" v-if="item.widgetCode=='imgSlide' "></corecmsimgSlide>
-            <!--�Ż�ȯ���޸���-->
-            <corecmscoupon :corecmsdata="item" v-if="item.widgetCode=='coupon' "></corecmscoupon>
-            <!--�ո��޸���-->
-            <corecmsblank :corecmsdata="item" v-if="item.widgetCode=='blank' "></corecmsblank>
-            <!--�����ı����������޸���-->
-            <corecmstextarea :corecmsdata="item" v-if="item.widgetCode=='textarea' "></corecmstextarea>
-            <!--��Ƶ���޸���-->
-            <corecmsvideo :corecmsdata="item" v-if="item.widgetCode=='video' "></corecmsvideo>
-            <!--ͼƬ�����޸���-->
-            <corecmsimgWindow :corecmsdata="item" v-if="item.widgetCode=='imgWindow' "></corecmsimgWindow>
-            <!--ͼƬ--���޸���-->
-            <corecmsimgSingle :corecmsdata="item" v-if="item.widgetCode=='imgSingle' "></corecmsimgSingle>
-            <!--��Ʒ���޸���-->
-            <corecmsgoods :corecmsdata="item" v-if="item.widgetCode=='goods' "></corecmsgoods>
-            <!--���£��޸���-->
-            <corecmsarticle :corecmsdata="item" v-if="item.widgetCode=='article' "></corecmsarticle>
-            <!--���·��ࣨ�޸���-->
-            <corecmsarticleClassify :corecmsdata="item" v-if="item.widgetCode=='articleClassify' "></corecmsarticleClassify>
-            <!--�����Զ��嵼�����޸���-->
-            <corecmsnavBar :corecmsdata="item" v-if="item.widgetCode=='navBar' "></corecmsnavBar>
-            <!--�Ź����޸���-->
-            <corecmsgroupPurchase :corecmsdata="item" v-if="item.widgetCode=='groupPurchase' "></corecmsgroupPurchase>
-            <!--�����¼���޸���-->
-            <corecmsrecord :corecmsdata="item" v-if="item.widgetCode=='record' "></corecmsrecord>
-            <!--ƴ�ţ��޸���-->
-            <corecmspinTuan :corecmsdata="item" v-if="item.widgetCode=='pinTuan' "></corecmspinTuan>
-            <!--�����޸���-->
-            <corecmsservice :corecmsdata="item" v-if="item.widgetCode=='service' "></corecmsservice>
-            <!--�������-->
-            <corecmsadpop :corecmsdata="item" v-if="item.widgetCode=='adpop' "></corecmsadpop>
-            <!--�ı����ݣ��޸���-->
-            <corecmsContent :corecmsdata="item" v-if="item.widgetCode=='content' "></corecmsContent>
-        </block>
-    </view>
-</template>
-
-<script>
-    import corecmsimgSlide from '@/components/corecms-page/corecms-imgSlide.vue'
-    import corecmssearch from '@/components/corecms-page/corecms-search.vue'
-    import corecmsnotice from '@/components/corecms-page/corecms-notice.vue'
-    import corecmscoupon from '@/components/corecms-page/corecms-coupon.vue'
-    import corecmsblank from '@/components/corecms-page/corecms-blank.vue'
-    import corecmstextarea from '@/components/corecms-page/corecms-textarea.vue'
-    import corecmsvideo from '@/components/corecms-page/corecms-video.vue'
-    import corecmsimgWindow from '@/components/corecms-page/corecms-imgWindow.vue'
-    import corecmsimgSingle from '@/components/corecms-page/corecms-imgSingle.vue'
-    import corecmsgoods from '@/components/corecms-page/corecms-goods.vue'
-    import corecmsarticle from '@/components/corecms-page/corecms-article.vue'
-    import corecmsarticleClassify from '@/components/corecms-page/corecms-articleClassify.vue'
-    import corecmsnavBar from '@/components/corecms-page/corecms-navBar.vue'
-    import corecmsgroupPurchase from '@/components/corecms-page/corecms-groupPurchase.vue'
-    import corecmsrecord from '@/components/corecms-page/corecms-record.vue'
-    import corecmspinTuan from '@/components/corecms-page/corecms-pinTuan.vue'
-    import corecmsservice from '@/components/corecms-page/corecms-service.vue'
-    import corecmstabbar from '@/components/corecms-page/corecms-tabbar.vue'
-    import corecmsadpop from '@/components/corecms-page/corecms-adpop.vue'
-    import corecmsContent from '@/components/corecms-page/corecms-content.vue'
-
-    export default {
-        name: 'corecmsPage',
-        components: {
-            corecmsimgSlide,
-            corecmssearch,
-            corecmsnotice,
-            corecmscoupon,
-            corecmsblank,
-            corecmstextarea,
-            corecmsvideo,
-            corecmsimgWindow,
-            corecmsimgSingle,
-            corecmsgoods,
-            corecmsarticle,
-            corecmsarticleClassify,
-            corecmsnavBar,
-            corecmsgroupPurchase,
-            corecmsrecord,
-            corecmspinTuan,
-            corecmsservice,
-            corecmstabbar,
-            corecmsadpop,
-            corecmsContent
-        },
-        props: {
-            corecmsdata: {
-                default: function () {
-                    return []
-                }
-            }
-        }
-    }
-</script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-copyright/corecms-copyright.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue
similarity index 79%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-copyright/corecms-copyright.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue
index 1985eb00d5eff7ab4e6e26efac44d5fd3ed26a53..052be75e6d6ae14b3fa361af009fefc7d84cec9d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-copyright/corecms-copyright.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="cpr">
+    <view class="coreshop-copyright">
         <view class="u-font-xs" v-if="shopName">
             © {{shopName}} 版权所有
         </view>
@@ -20,6 +20,4 @@
     }
 </script>
 <style scoped lang="scss">
-    .cpr { text-align: center; margin: 20rpx 0; width: 100%; overflow: hidden; }
-    .beian a { text-decoration: none; color: #999 !important; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-fab/corecms-fab.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-fab/coreshop-fab.vue
similarity index 77%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-fab/corecms-fab.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-fab/coreshop-fab.vue
index b437283279502945a0a79eaad9bbb4b5cbbea312..2314c7dfec614b49b147b28938ef47dd86454d98 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-fab/corecms-fab.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-fab/coreshop-fab.vue
@@ -1,12 +1,6 @@
 <template>
     <view>
-        <view class="fab-box fab"
-              :class="{
-				leftBottom: leftBottom,
-				rightBottom: rightBottom,
-				leftTop: leftTop,
-				rightTop: rightTop
-			}">
+        <view class="fab-box fab" :class="{ leftBottom: leftBottom, rightBottom: rightBottom, leftTop: leftTop, rightTop: rightTop }">
             <view class="fab-circle"
                   :class="{
 					left: horizontal === 'left' && direction === 'horizontal',
@@ -201,29 +195,36 @@
 </script>
 
 <style scoped lang="scss">
-    .fab-box { position: fixed; display: flex; justify-content: center; align-items: center; z-index: 2; }
-        .fab-box.top { width: 60upx; height: 60upx; right: 30upx; bottom: 180upx; border: 1px #5989b9 solid; background: #6699cc; border-radius: 10upx; color: #fff; transition: all 0.3; opacity: 0; }
-        .fab-box.active { opacity: 1; }
-        .fab-box.fab { z-index: 10; }
-            .fab-box.fab.leftBottom { left: 30upx; bottom: 180upx; }
-            .fab-box.fab.leftTop { left: 30upx; top: 80upx; /* #ifdef H5 */ top: calc(80upx + var(--window-top)); /* #endif */ }
-            .fab-box.fab.rightBottom { right: 30upx; bottom: 180upx; }
-            .fab-box.fab.rightTop { right: 30upx; top: 80upx; /* #ifdef H5 */ top: calc(80upx + var(--window-top)); /* #endif */ }
-    .fab-circle { display: flex; justify-content: center; align-items: center; position: absolute; width: 90upx; height: 90upx; background: #3c3e49; /* background: #5989b9; */ border-radius: 50%; box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.2); z-index: 11; }
-        .fab-circle.left { left: 0; }
-        .fab-circle.right { right: 0; }
-        .fab-circle.top { top: 0; }
-        .fab-circle.bottom { bottom: 0; }
-        .fab-circle .icon-jia { color: #ffffff; font-size: 50upx; transition: all 0.3s; width: 45rpx; height: 45rpx; }
-            .fab-circle .icon-jia.active { transform: rotate(90deg); }
-    .fab-content { background: #6699cc; box-sizing: border-box; display: flex; border-radius: 100upx; overflow: hidden; box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.1); transition: all 0.2s; width: 110upx; }
-        .fab-content.left { justify-content: flex-start; }
-        .fab-content.right { justify-content: flex-end; }
-        .fab-content.flexDirection { flex-direction: column; justify-content: flex-end; }
-        .fab-content.flexDirectionStart { flex-direction: column; justify-content: flex-start; }
-        .fab-content.flexDirectionEnd { flex-direction: column; justify-content: flex-end; }
-        .fab-content .fab-item { display: flex; flex-direction: column; justify-content: center; align-items: center; width: 90upx; height: 90upx; font-size: 24upx; color: #fff; opacity: 0; transition: opacity 0.2s; }
-            .fab-content .fab-item.active { opacity: 1; }
-            .fab-content .fab-item .content-image { width: 60upx; height: 60upx; margin-bottom: 10upx; }
-            .fab-content .fab-item.first { width: 110upx; }
+    .fab-box { position: fixed; display: flex; justify-content: center; align-items: center; z-index: 2;
+        &.top { width: 60upx; height: 60upx; right: 30upx; bottom: 180upx; border: 1px #5989b9 solid; background: #6699cc; border-radius: 10upx; color: #fff; transition: all 0.3; opacity: 0; }
+        &.active { opacity: 1; }
+        &.fab { z-index: 10;
+            &.leftBottom { left: 30upx; bottom: 180upx; }
+            &.leftTop { left: 30upx; top: 80upx; top: calc(80upx + var(--window-top)); }
+            &.rightBottom { right: 30upx; bottom: 180upx; }
+            &.rightTop { right: 30upx; top: 80upx; top: calc(80upx + var(--window-top)); }
+        }
+    }
+    .fab-circle { display: flex; justify-content: center; align-items: center; position: absolute; width: 90upx; height: 90upx; background: #3c3e49; border-radius: 50%; box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.2); z-index: 11;
+        &.left { left: 0; }
+        &.right { right: 0; }
+        &.top { top: 0; }
+        &.bottom { bottom: 0; }
+        .icon-jia { color: #ffffff; font-size: 50upx; transition: all 0.3s; width: 45rpx; height: 45rpx;
+            &.active { transform: rotate(90deg); }
+        }
+    }
+    .fab-content { background: #6699cc; box-sizing: border-box; display: flex; border-radius: 100upx; overflow: hidden; box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.1); transition: all 0.2s; width: 110upx;
+        &.left { justify-content: flex-start; }
+        &.right { justify-content: flex-end; }
+        &.flexDirection { flex-direction: column; justify-content: flex-end; }
+        &.flexDirectionStart { flex-direction: column; justify-content: flex-start; }
+        &.flexDirectionEnd { flex-direction: column; justify-content: flex-end; }
+        .fab-item { display: flex; flex-direction: column; justify-content: center; align-items: center; width: 90upx; height: 90upx; font-size: 24upx; color: #fff; opacity: 0; transition: opacity 0.2s;
+            &.active { opacity: 1; }
+            .content-image { width: 60upx; height: 60upx; margin-bottom: 10upx; }
+            &.first { width: 110upx; }
+        }
+    }
+
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-login-modal/corecms-login-modal.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
similarity index 81%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-login-modal/corecms-login-modal.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
index 0f38ff32dbc6f46a6e81b9ca91a7c6a4ccf43197..82d5d3027bcc5f5a4bdbd163971363657acb067b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-login-modal/corecms-login-modal.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
@@ -2,8 +2,8 @@
     <view>
         <u-toast ref="uToast" />
         <!-- #ifndef MP-WEIXIN  -->
-        <view class="cu-modal" v-if="showLogin" :class="[{ show: showLogin }, modalType]" cathctouchmove @tap="hideModal">
-            <view class="cu-dialog" @tap.stop style="background: none;overflow: visible;">
+        <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">
@@ -22,29 +22,29 @@
                         <view class="title2">为了提供更优质的服务</view>
                         <view class="title2">需要获取您的头像昵称</view>
                     </view>
-                    <view class="btn-box y-f">
+                    <view class="u-margin-top-80 coreshop-flex coreshop-flex-direction coreshop-align-center">
                         <!-- #ifdef MP-ALIPAY -->
-                        <button class="cu-btn login-btn" @click="getALICode">授权并查看</button>
+                        <u-button  type="success"  @click="getALICode()">授权并查看</u-button>
                         <!-- #endif -->
                         <!-- #ifdef MP-TOUTIAO -->
-                        <button class="cu-btn login-btn" @click="ttLogin()">授权并查看</button>
+                        <u-button  type="success"  @click="ttLogin()">授权并查看</u-button>
                         <!-- #endif -->
                         <!-- #ifdef H5 || APP-PLUS -->
-                        <button class="cu-btn login-btn" @click="toAccountLogin()">授权并查看</button>
+                        <u-button  type="success"  @click="toAccountLogin()">授权并查看</u-button>
                         <!-- #endif -->
-                        <button class="cu-btn close-btn" @tap="closeAuth">暂不授权</button>
+                         <u-button  @click="closeAuth">暂不授权</u-button>
                     </view>
                 </view>
             </view>
-        </view>
+        </u-popup>
         <!-- #endif  -->
         <!-- #ifdef MP-WEIXIN  -->
-        <view class="cu-modal" v-if="showLogin" :class="[{ show: showLogin }, modalType]">
-            <view class="cu-dialog" @tap.stop style="background: none;overflow: visible;">
+        <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">
                     <view class="detail">
                         <view class="shopDesc">
-                            <view class="cu-avatar sm round margin-left">
+                            <view class="coreshop-avatar sm round margin-left">
                                 <u-image width="48rpx" height="48rpx" :src="shopLogo"></u-image>
                             </view>
                             <text class="shopName">
@@ -60,25 +60,25 @@
                             2、使用我们的相关服务，需要将您的手机号授权给我们。
                         </view>
                         <!--服务协议-->
-                        <view class="margin-tb agreement-checked-view">
+                        <view class="u-margin-top-30 u-margin-bottom-30 agreement-checked-view">
                             <u-checkbox v-model="agreement" @change="checkboxChange" size="30" active-color="#19be6b"></u-checkbox>
-                            <view class="text-black-view">
-                                <text class="text-black">同意</text>
+                            <view class="coreshop-text-black-view">
+                                <text class="coreshop-text-black">同意</text>
                                 <text class="text-blue" @tap="goUserAgreementPage">《服务协议》</text>
-                                <text class="text-black">与</text>
+                                <text class="coreshop-text-black">与</text>
                                 <text class="text-blue" @tap="goUserPrivacyPolicy">《隐私协议》</text>
                             </view>
                         </view>
                     </view>
-                    <view class="btn-box-getPhoneNumber x-bc">
-                        <button class="cu-btn bg-grey close-btn" @tap="closeAuth">取消</button>
+                    <view class="u-flex u-row-between u-padding-left-30 u-padding-right-30">
+                        <u-button  @click="closeAuth">暂不授权</u-button>
                         <!-- #ifdef MP-WEIXIN -->
-                        <button class="cu-btn login-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">确定</button>
+                        <u-button  type="success" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">确定授权</u-button>
                         <!-- #endif -->
                     </view>
                 </view>
             </view>
-        </view>
+        </u-popup>
         <!-- #endif  -->
     </view>
 </template>
@@ -89,11 +89,9 @@
      * @property {Boolean} value=showLoginTip - 由v-model控制显示隐藏。
      * @property {Boolean} forceOauth - 小程序端特制的全屏登录提示。
      */
-    import { articles } from '@/common/mixins/mixinsHelper.js'
     import { mapMutations, mapActions, mapState } from 'vuex';
     export default {
-        name: 'coreCmsLoginModal',
-        mixins: [articles],
+        name: 'coreshopLoginModal',
         components: {},
         data() {
             return {
@@ -142,7 +140,7 @@
             var userInfo = this.$store.state.userInfo;
             //var token = this.$db.get('userToken');
             if (Object.keys(userInfo).length != 0) {
-                console.log("获取到用户数据");
+                console.log("获取到store.state用户数据");
             } else {
                 _this.doToken();
             }
@@ -412,31 +410,22 @@
 </script>
 
 <style lang="scss">
-    .modal-box { width: 610rpx; border-radius: 20rpx; background: #fff; position: relative; left: 50%; transform: translateX(-50%); padding-bottom: 30rpx; z-index: 11111; }
-        .modal-box .head-bg { width: 100%; height: 210rpx; }
-        .modal-box .detail { width: 100%; text-align: center; }
-            .modal-box .detail .title1 { color: #46351b; font-size: 35rpx; font-weight: bold; }
-            .modal-box .detail .title2 { font-size: 28rpx; color: #999; padding-top: 20rpx; }
-            .modal-box .detail .title3 { color: #46351b; font-size: 35rpx; font-weight: bold; text-align: left; line-height: 35rpx; padding: 30rpx 0 30rpx 30rpx; }
-            .modal-box .detail .desc { font-size: 24rpx; line-height: 40rpx; color: #333; margin: 0 30rpx 0rpx 30rpx; background: #f7f8fa; text-align: left; padding: 30rpx; }
-
-    .shopDesc { padding: 30rpx 0rpx 0rpx 0rpx; text-align: left; }
-        .shopDesc .shopName { margin-left: 20rpx; line-height: 40rpx; }
-        .shopDesc .get { margin-left: 20rpx; line-height: 40rpx; }
-
-    .user-avatar { width: 160rpx; height: 160rpx; overflow: hidden; margin: 0 auto; margin-bottom: 40rpx; }
-    .user-name { font-size: 35rpx; font-family: PingFang SC; font-weight: bold; color: #845708; margin-bottom: 30rpx; }
-
-    .modal-box .btn-box { margin-top: 80rpx; }
-        .modal-box .btn-box .login-btn { width: 492rpx; height: 70rpx; background: linear-gradient(90deg, #e9b461, #eecc89); box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); border-radius: 35rpx; font-size: 28rpx; color: rgba(255, 255, 255, 0.9); }
-        .modal-box .btn-box .close-btn { width: 492rpx; height: 70rpx; color: #e9b766; font-size: 26rpx; margin-top: 20rpx; background: none; }
-
-    .modal-box .btn-box-getPhoneNumber { margin-top: 0rpx; padding: 0 30rpx; }
-        .modal-box .btn-box-getPhoneNumber .login-btn { width: 45%; height: 70rpx; background: linear-gradient(90deg, #e9b461, #eecc89); box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); font-size: 28rpx; color: rgba(255, 255, 255, 0.9); }
-        .modal-box .btn-box-getPhoneNumber .close-btn { width: 45%; height: 70rpx; color: #e9b766; font-size: 26rpx; background-color: #ededed; color: #ffffff; }
-
-
-    .agreement-checked-view { position: relative; padding: 18.18rpx 0rpx 18.18rpx 30rpx; display: flex; align-items: center; margin: 10rpx 0; font-size: 24rpx; }
-        .agreement-checked-view .coreshop-checked { transform: scale(0.7); }
-    /*.agreement-checked-view .text-black-view { line-height: 47.27rpx; }*/
+    .modal-box { width: 610rpx; border-radius: 20rpx; background: #fff; position: relative; left: 50%; transform: translateX(-50%); padding: 30rpx; z-index: 11111;
+        .head-bg { width: 100%; height: 210rpx; }
+        .detail { width: 100%; text-align: center;
+            .title1 { color: #46351b; font-size: 35rpx; font-weight: bold; }
+            .title2 { font-size: 28rpx; color: #999; padding-top: 20rpx; }
+            .title3 { color: #46351b; font-size: 35rpx; font-weight: bold; text-align: left; line-height: 35rpx; padding: 30rpx 0 30rpx 30rpx; }
+            .desc { font-size: 24rpx; line-height: 40rpx; color: #333; background: #f7f8fa; text-align: left; padding: 20rpx; }
+            .user-avatar { width: 160rpx; height: 160rpx; overflow: hidden; margin: 0 auto; margin-bottom: 40rpx; }
+            .user-name { font-size: 35rpx; font-family: PingFang SC; font-weight: bold; color: #845708; margin-bottom: 30rpx; }
+        }
+    }
+    .shopDesc { padding: 30rpx 0rpx 0rpx 0rpx; text-align: left;
+        .shopName { margin-left: 20rpx; line-height: 40rpx; }
+        .get { margin-left: 20rpx; line-height: 40rpx; }
+    }
+    .agreement-checked-view { position: relative; padding: 18.18rpx 0rpx 18.18rpx 30rpx; display: flex; align-items: center; margin: 10rpx 0; font-size: 24rpx;
+        .coreshop-checked { transform: scale(0.7); }
+    }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-modal-img/corecms-modal-img.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-modal-img/coreshop-modal-img.vue
similarity index 90%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-modal-img/corecms-modal-img.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-modal-img/coreshop-modal-img.vue
index 89a83d15f0e3af1f70b481d5c80192c19996583c..3a4a9eb851f4ce550af4734c0a6c70d15ae640ce 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-modal-img/corecms-modal-img.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-modal-img/coreshop-modal-img.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="zaiui-modal-box" :class="show?'show':''">
+	<view class="coreshop-modal-box" :class="show?'show':''">
 		<view class="dialog">
 			<image class="img" :src="src" lazy-load mode="widthFix" @tap="imgEvent"></image>
 			<text class="cuIcon-roundclose close" @tap="closeEvent"></text>
@@ -9,7 +9,7 @@
 
 <script>
 	export default {
-		name: 'corecms-modal-img',
+		name: 'coreshop-modal-img',
 		props: {
 			src: {
 				type: String,
@@ -32,7 +32,7 @@
 </script>
 
 <style lang="scss" scoped>
-	.zaiui-modal-box {
+	.coreshop-modal-box {
 	    position: fixed;
 		opacity: 0;
 		top: inherit;
@@ -67,7 +67,7 @@
 			}
 		}
 	}
-	.zaiui-modal-box.show {
+	.coreshop-modal-box.show {
 		top: 0;
 		left: 0;
 		right: 0;
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-adpop.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-adpop.vue
similarity index 80%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-adpop.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-adpop.vue
index 5e24469690dba82b4834952aa7665bfa9688b6e6..b3518d8e0e34bb81b0ac18a727ba9f925d79ebb5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-adpop.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-adpop.vue
@@ -1,17 +1,17 @@
 <template>
     <!-- 单图 -->
-    <view class="corecms-adpop" v-if="corecmsdata.parameters.list && corecmsdata.parameters.list.length > 0">
+    <view class="coreshop-adpop" v-if="coreshopdata.parameters.list && coreshopdata.parameters.list.length > 0">
         <u-toast ref="uToast" />
         <view class="adpop" v-if="closeAd">
-            <view class="adpop-c">
+            <view class="adpop-center">
                 <view class="adpop-img">
                     <!-- #ifdef MP-WEIXIN -->
-                    <view @click="showSliderInfo2" :data-type="corecmsdata.parameters.list[0].linkType" :data-val="corecmsdata.parameters.list[0].linkValue">
-                        <image class="ad-img" :src="corecmsdata.parameters.list[0].image" mode="widthFix"></image>
+                    <view @click="showSliderInfo2" :data-type="coreshopdata.parameters.list[0].linkType" :data-val="coreshopdata.parameters.list[0].linkValue">
+                        <image class="ad-img" :src="coreshopdata.parameters.list[0].image" mode="widthFix"></image>
                     </view>
                     <!-- #endif -->
                     <!-- #ifndef MP-WEIXIN -->
-                    <image class="ad-img" :src="corecmsdata.parameters.list[0].image" mode="widthFix" @click="showSliderInfo(corecmsdata.parameters.list[0].linkType, corecmsdata.parameters.list[0].linkValue)"></image>
+                    <image class="ad-img" :src="coreshopdata.parameters.list[0].image" mode="widthFix" @click="showSliderInfo(coreshopdata.parameters.list[0].linkType, coreshopdata.parameters.list[0].linkValue)"></image>
                     <!-- #endif -->
                 </view>
                 <image class="close-btn" src="/static/images/close-pink.png" mode="" @click="closePop"></image>
@@ -24,9 +24,9 @@
     import { goods } from '@/common/mixins/mixinsHelper.js';
     export default {
         mixins: [goods],
-        name: "corecmsadpop",
+        name: "coreshopadpop",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Object,
                 required: true,
             }
@@ -38,8 +38,8 @@
         },
         computed: {
             count() {
-                // console.log(corecmsdata)
-                return (this.corecmsdata.parameters.list.length > 0)
+                // console.log(coreshopdata)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
 
         },
@@ -147,9 +147,14 @@
 </script>
 
 <style scoped lang="scss">
-    .adpop { position: fixed; background: rgba(0,0,0,.5); width: 100%; height: 100vh; z-index: 999; top: 0; left: 0; }
-    .adpop-c { position: absolute; left: 50%; top: 50%; transform: translate(-50%,-50%); width: 70%; text-align: center; }
-    .adpop-img { width: 100%; max-height: 1000rpx; margin-bottom: 50rpx; }
-    .ad-img { width: 100%; max-height: 1000rpx; }
-    .close-btn { width: 80rpx; height: 80rpx; }
+    .coreshop-adpop {
+        .adpop { position: fixed; background: rgba(0,0,0,.5); width: 100%; height: 100vh; z-index: 999; top: 0; left: 0;
+            .adpop-center { position: absolute; left: 50%; top: 50%; transform: translate(-50%,-50%); width: 70%; text-align: center;
+                .adpop-img { width: 100%; max-height: 1000rpx; margin-bottom: 50rpx;
+                    .ad-img { width: 100%; max-height: 1000rpx; }
+                }
+                .close-btn { width: 80rpx; height: 80rpx; }
+            }
+        }
+    }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-article.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-article.vue
similarity index 42%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-article.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-article.vue
index d2228fb1a3a0bc73a82d843ace702722d98a505c..b80abd8b6f9a691966c1aa540ed20b56e393151f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-article.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-article.vue
@@ -1,12 +1,8 @@
 <template>
-    <view class='index-article cell-group bottom-cell-group' v-if="corecmsdata.parameters.list && count">
+    <view class='coreshop-index-article coreshop-cell-group u-margin-bottom-20' v-if="coreshopdata.parameters.list && count">
         <u-toast ref="uToast" />
-        <view class='cell-item'
-              v-for="item in corecmsdata.parameters.list"
-              :key="item.id"
-              @click="articleDetail(item.id)">
-
-            <view class="cell-item-bd">
+        <view class='coreshop-cell-item' v-for="item in coreshopdata.parameters.list" :key="item.id" @click="articleDetail(item.id)">
+            <view class="coreshop-cell-item-bd">
                 <view class="article-title ">
                     {{ item.title }}
                 </view>
@@ -23,16 +19,16 @@
 
 <script>
     export default {
-        name: "corecmsarticle",
+        name: "coreshoparticle",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Array,
                 required: true,
             }
         },
         computed: {
             count() {
-                return (this.corecmsdata.parameters.list.length > 0)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
         },
         methods: {
@@ -45,11 +41,15 @@
 </script>
 
 <style scoped lang="scss">
-    .index-article { border-radius: 16rpx; padding: 0rpx 25rpx; background: #FFFFFF !important; color: #333333 !important; margin: 20rpx 20rpx; overflow: hidden; }
-    .cell-item { padding: 10rpx 0rpx 10rpx 0; float: left; width: 100%; border-bottom: 2rpx solid #f3f3f3; }
-    .index-article .cell-item-bd { float: left; width: calc(100% - 200rpx); height: 90rpx; margin-top: 20rpx; }
-    .index-article .cell-title-img { width: 160rpx; height: 160rpx; float: right; }
-    .coverImage { width: 100%; height: 100%; }
-    .index-article .article-title { font-size: 28rpx; color: #333; width: 100%; overflow: hidden; float: left; margin-bottom: 10rpx; }
-    .index-article .article-des { font-size: 24rpx; color: #999; overflow: hidden; float: left; line-height: 40rpx; }
+    .coreshop-index-article { border-radius: 16rpx; padding: 0rpx 25rpx; background: #FFFFFF !important; color: #333333 !important; margin: 20rpx 20rpx; overflow: hidden;
+        .coreshop-cell-item { padding: 10rpx 0rpx 10rpx 0; float: left; width: 100%; border-bottom: 2rpx solid #f3f3f3;
+            .coreshop-cell-item-bd { float: left; width: calc(100% - 200rpx); height: 90rpx; margin-top: 20rpx;
+                .article-title { font-size: 28rpx; color: #333; width: 100%; overflow: hidden; float: left; margin-bottom: 10rpx; }
+                .article-des { font-size: 24rpx; color: #999; overflow: hidden; float: left; line-height: 40rpx; }
+            }
+            .cell-title-img { width: 160rpx; height: 160rpx; float: right;
+                .coverImage { width: 100%; height: 100%; }
+            }
+        }
+    }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-articleClassify.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-articleClassify.vue
similarity index 41%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-articleClassify.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-articleClassify.vue
index 30912f862a725fd683628102e7d4abd733214ece..65811af62b9fa1c1f9fa37a56ab15800112d377c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-articleClassify.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-articleClassify.vue
@@ -1,10 +1,7 @@
 <template>
-    <view class='index-article cell-group bottom-cell-group' v-if="corecmsdata.parameters.list && count">
-        <view class='cell-item'
-              v-for="item in corecmsdata.parameters.list"
-              :key="item.id"
-              @click="articleDetail(item.id)">
-            <view class="cell-item-bd">
+    <view class='coreshop-index-article coreshop-cell-group u-margin-bottom-20' v-if="coreshopdata.parameters.list && count">
+        <view class='coreshop-cell-item' v-for="item in coreshopdata.parameters.list" :key="item.id" @click="articleDetail(item.id)">
+            <view class="coreshop-cell-item-bd">
                 <view class="article-title ">
                     {{ item.title }}
                 </view>
@@ -21,19 +18,19 @@
 
 <script>
     export default {
-        name: "corecmsarticleclassify",
+        name: "coreshoparticleclassify",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Array,
                 required: true,
             }
         },
         computed: {
             count() {
-                if (!this.corecmsdata.parameters.list) {
+                if (!this.coreshopdata.parameters.list) {
                     return false;
                 }
-                return (this.corecmsdata.parameters.list.length > 0)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
         },
         methods: {
@@ -46,11 +43,15 @@
 </script>
 
 <style lang="scss" scoped>
-    .index-article { border-radius: 16rpx; padding: 0rpx 25rpx; background: #FFFFFF !important; color: #333333 !important; margin: 20rpx 20rpx; overflow: hidden; }
-    .cell-item { padding: 10rpx 0rpx 10rpx 0; float: left; width: 100%; border-bottom: 2rpx solid #f3f3f3; }
-    .index-article .cell-item-bd { float: left; width: calc(100% - 200rpx); height: 90rpx; margin-top: 20rpx; }
-    .index-article .cell-title-img { width: 160rpx; height: 160rpx; float: right; }
-    .coverImage { width: 100%; height: 100%; }
-    .index-article .article-title { font-size: 28rpx; color: #333; width: 100%; overflow: hidden; float: left; margin-bottom: 10rpx; }
-    .index-article .article-des { font-size: 24rpx; color: #999; overflow: hidden; float: left; line-height: 40rpx; }
+    .coreshop-index-article { border-radius: 16rpx; padding: 0rpx 25rpx; background: #FFFFFF !important; color: #333333 !important; margin: 20rpx 20rpx; overflow: hidden;
+        .coreshop-cell-item { padding: 10rpx 0rpx 10rpx 0; float: left; width: 100%; border-bottom: 2rpx solid #f3f3f3;
+            .coreshop-cell-item-bd { float: left; width: calc(100% - 200rpx); height: 90rpx; margin-top: 20rpx;
+                .article-title { font-size: 28rpx; color: #333; width: 100%; overflow: hidden; float: left; margin-bottom: 10rpx; }
+                .article-des { font-size: 24rpx; color: #999; overflow: hidden; float: left; line-height: 40rpx; }
+            }
+            .cell-title-img { width: 160rpx; height: 160rpx; float: right;
+                .coverImage { width: 100%; height: 100%; }
+            }
+        }
+    }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-blank.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-blank.vue
similarity index 59%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-blank.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-blank.vue
index 7a6fad201a088f642a11eb38a8564bf19ab59b1d..7e52ee41504b8599c0d93c83e53d9524f61d6386 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-blank.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-blank.vue
@@ -1,14 +1,14 @@
 <template>
     <view>
-        <u-gap :height="corecmsdata.parameters.height * 2" :bg-color="corecmsdata.parameters.backgroundColor"></u-gap>
+        <u-gap :height="coreshopdata.parameters.height * 2" :bg-color="coreshopdata.parameters.backgroundColor"></u-gap>
     </view>
 </template>
 
 <script>
     export default {
-        name: "corecmsblank",
+        name: "coreshopblank",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Array,
                 required: true,
             }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-content.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-content.vue
similarity index 95%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-content.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-content.vue
index 7ae57eed02f2e538634ff103e2ed9cdcfe47e976..defa3c51e40430a37c9ffd04617708a71f35ac60 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-content.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-content.vue
@@ -7,7 +7,7 @@
 <script>
     //视频和文本解析组件
     export default {
-        name: 'corecmsContent',
+        name: 'coreshopContent',
         props: {
             content: {}
         },
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-coupon.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue
similarity index 37%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-coupon.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue
index 9827be054c9338e82779c7821e2d3e77b8a81fc8..138ddda4fd7ad63523404b55aaa5cf6d7813db38 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-coupon.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-coupon.vue
@@ -1,28 +1,28 @@
 <template>
-    <view class="coupon u-padding-left-15  u-padding-right-15" v-if="count">
+    <view class="coreshop-coupon u-padding-left-15  u-padding-right-15" v-if="count">
         <u-toast ref="uToast" />
-        <view class="coreshop-sponsored-card-view u-margin-bottom-10"  :class="item.maxRecevieNums > 0 && item.getNumber >= item.maxRecevieNums ?'coreshop-lower-shelf':''" v-for="(item, key) in corecmsdata.parameters.list" :key="key">
+        <view class="coreshop-coupon-card-view u-margin-bottom-10" :class="item.maxRecevieNums > 0 && item.getNumber >= item.maxRecevieNums ?'coreshop-lower-shelf':''" v-for="(item, key) in coreshopdata.parameters.list" :key="key">
             <view class="img-lower-box" v-if="item.maxRecevieNums > 0 && item.getNumber >= item.maxRecevieNums ">已领完</view>
             <view class="card-price-view">
-                <view class="text-red price-left-view">
+                <view class="price-left-view">
                     <image class="icon" src="/static/images/coupon/coupon-element.png" mode=""></image>
                 </view>
                 <view class="name-content-view">
-                    <view class="text-cut text-red"> {{item.name}}</view>
-                    <view class="text-xs">
+                    <view class="u-line-1 coreshop-text-red"> {{item.name}}</view>
+                    <view class="u-font-xs">
                         优惠方式：<text v-for="(itemResult, index) in item.results" :key="index">{{itemResult}}</text>
                     </view>
-                    <view class="text-xs">领取时间：{{$u.timeFormat(item.startTime, 'yyyy-mm-dd')}} 至 {{$u.timeFormat(item.endTime, 'yyyy-mm-dd')}}</view>
+                    <view class="u-font-xs">领取时间：{{$u.timeFormat(item.startTime, 'yyyy-mm-dd')}} 至 {{$u.timeFormat(item.endTime, 'yyyy-mm-dd')}}</view>
                 </view>
                 <view class="btn-right-view">
-                    <button class="cu-btn bg-red round sm" @click="receiveCoupon(item.id)">立即领取</button>
+                    <u-button type="success" shape="circle" size="mini" @click="receiveCoupon(item.id)">立即领取</u-button>
                 </view>
             </view>
             <view class="card-num-view">
-                <view class="text-xs conditions">
+                <view class="u-font-xs conditions">
                     <text v-for="(itemCondition, index) in item.conditions" :key="index">【{{itemCondition}}】</text>
                 </view>
-                <text class="cuIcon-unfold btnUnfold" />
+                <u-icon name="arrow-down-fill" class="btnUnfold" size="28"></u-icon>
             </view>
         </view>
     </view>
@@ -30,27 +30,27 @@
 
 <script>
     export default {
-        name: "corecmscoupon",
+        name: "coreshopcoupon",
         components: {
         },
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Array,
                 required: true,
             }
         },
         computed: {
             count() {
-                if (!this.corecmsdata) {
+                if (!this.coreshopdata) {
                     return false;
                 }
-                if (!this.corecmsdata.parameters) {
+                if (!this.coreshopdata.parameters) {
                     return false;
                 }
-                if (!this.corecmsdata.parameters.list) {
+                if (!this.coreshopdata.parameters.list) {
                     return false;
                 }
-                return (this.corecmsdata.parameters.list.length > 0)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
         },
         data() {
@@ -70,10 +70,10 @@
             // 用户领取优惠券
             receiveCoupon(couponId) {
                 let _this = this;
-                let corecmsdata = {
+                let coreshopdata = {
                     id: couponId
                 }
-                this.$u.api.getCoupon(corecmsdata).then(res => {
+                this.$u.api.getCoupon(coreshopdata).then(res => {
                     if (res.status) {
                         _this.$refs.uToast.show({ title: res.msg, type: 'success', back: false })
                     } else {
@@ -86,25 +86,4 @@
 </script>
 
 <style lang="scss" scoped>
-
-    .icon { width: 130rpx; height: 100rpx; top: 50%; transform: translateY(-50%); }
-    .coreshop-sponsored-card-view { position: relative; }
-        .coreshop-sponsored-card-view .card-price-view { position: relative; background: #FFF5F5; border-radius: 14.54rpx 14.54rpx 0 0; padding: 18.18rpx; }
-            .coreshop-sponsored-card-view .card-price-view .price-left-view { position: absolute; height: 125.45rpx; width: 135.45rpx; text-align: center; line-height: 125.45rpx; }
-                .coreshop-sponsored-card-view .card-price-view .price-left-view .price { font-size: 45.45rpx; font-weight: 400; }
-            .coreshop-sponsored-card-view .card-price-view .name-content-view { position: relative; padding-left: 163.63rpx; padding-right: 145.45rpx; height: 125.45rpx; line-height: 1.8; color: #999898; }
-                .coreshop-sponsored-card-view .card-price-view .name-content-view::before { content: ''; position: absolute; top: -18.18rpx; bottom: -18.18rpx; margin-left: -18.18rpx; border-left: 2rpx dashed #fdbabc; }
-            .coreshop-sponsored-card-view .card-price-view .btn-right-view { position: absolute; right: 27.27rpx; top: 18.18rpx; height: 125.45rpx; line-height: 125.45rpx; }
-        .coreshop-sponsored-card-view .card-num-view { position: relative; background: #FFECED; border-radius: 0 0 14.54rpx 14.54rpx; border-top: 2rpx dashed #dedbdb; padding: 10.9rpx 27.27rpx; color: #999898; }
-            /*.coreshop-sponsored-card-view .card-num-view::before { content: ''; position: absolute; width: 36.36rpx; height: 36.36rpx; background: #ffffff; border-radius: 50%; top: -18.18rpx; left: -18.18rpx; }
-            .coreshop-sponsored-card-view .card-num-view::after { content: ''; position: absolute; width: 36.36rpx; height: 36.36rpx; background: #ffffff; border-radius: 50%; top: -18.18rpx; right: -18.18rpx; }*/
-            .coreshop-sponsored-card-view .card-num-view .conditions { position: relative; padding-right: 72.72rpx; }
-            .coreshop-sponsored-card-view .card-num-view .btnUnfold { position: absolute; right: 27.27rpx; top: 14.54rpx; }
-
-    .coreshop-lower-shelf { }
-        .coreshop-lower-shelf .card-price-view { opacity: 0.5; }
-        .coreshop-lower-shelf .card-num-view { opacity: 0.5; }
-        .coreshop-lower-shelf .img-lower-box { position: absolute; height: 100.9rpx; width: 100.9rpx; background-color: rgba(0, 0, 0, 0.6); border-radius: 181.81rpx; text-align: center; line-height: 100.9rpx; font-size: 24rpx; color: #fff; top: 25.45rpx; left: 35rpx; -webkit-transition: left .15s; transition: left .15s; }
-
-
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-goods.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue
similarity index 61%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-goods.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue
index b8e19fbb328c31f1388f657f13f3512f82c2b56b..35cf86383f4a78b60ecc44f8d10e75eaf0ad82af 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-goods.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue
@@ -2,13 +2,13 @@
     <view>
         <view class="goodsBox">
             <!-- 列表平铺两列三列 -->
-            <view v-if="corecmsdata.parameters.column == '2' && corecmsdata.parameters.display == 'list' || corecmsdata.parameters.column == '3' && corecmsdata.parameters.display == 'list'" v-bind:class="'column'+corecmsdata.parameters.column">
+            <view v-if="coreshopdata.parameters.column == '2' && coreshopdata.parameters.display == 'list' || coreshopdata.parameters.column == '3' && coreshopdata.parameters.display == 'list'" v-bind:class="'column'+coreshopdata.parameters.column">
                 <view class="u-margin-left-15 u-margin-right-15 u-margin-top-15 u-margin-bottom-15 ">
-                    <u-section font-size="30" :title="corecmsdata.parameters.title" v-if="corecmsdata.parameters.title != ''" @click="corecmsdata.parameters.lookMore == 'true' ? goGoodsList({catId: corecmsdata.parameters.classifyId,brandId:corecmsdata.parameters.brandId}) :''" :arrow="corecmsdata.parameters.lookMore == 'true'" :sub-title="corecmsdata.parameters.lookMore == 'true'?'更多':''"></u-section>
+                    <u-section font-size="30" :title="coreshopdata.parameters.title" v-if="coreshopdata.parameters.title != ''" @click="coreshopdata.parameters.lookMore == 'true' ? goGoodsList({catId: coreshopdata.parameters.classifyId,brandId:coreshopdata.parameters.brandId}) :''" :arrow="coreshopdata.parameters.lookMore == 'true'" :sub-title="coreshopdata.parameters.lookMore == 'true'?'更多':''"></u-section>
                 </view>
                 <view class="" v-if="count">
-                    <u-grid :col="corecmsdata.parameters.column" :border="false" :align="center">
-                        <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in corecmsdata.parameters.list" :key="index" @click="goGoodsDetail(item.id)">
+                    <u-grid :col="coreshopdata.parameters.column" :border="false" :align="center">
+                        <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in coreshopdata.parameters.list" :key="index" @click="goGoodsDetail(item.id)">
                             <view class="good_box">
                                 <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
                                 <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
@@ -16,7 +16,7 @@
                                     {{item.name}}
                                 </view>
                                 <view class="good-price">
-                                    {{item.price}}元 <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{item.mktprice}}元</span>
+                                    {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
                                 </view>
                                 <view class="good-tag-recommend" v-if="item.isRecommend">
                                     推荐
@@ -28,7 +28,7 @@
                         </u-grid-item>
                     </u-grid>
                 </view>
-                <view v-else-if="!count && !corecmsdata.parameters.listAjax">
+                <view v-else-if="!count && !coreshopdata.parameters.listAjax">
                     <u-grid col="3" border="false" align="center">
                         <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="item in 3" :key="item">
                             <view class="good_box">
@@ -53,13 +53,13 @@
             </view>
 
             <!-- 列表平铺单列 -->
-            <view v-if="corecmsdata.parameters.column == '1' && corecmsdata.parameters.display == 'list'">
+            <view v-if="coreshopdata.parameters.column == '1' && coreshopdata.parameters.display == 'list'">
                 <view class="u-margin-left-15 u-margin-right-15 u-margin-top-15 u-margin-bottom-15 ">
-                    <u-section font-size="30" :title="corecmsdata.parameters.title" v-if="corecmsdata.parameters.title != ''" @click="corecmsdata.parameters.lookMore == 'true' ? goGoodsList({catId: corecmsdata.parameters.classifyId,brandId:corecmsdata.parameters.brandId}) :''" :arrow="corecmsdata.parameters.lookMore == 'true'" :sub-title="corecmsdata.parameters.lookMore == 'true'?'更多':''"></u-section>
+                    <u-section font-size="30" :title="coreshopdata.parameters.title" v-if="coreshopdata.parameters.title != ''" @click="coreshopdata.parameters.lookMore == 'true' ? goGoodsList({catId: coreshopdata.parameters.classifyId,brandId:coreshopdata.parameters.brandId}) :''" :arrow="coreshopdata.parameters.lookMore == 'true'" :sub-title="coreshopdata.parameters.lookMore == 'true'?'更多':''"></u-section>
                 </view>
                 <view v-if="count">
                     <u-grid :col="1" :border="false" :align="center">
-                        <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="item in corecmsdata.parameters.list" :key="item.id" @click="goGoodsDetail(item.id)">
+                        <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="item in coreshopdata.parameters.list" :key="item.id" @click="goGoodsDetail(item.id)">
                             <view class="good_box">
                                 <u-row gutter="5" justify="space-between">
                                     <u-col span="4">
@@ -77,7 +77,7 @@
                                             {{item.name}}
                                         </view>
                                         <view class="good-price u-padding-10">
-                                            {{item.price}}元 <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{item.mktprice}}元</span>
+                                            {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
                                         </view>
                                     </u-col>
                                 </u-row>
@@ -91,17 +91,17 @@
             </view>
 
             <!-- 横向滚动 -->
-            <view v-if="corecmsdata.parameters.column == '2' && corecmsdata.parameters.display == 'slide' || corecmsdata.parameters.column == '3' && corecmsdata.parameters.display == 'slide'"
-                  v-bind:class="'slide'+corecmsdata.parameters.column">
+            <view v-if="coreshopdata.parameters.column == '2' && coreshopdata.parameters.display == 'slide' || coreshopdata.parameters.column == '3' && coreshopdata.parameters.display == 'slide'"
+                  v-bind:class="'slide'+coreshopdata.parameters.column">
                 <view class="u-margin-left-15 u-margin-right-15 u-margin-top-15 u-margin-bottom-15 ">
-                    <u-section font-size="30" :title="corecmsdata.parameters.title" v-if="corecmsdata.parameters.title != ''" @click="corecmsdata.parameters.lookMore == 'true' ? goGoodsList({catId: corecmsdata.parameters.classifyId,brandId:corecmsdata.parameters.brandId}) :''" :arrow="corecmsdata.parameters.lookMore == 'true'" :sub-title="corecmsdata.parameters.lookMore == 'true'?'更多':''"></u-section>
+                    <u-section font-size="30" :title="coreshopdata.parameters.title" v-if="coreshopdata.parameters.title != ''" @click="coreshopdata.parameters.lookMore == 'true' ? goGoodsList({catId: coreshopdata.parameters.classifyId,brandId:coreshopdata.parameters.brandId}) :''" :arrow="coreshopdata.parameters.lookMore == 'true'" :sub-title="coreshopdata.parameters.lookMore == 'true'?'更多':''"></u-section>
                 </view>
                 <view>
                     <view v-if="count">
-                        <swiper :class="corecmsdata.parameters.column==3?'swiper3':corecmsdata.parameters.column==2?'swiper2':''" @change="change">
+                        <swiper :class="coreshopdata.parameters.column==3?'swiper3':coreshopdata.parameters.column==2?'swiper2':''" @change="change">
                             <swiper-item v-for="no of pageCount" :key="no">
-                                <u-grid :col="corecmsdata.parameters.column" :border="false" :align="center">
-                                    <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index)  in corecmsdata.parameters.list" v-if="index >=corecmsdata.parameters.column*no && index <=corecmsdata.parameters.column*(no+1)" :key="index" @click="goGoodsDetail(item.id)">
+                                <u-grid :col="coreshopdata.parameters.column" :border="false" :align="center">
+                                    <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index)  in coreshopdata.parameters.list" v-if="index >=coreshopdata.parameters.column*no && index <=coreshopdata.parameters.column*(no+1)" :key="index" @click="goGoodsDetail(item.id)">
                                         <view class="good_box">
                                             <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
                                             <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="item.id"></u-lazy-load>
@@ -109,7 +109,7 @@
                                                 {{item.name}}
                                             </view>
                                             <view class="good-price">
-                                                {{item.price}}元 <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{item.mktprice}}元</span>
+                                                {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
                                             </view>
                                             <view class="good-tag-recommend" v-if="item.isRecommend">
                                                 推荐
@@ -159,23 +159,23 @@
             }
         },
         mixins: [goods],
-        name: "corecmsgoods",
+        name: "coreshopgoods",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Array,
                 required: true,
             }
         },
         computed: {
             pageCount() {
-                var count = this.corecmsdata.parameters.list.length / this.corecmsdata.parameters.column;
-                if (this.corecmsdata.parameters.column * count < this.corecmsdata.parameters.list.length) {
+                var count = this.coreshopdata.parameters.list.length / this.coreshopdata.parameters.column;
+                if (this.coreshopdata.parameters.column * count < this.coreshopdata.parameters.list.length) {
                     count = count + 1;
                 }
                 return count;
             },
             count() {
-                return (this.corecmsdata.parameters.list.length > 0)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
         },
         methods: {
@@ -188,21 +188,19 @@
 </script>
 
 <style scoped lang="scss">
-    .goodsBox { border-radius: 16rpx; /*padding: 0rpx 10rpx; background: #FFFFFF !important;*/ color: #333333 !important; margin: 0 10rpx; }
-    .u-cell { padding: 15rpx 25rpx; }
-    .u-close { position: absolute; top: 30rpx; right: 30rpx; }
-    .good_box { border-radius: 8px; margin: 3px; background-color: #ffffff; padding: 5px; position: relative; width: calc(100% - 6px); }
-    .good_image { width: 100%; border-radius: 4px; }
-    .good_title { font-size: 26rpx; margin-top: 5px; color: $u-main-color; }
-    .good_title-xl { font-size: 28rpx; margin-top: 5px; color: $u-main-color; }
-    .good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 15rpx; left: 15rpx; background-color: $u-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 4rpx 14rpx; border-radius: 50rpx; font-size: 20rpx; line-height: 1; }
-    .good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 15rpx; right: 15rpx; background-color: $u-type-primary; color: #FFFFFF; margin-left: 10px; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
-    .good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 15rpx; left: 15rpx; background-color: $u-type-primary; color: #FFFFFF; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
-    .good-price { font-size: 30rpx; color: $u-type-error; margin-top: 5px; }
-    .good-des { font-size: 20rpx; color: $u-tips-color; margin-top: 5px; }
-    .swiper3 { height: 380rpx; }
-    .swiper2 { height: 500rpx; }
-    .indicator-dots { margin-top: 20rpx; margin-bottom: 20rpx; display: flex; justify-content: center; align-items: center; }
-    .indicator-dots-item { background-color: $u-tips-color; height: 6px; width: 6px; border-radius: 10px; margin: 0 3px; }
-    .indicator-dots-active { background-color: $u-type-primary; }
+    .goodsBox { border-radius: 16rpx; color: #333333 !important; margin: 0 10rpx;
+        .good_box { border-radius: 8px; margin: 3px; background-color: #ffffff; padding: 5px; position: relative; width: calc(100% - 6px);
+            .good_title { font-size: 26rpx; margin-top: 5px; color: $u-main-color; }
+            .good_title-xl { font-size: 28rpx; margin-top: 5px; color: $u-main-color; }
+            .good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 15rpx; left: 15rpx; background-color: $u-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 4rpx 14rpx; border-radius: 50rpx; font-size: 20rpx; line-height: 1; }
+            .good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 15rpx; right: 15rpx; background-color: $u-type-primary; color: #FFFFFF; margin-left: 10px; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
+            .good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 15rpx; left: 15rpx; background-color: $u-type-primary; color: #FFFFFF; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
+            .good-price { font-size: 30rpx; color: $u-type-error; margin-top: 5px; }
+        }
+
+        .indicator-dots { margin-top: 20rpx; margin-bottom: 20rpx; display: flex; justify-content: center; align-items: center;
+            .indicator-dots-item { background-color: $u-tips-color; height: 6px; width: 6px; border-radius: 10px; margin: 0 3px; }
+            .indicator-dots-active { background-color: $u-type-primary; }
+        }
+    }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-groupPurchase.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
similarity index 71%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-groupPurchase.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
index 02e1c0374ce360cdfcc1f2bad1b7aa114ba56c2f..73fbb102430d812730294c46b793cfa6826366c7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-groupPurchase.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
@@ -2,10 +2,10 @@
     <!-- 团购秒杀 -->
     <view v-if="count">
         <view class="u-margin-left-20 u-margin-right-20 u-margin-top-20 u-margin-bottom-20">
-            <u-section font-size="30" :title="corecmsdata.parameters.title" @click="goSeckillList()"></u-section>
+            <u-section font-size="30" :title="coreshopdata.parameters.title" @click="goSeckillList()"></u-section>
         </view>
-        <view class="u-margin-left-15  u-margin-right-15" v-if="corecmsdata.parameters.list && count">
-            <view class="img-list-item" v-if="item.id !== 'undefined' && item.id" v-for="(item, key) in corecmsdata.parameters.list" :key="key" @click="goSeckillDetail(item.goods.id, item.goods.groupId)">
+        <view class="u-margin-left-15  u-margin-right-15" v-if="coreshopdata.parameters.list && count">
+            <view class="img-list-item" v-if="item.id !== 'undefined' && item.id" v-for="(item, key) in coreshopdata.parameters.list" :key="key" @click="goSeckillDetail(item.goods.id, item.goods.groupId)">
                 <view class="img-list-item-l">
                     <u-lazy-load threshold="-150" border-radius="10" :image="item.goods.image" :index="item.id"></u-lazy-load>
                 </view>
@@ -13,7 +13,7 @@
                     <view class="u-font-28  u-line-1">{{item.name}}</view>
                     <view class="description u-line-2 u-margin-10">{{item.goods.name}}</view>
                     <view class="item-c">
-                        <view class="red-price">￥{{item.goods.product.price}} <span class="u-font-xs color-9 linethrough u-margin-left-15">{{item.goods.product.mktprice}}元</span></view>
+                        <view class="red-price">￥{{item.goods.product.price}} <span class="u-font-xs  coreshop-text-through u-margin-left-15">{{item.goods.product.mktprice}}元</span></view>
                         <view>
                             <view style="float:left;">
                                 <view class="goods-salesvolume red-price u-font-24" v-if="(item.startStatus == 1) && item.lastTime">
@@ -28,7 +28,7 @@
                     </view>
                 </view>
             </view>
-            <view class="img-list-item" v-if="!item.id" v-for="(item, key) in corecmsdata.parameters.list" :key="key">
+            <view class="img-list-item" v-if="!item.id" v-for="(item, key) in coreshopdata.parameters.list" :key="key">
                 <image class="img-list-item-l" :src="item.image== '/images/empty-banner.png'? '/static/images/common/empty-banner.png':item.image" mode='aspectFill'></image>
                 <view class="img-list-item-r">
                     <view class="goods-name list-goods-name">{{item.name}}</view>
@@ -46,25 +46,25 @@
     import { goods } from '@/common/mixins/mixinsHelper.js'
     export default {
         mixins: [goods],
-        name: "corecmsgrouppurchase",
+        name: "coreshopgrouppurchase",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Array,
                 required: false,
             }
         },
         computed: {
             count() {
-                if (!this.corecmsdata) {
+                if (!this.coreshopdata) {
                     return false;
                 }
-                if (!this.corecmsdata.parameters) {
+                if (!this.coreshopdata.parameters) {
                     return false;
                 }
-                if (!this.corecmsdata.parameters.list) {
+                if (!this.coreshopdata.parameters.list) {
                     return false;
                 }
-                return (this.corecmsdata.parameters.list.length > 0)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
         },
         methods: {
@@ -77,12 +77,14 @@
 </script>
 
 <style lang="scss" scoped>
-    .img-list-item { border-radius: 8px; margin: 5rpx 5rpx 20rpx 5rpx; background-color: #ffffff; padding: 10rpx; position: relative; overflow: hidden; }
-        .img-list-item .item-c { width: 100%; margin-top: 0; }
-    .img-list-item-l { width: 200rpx; height: 200rpx; display: inline-block; float: left; }
-    .img-list-item-r { width: calc(100% - 240rpx); display: inline-block; margin-left: 15rpx; float: left; position: relative; }
-    .description { font-size: 24rpx; color: #929292; }
-    .red-price { color: #FF7159 !important; }
-
-    .btnCart { float: right; }
+    .img-list-item { border-radius: 8px; margin: 5rpx 5rpx 20rpx 5rpx; background-color: #ffffff; padding: 10rpx; position: relative; overflow: hidden;
+        .img-list-item-l { width: 200rpx; height: 200rpx; display: inline-block; float: left; }
+        .img-list-item-r { width: calc(100% - 240rpx); display: inline-block; margin-left: 15rpx; float: left; position: relative;
+            .description { font-size: 24rpx; color: #929292; }
+            .item-c { width: 100%; margin-top: 0;
+                .red-price { color: #FF7159 !important; }
+                .btnCart { float: right; }
+            }
+        }
+    }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-imgSingle.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSingle.vue
similarity index 84%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-imgSingle.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSingle.vue
index 8fb4fa3f0eef3c9933a4360a293c8cd718fc15f2..6af63bef0a8851c8349a1c476c38e8930280c2bd 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-imgSingle.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSingle.vue
@@ -1,7 +1,7 @@
 <template>
     <!-- 单图 -->
-    <view class="ad corecms-imgsingle" v-if="corecmsdata.parameters.list && corecmsdata.parameters.list.length > 0">
-        <view class="" v-for="item in corecmsdata.parameters.list" :key="item.id">
+    <view class="coreshop-imgsingle" v-if="coreshopdata.parameters.list && coreshopdata.parameters.list.length > 0">
+        <view class="" v-for="item in coreshopdata.parameters.list" :key="item.id">
             <!-- #ifdef MP-WEIXIN -->
             <view @click="showSliderInfo2" :data-type="item.linkType" :data-val="item.linkValue">
                 <image class="ad-img" :src="item.image" mode="widthFix"></image>
@@ -11,7 +11,7 @@
             <image class="ad-img" :src="item.image" mode="widthFix" @click="showSliderInfo(item.linkType, item.linkValue)"></image>
             <!-- #endif -->
             <view class="imgup-btn" v-if="item.buttonText != ''" @click="showSliderInfo(item.linkType, item.linkValue)">
-                <button class="coreshop-btn coreshop-btn-fillet" :style="{background:item.buttonColor,color:item.textColor}">{{item.buttonText}}</button>
+                <button class="coreshop-btn" :style="{background:item.buttonColor,color:item.textColor}">{{item.buttonText}}</button>
             </view>
         </view>
     </view>
@@ -21,17 +21,17 @@
     import { goods } from '@/common/mixins/mixinsHelper.js';
     export default {
         mixins: [goods],
-        name: "corecmsimgsingle",
+        name: "coreshopimgsingle",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Object,
                 required: true,
             }
         },
         computed: {
             count() {
-                // console.log(corecmsdata)
-                return (this.corecmsdata.parameters.list.length > 0)
+                // console.log(coreshopdata)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
 
         },
@@ -136,9 +136,11 @@
 </script>
 
 <style lang="scss" scoped>
-    .corecms-imgsingle.ad { width: 100%; overflow: hidden; position: relative; margin: 20rpx 0rpx; padding:0 15rpx; }
-    .corecms-imgsingle .ad-img { width: 100%; float: left; position: relative; z-index: 667; }
-        .corecms-imgsingle .ad-img:last-child { margin-bottom: 0; }
-    .corecms-imgsingle .imgup-btn { position: absolute; z-index: 668; bottom: 80upx; left: 40upx; }
-        .corecms-imgsingle .imgup-btn .coreshop-btn { line-height: 2; font-size: 28upx; padding: 0 50upx; }
+    .coreshop-imgsingle { width: 100%; overflow: hidden; position: relative; margin: 20rpx 0rpx; padding: 0 15rpx;
+        .ad-img { width: 100%; float: left; position: relative; z-index: 667; }
+        .ad-img:last-child { margin-bottom: 0; }
+        .imgup-btn { position: absolute; z-index: 668; bottom: 80upx; left: 40upx;
+            .coreshop-btn { line-height: 2; font-size: 28upx; padding: 0 50upx; border-radius: 50rpx; }
+        }
+    }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-imgSlide.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue
similarity index 89%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-imgSlide.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue
index b1d1fdf3dfbcf7bf177db241b883f27bc9727f2a..a041dcfdba2dafe6f8c1b4f5d0d288c749a1c3fa 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-imgSlide.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue
@@ -1,6 +1,6 @@
 <template>
-    <view class="u-margin-top-10 u-margin-bottom-10 u-padding-top-10 u-padding-bottom-10">
-        <u-swiper :list="swiperItems" :effect3d="true" :title="false" @click="taped" bg-color="transparency"></u-swiper>
+    <view class="u-margin-20">
+        <u-swiper :list="swiperItems" :effect3d="false" :title="false" @click="taped" bg-color="transparency"></u-swiper>
         <u-toast ref="uToast" />
     </view>
 </template>
@@ -9,9 +9,9 @@
     import { goods } from '@/common/mixins/mixinsHelper.js';
     export default {
         mixins: [goods],
-        name: "corecmsimgSlide",
+        name: "coreshopimgSlide",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Object,
                 required: true,
             }
@@ -23,12 +23,12 @@
         },
         computed: {
             count() {
-                return (this.corecmsdata.parameters.list.length > 0)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
         },
         components: {},
         created() {
-            var data = this.corecmsdata.parameters.list;
+            var data = this.coreshopdata.parameters.list;
             for (var i = 0; i < data.length; i++) {
                 let moder = {
                     image: data[i].image == '/images/empty-banner.png' ? '/static/images/common/empty-banner.png' : data[i].image,
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-imgWindow.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgWindow.vue
similarity index 68%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-imgWindow.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgWindow.vue
index 48d6c24dc0f3c04e1b09acbadbd78dd62f2195dc..f08ba3fea068e384995047034eb663f461c4f103 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-imgWindow.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgWindow.vue
@@ -1,23 +1,23 @@
 <template>
     <view class="u-margin-bottom-20">
         <u-toast ref="uToast" />
-        <u-grid :border="false" :align="center" :col="corecmsdata.parameters.style" v-if="corecmsdata.parameters.style == '2' ||corecmsdata.parameters.style == '3' ||corecmsdata.parameters.style == '4'">
-            <u-grid-item bg-color="transparent" v-for="(item, index) in corecmsdata.parameters.list" :key="index" :custom-style="{padding:corecmsdata.parameters.margin+'rpx'}">
+        <u-grid :border="false" :align="center" :col="coreshopdata.parameters.style" v-if="coreshopdata.parameters.style == '2' ||coreshopdata.parameters.style == '3' ||coreshopdata.parameters.style == '4'">
+            <u-grid-item bg-color="transparent" v-for="(item, index) in coreshopdata.parameters.list" :key="index" :custom-style="{padding:coreshopdata.parameters.margin+'rpx'}">
                 <image :src="item.image" mode="widthFix" @click="showSliderInfo(item.linkType, item.linkValue)" style="width:100%;"></image>
             </u-grid-item>
         </u-grid>
-        <u-grid :border="false" :align="center" :col="2" v-if="corecmsdata.parameters.style == '0'">
-            <u-grid-item bg-color="transparent" :custom-style="{padding:corecmsdata.parameters.margin+'rpx'}">
-                <image :src="corecmsdata.parameters.list[0].image" mode="widthFix" v-if="corecmsdata.parameters.list[0]" @click="showSliderInfo(corecmsdata.parameters.list[0].linkType, corecmsdata.parameters.list[0].linkValue)" class="w100"></image>
+        <u-grid :border="false" :align="center" :col="2" v-if="coreshopdata.parameters.style == '0'">
+            <u-grid-item bg-color="transparent" :custom-style="{padding:coreshopdata.parameters.margin+'rpx'}">
+                <image :src="coreshopdata.parameters.list[0].image" mode="widthFix" v-if="coreshopdata.parameters.list[0]" @click="showSliderInfo(coreshopdata.parameters.list[0].linkType, coreshopdata.parameters.list[0].linkValue)" class="w100"></image>
             </u-grid-item>
-            <u-grid-item bg-color="transparent" :custom-style="{padding:corecmsdata.parameters.margin+'rpx'}">
-                <image :src="corecmsdata.parameters.list[1].image" mode="widthFix" v-if="corecmsdata.parameters.list[1]" @click="showSliderInfo(corecmsdata.parameters.list[1].linkType, corecmsdata.parameters.list[1].linkValue)" class="w100"></image>
+            <u-grid-item bg-color="transparent" :custom-style="{padding:coreshopdata.parameters.margin+'rpx'}">
+                <image :src="coreshopdata.parameters.list[1].image" mode="widthFix" v-if="coreshopdata.parameters.list[1]" @click="showSliderInfo(coreshopdata.parameters.list[1].linkType, coreshopdata.parameters.list[1].linkValue)" class="w100"></image>
                 <u-grid :border="false" :align="center" :col="2">
-                    <u-grid-item bg-color="transparent" :custom-style="{padding:corecmsdata.parameters.margin+'rpx'}">
-                        <image :src="corecmsdata.parameters.list[2].image" mode="widthFix" v-if="corecmsdata.parameters.list[2]" @click="showSliderInfo(corecmsdata.parameters.list[2].linkType, corecmsdata.parameters.list[2].linkValue)" class="w100"></image>
+                    <u-grid-item bg-color="transparent" :custom-style="{padding:coreshopdata.parameters.margin+'rpx'}">
+                        <image :src="coreshopdata.parameters.list[2].image" mode="widthFix" v-if="coreshopdata.parameters.list[2]" @click="showSliderInfo(coreshopdata.parameters.list[2].linkType, coreshopdata.parameters.list[2].linkValue)" class="w100"></image>
                     </u-grid-item>
-                    <u-grid-item bg-color="transparent" :custom-style="{padding:corecmsdata.parameters.margin+'rpx'}">
-                        <image :src="corecmsdata.parameters.list[3].image" mode="widthFix" v-if="corecmsdata.parameters.list[3]" @click="showSliderInfo(corecmsdata.parameters.list[3].linkType, corecmsdata.parameters.list[3].linkValue)" class="w100"></image>
+                    <u-grid-item bg-color="transparent" :custom-style="{padding:coreshopdata.parameters.margin+'rpx'}">
+                        <image :src="coreshopdata.parameters.list[3].image" mode="widthFix" v-if="coreshopdata.parameters.list[3]" @click="showSliderInfo(coreshopdata.parameters.list[3].linkType, coreshopdata.parameters.list[3].linkValue)" class="w100"></image>
                     </u-grid-item>
                 </u-grid>
             </u-grid-item>
@@ -30,9 +30,9 @@
     import { goods } from '@/common/mixins/mixinsHelper.js';
     export default {
         mixins: [goods],
-        name: "corecmsimgwindow",
+        name: "coreshopimgwindow",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Object,
                 required: true,
             }
@@ -98,5 +98,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    .w100 { width: 100%; }
+    
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-navBar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue
similarity index 93%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-navBar.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue
index 8911299540cff31db5a2c4318fe246c33fb05ef9..67cdd1681f52a26ab726049a8705afa17b06ed98 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-navBar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-navBar.vue
@@ -11,10 +11,10 @@
 <script>
     import { navLinkType } from '@/common/setting/constVarsHelper.js';
     export default {
-        name: "corecmsnavbar",
+        name: "coreshopnavbar",
         components: {},
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Object,
                 required: true,
             }
@@ -33,8 +33,8 @@
 
         },
         created() {
-            this.ListData = this.corecmsdata.parameters.list;
-            this.limit = this.corecmsdata.parameters.limit;
+            this.ListData = this.coreshopdata.parameters.list;
+            this.limit = this.coreshopdata.parameters.limit;
         },
         methods: {
             showSliderInfo(type, val) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-notice.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-notice.vue
similarity index 78%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-notice.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-notice.vue
index 1f3e7f40aabf44d1bf8e24944d545be661c720b1..c039a351bf4f8668ae824f0adcbbf6ddbf1e89b5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-notice.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-notice.vue
@@ -1,16 +1,16 @@
 <template>
-    <view class="u-padding-top-10 u-padding-bottom-10 u-padding-left-25 u-padding-right-25 u-margin-15 bg-white" v-if="count > 0">
+    <view class="u-padding-top-10 u-padding-bottom-10 u-margin-15 coreshop-bg-white" v-if="count > 0">
         <u-notice-bar mode="vertical" type="none" :more-icon="true" :list="list" @click="click"></u-notice-bar>
     </view>
 </template>
 
 <script>
     export default {
-        name: "corecmsnotice",
+        name: "coreshopnotice",
         components: {
         },
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Object,
                 required: true,
             }
@@ -22,7 +22,7 @@
             }
         },
         created() {
-            var data = this.corecmsdata.parameters.list;
+            var data = this.coreshopdata.parameters.list;
             for (var i = 0; i < data.length; i++) {
                 let moder = {
                     title: data[i].title,
@@ -42,7 +42,7 @@
         },
         computed: {
             count() {
-                return (this.corecmsdata.parameters.list.length > 0)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
         }
     }
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-pinTuan.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue
similarity index 54%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-pinTuan.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue
index 109d481ead6411bee54dfcee697de65fd2406a0d..8c11a0ffd282cad2a61f11cdc6c9a9e4792d5374 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-pinTuan.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue
@@ -2,13 +2,13 @@
     <!-- 拼团 -->
     <view v-if="count">
         <view class="u-margin-left-20 u-margin-right-20 u-margin-top-20 u-margin-bottom-20">
-            <u-section font-size="30" :title="corecmsdata.parameters.title" @click="goPinTuanList()"></u-section>
+            <u-section font-size="30" :title="coreshopdata.parameters.title" @click="goPinTuanList()"></u-section>
         </view>
-        <view class="u-margin-left-15  u-margin-right-15 bg-white u-padding-10" v-if="goodsList && count">
-            <view class="goods-box swiper-box x-f">
+        <view class="u-margin-left-15  u-margin-right-15 coreshop-bg-white u-padding-10" v-if="goodsList && count">
+            <view class="goods-box swiper-box coreshop-flex coreshop-align-center">
                 <swiper class="carousel" circular @change="swiperChange" :autoplay="true" duration="2000">
                     <swiper-item  v-for="(goods, index) in goodsList" :key="index"  class="carousel-item">
-                        <view class="goods-list-box x-f">
+                        <view class="goods-list-box coreshop-flex coreshop-align-center">
                             <view class="goods-item" v-for="item in goods" :key="item.id"  @tap="goPinTuanDetail(item.goodsId)">
                                 <view class="min-goods">
                                     <view class="img-box">
@@ -16,7 +16,7 @@
                                         <image class="img" :src="item.goodsImage" mode="widthFix"></image>
                                     </view>
                                     <view class="price-box">
-                                        <view class="y-f">
+                                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-center">
                                             <text class="seckill-current">￥{{item.pinTuanPrice}}</text>
                                             <text class="original">￥{{item.pinTuanPrice + item.discountAmount}}</text>
                                         </view>
@@ -39,9 +39,9 @@
     import { goods } from '@/common/mixins/mixinsHelper.js'
     export default {
         mixins: [goods],
-        name: "corecmspinTuan",
+        name: "coreshoppinTuan",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 required: false,
             }
         },
@@ -53,14 +53,14 @@
         },
         created() {
             let that = this;
-            if (that.corecmsdata.parameters.list.length > 0) {
-                let arr = that.sortData(that.corecmsdata.parameters.list, 4);
+            if (that.coreshopdata.parameters.list.length > 0) {
+                let arr = that.sortData(that.coreshopdata.parameters.list, 4);
                 that.goodsList = arr;
             }
         },
         computed: {
             count() {
-                return (this.corecmsdata.parameters.list.length > 0)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
         },
         methods: {
@@ -93,28 +93,38 @@
         .carousel .carousel-item { width: 100%; height: 100%; }
         .swiper-box .swiper-image,
         .carousel .swiper-image { width: 100%; height: 100%; }
-    .swiper-dots { display: flex; position: absolute; left: 50%; transform: translateX(-50%); bottom: 0rpx; z-index: 66; }
-        .swiper-dots .dot { width: 45rpx; height: 3rpx; background: #eee; border-radius: 50%; margin-right: 10rpx; }
-        .swiper-dots .dot-active { width: 45rpx; height: 3rpx; background: #a8700d; border-radius: 50%; margin-right: 10rpx; }
-    .group-goods { background: #fff; border-radius: 20rpx; overflow: hidden; }
-        .group-goods .title-box { padding-bottom: 20rpx; }
-            .group-goods .title-box .title { font-size: 32rpx; font-weight: bold; }
-            .group-goods .title-box .group-people .time-box { font-size: 26rpx; color: #edbf62; }
-                .group-goods .title-box .group-people .time-box .count-text-box { width: 30rpx; height: 34rpx; background: #edbf62; text-align: center; line-height: 34rpx; font-size: 24rpx; border-radius: 6rpx; color: rgba(255, 255, 255, 0.9); margin: 0 8rpx; }
-            .group-goods .title-box .group-people .head-box .head-img { width: 40rpx; height: 40rpx; border-radius: 50%; background: #ccc; }
-            .group-goods .title-box .group-people .tip { font-size: 28rpx; padding-left: 30rpx; color: #666; }
-            .group-goods .title-box .group-people .cuIcon-right { font-size: 30rpx; line-height: 28rpx; color: #666; }
-    .goods-item { margin-right: 22rpx; }
-        .goods-item:nth-child(4n) { margin-right: 0; }
-
-
+    .swiper-dots { display: flex; position: absolute; left: 50%; transform: translateX(-50%); bottom: 0rpx; z-index: 66;
+        .dot { width: 45rpx; height: 3rpx; background: #eee; border-radius: 50%; margin-right: 10rpx; }
+        .dot-active { width: 45rpx; height: 3rpx; background: #a8700d; border-radius: 50%; margin-right: 10rpx; }
+    }
+    .group-goods { background: #fff; border-radius: 20rpx; overflow: hidden;
+        .title-box { padding-bottom: 20rpx;
+            .title { font-size: 32rpx; font-weight: bold; }
+            .group-people {
+                .time-box { font-size: 26rpx; color: #edbf62;
+                    .count-text-box { width: 30rpx; height: 34rpx; background: #edbf62; text-align: center; line-height: 34rpx; font-size: 24rpx; border-radius: 6rpx; color: rgba(255, 255, 255, 0.9); margin: 0 8rpx; }
+                }
+                .head-box {
+                    .head-img { width: 40rpx; height: 40rpx; border-radius: 50%; background: #ccc; }
+                }
+                .tip { font-size: 28rpx; padding-left: 30rpx; color: #666; }
+                .cuIcon-right { font-size: 30rpx; line-height: 28rpx; color: #666; }
+            }
+        }
+    }
+    .goods-item { margin-right: 22rpx;
+        &:nth-child(4n) { margin-right: 0; }
+    }
+    .min-goods { width: 152rpx; background: #fff;
+        .img-box { width: 152rpx; height: 152rpx; overflow: hidden; position: relative;
+            .tag { position: absolute; left: 0; bottom: 0rpx; z-index: 2; line-height: 35rpx; background: linear-gradient(132deg, #f3dfb1, #f3dfb1, #ecbe60); border-radius: 0px 18rpx 18rpx 0px; padding: 0 10rpx; font-size: 24rpx; font-family: PingFang SC; font-weight: bold; color: #784f06; }
+            .img { width: 100%; background-color: #ccc; }
+        }
+        .price-box { width: 100%; margin-top: 10rpx;
+            .seckill-current { font-size: 30rpx; font-weight: 500; color: #e1212b; }
+            .original { font-size: 20rpx; font-weight: 400; text-decoration: line-through; color: #999999; margin-left: 14rpx; }
+        }
+        .title { font-size: 26rpx; }
+    }
 
-    .min-goods { width: 152rpx; background: #fff; }
-        .min-goods .img-box { width: 152rpx; height: 152rpx; overflow: hidden; position: relative; }
-            .min-goods .img-box .tag { position: absolute; left: 0; bottom: 0rpx; z-index: 2; line-height: 35rpx; background: linear-gradient(132deg, #f3dfb1, #f3dfb1, #ecbe60); border-radius: 0px 18rpx 18rpx 0px; padding: 0 10rpx; font-size: 24rpx; font-family: PingFang SC; font-weight: bold; color: #784f06; }
-            .min-goods .img-box .img { width: 100%; background-color: #ccc; }
-        .min-goods .price-box { width: 100%; margin-top: 10rpx; }
-            .min-goods .price-box .seckill-current { font-size: 30rpx; font-weight: 500; color: #e1212b; }
-            .min-goods .price-box .original { font-size: 20rpx; font-weight: 400; text-decoration: line-through; color: #999999; margin-left: 14rpx; }
-        .min-goods .title { font-size: 26rpx; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-record.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-record.vue
similarity index 76%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-record.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-record.vue
index 2f2a854e2b57d4871c9675acf10f13b612cf0f6b..00d3fb34bf741a95a3f511e55334ee5cf82a13a1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-record.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-record.vue
@@ -1,8 +1,5 @@
 <template>
-    <view class="adbrathing"
-          v-show="adbshow"
-          v-bind:class="['adbrathing'+corecmsdata.parameters.style.align,!hideanimation?'pc':hideanimation?'hc':'']"
-          :style="{top:corecmsdata.parameters.style.top+'%'}">
+    <view class="adbrathing" v-show="adbshow" v-bind:class="['adbrathing'+coreshopdata.parameters.style.align,!hideanimation?'pc':hideanimation?'hc':'']" :style="{top:coreshopdata.parameters.style.top+'%'}">
         <view class="adbrathing-c">
             <view class="adbrathing-l">
                 <image class="user-head-img" :src="log.avatar" mode="aspectFill"></image>
@@ -18,11 +15,10 @@
 </template>
 
 <script>
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js';
     export default {
-        name: "corecmsrecord",
+        name: "coreshoprecord",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Object,
                 required: true,
             },
@@ -76,7 +72,7 @@
                     value: _this.lvalue,
                 };
                 uni.request({
-                    url: apiBaseUrl + '/Api/Page/GetRecod',
+                    url: this.$globalConstVars.apiBaseUrl + '/Api/Page/GetRecod',
                     data: data,
                     header: {
                         'Accept': 'application/json',
@@ -104,14 +100,15 @@
 </script>
 
 <style lang="scss" scoped>
-    .adbrathing { position: fixed; height: 70upx; background-color: rgba(0,0,0,.5); border-radius: 10upx; padding: 10upx; z-index: 666; }
-    .adbrathing-c { width: 100%; height: 100%; overflow: hidden; color: #fff; font-size: 24upx; }
-    .adbrathing-l { display: inline-block; height: 100%; float: left; overflow: hidden; }
-    .user-head-img { width: 50upx; height: 50upx; border-radius: 50%; float: left; }
-    .user-name { float: left; display: inline-block; height: 100%; line-height: 50upx; margin: 0 4upx 0 10upx; max-width: 120upx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-    .adbrathing-r { float: left; height: 100%; display: inline-block; line-height: 50upx; }
-    .adbrathingleft { left: 30upx }
-    .adbrathingright { right: 30upx }
+    .adbrathing { position: fixed; height: 70upx; background-color: rgba(0,0,0,.5); border-radius: 10upx; padding: 10upx; z-index: 666;
+        .adbrathing-c { width: 100%; height: 100%; overflow: hidden; color: #fff; font-size: 24upx;
+            .adbrathing-l { display: inline-block; height: 100%; float: left; overflow: hidden;
+                .user-head-img { width: 50upx; height: 50upx; border-radius: 50%; float: left; }
+                .user-name { float: left; display: inline-block; height: 100%; line-height: 50upx; margin: 0 4upx 0 10upx; max-width: 120upx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+            }
+            .adbrathing-r { float: left; height: 100%; display: inline-block; line-height: 50upx; }
+        }
+    }
     .pc { animation: showcenter .55s; }
     .hc { animation: hidecenter .55s; }
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-search.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-search.vue
similarity index 80%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-search.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-search.vue
index 02b53b3225643190ae480521aa35d3491be560dd..d4254f9f8e42f553c5df7113dc94d06e0ddce44e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-search.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-search.vue
@@ -1,15 +1,15 @@
 <template>
     <!-- 搜索组件宽度自适应于外层 -->
-    <view class="u-padding-top-10 u-padding-bottom-10 u-padding-left-25 u-padding-right-25 u-margin-15 bg-white" v-bind:class="corecmsdata.parameters.style">
+    <view class="u-padding-top-10 u-padding-bottom-10 u-padding-left-25 u-padding-right-25 u-margin-15 coreshop-bg-white" v-bind:class="coreshopdata.parameters.style">
         <u-toast ref="uToast" />
-        <u-search :placeholder="corecmsdata.parameters.keywords" v-model="keyword" shape="square" :show-action="true" action-text="搜索" @custom="goSearch" @search="goSearch"></u-search>
+        <u-search :placeholder="coreshopdata.parameters.keywords" v-model="keyword" shape="square" :show-action="true" action-text="搜索" @custom="goSearch" @search="goSearch"></u-search>
     </view>
 </template>
 <script>
     export default {
-        name: "corecmssearch",
+        name: "coreshopsearch",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 required: true,
             }
         },
@@ -36,7 +36,7 @@
         },
         methods: {
             searchStyle() {
-                this.$store.commit('searchStyle', this.corecmsdata.parameters.style)
+                this.$store.commit('searchStyle', this.coreshopdata.parameters.style)
                 // console.log(this.data.parameters.style)
             },
             change(value) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-service.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-service.vue
similarity index 74%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-service.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-service.vue
index c37085b4db1106ebb2c9c79b1c2bce3d40ed0485..64ee4811be0abf11084d98b805dbd5346e306745 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-service.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-service.vue
@@ -1,10 +1,10 @@
 <template>
     <view>
         <view class="u-margin-left-20 u-margin-right-20 u-margin-top-20 u-margin-bottom-20">
-            <u-section font-size="30" :title="corecmsdata.parameters.title" @click="goServicesList()" sub-title="查看更多"></u-section>
+            <u-section font-size="30" :title="coreshopdata.parameters.title" @click="goServicesList()" sub-title="查看更多"></u-section>
         </view>
-        <view class="u-margin-left-15  u-margin-right-15" v-if="corecmsdata.parameters.list && count">
-            <view class="img-list-item" v-if="item.id !== 'undefined' && item.id" v-for="(item, key) in corecmsdata.parameters.list" :key="key" @click="goServicesDetail(item.id)">
+        <view class="u-margin-left-15  u-margin-right-15" v-if="coreshopdata.parameters.list && count">
+            <view class="img-list-item" v-if="item.id !== 'undefined' && item.id" v-for="(item, key) in coreshopdata.parameters.list" :key="key" @click="goServicesDetail(item.id)">
                 <view class="img-list-item-l">
                     <u-lazy-load threshold="-150" border-radius="10" :image="item.thumbnail" :index="item.id"></u-lazy-load>
                 </view>
@@ -27,7 +27,7 @@
                     </view>
                 </view>
             </view>
-            <view class="img-list-item" v-if="!item.id" v-for="(item, key) in corecmsdata.parameters.list" :key="key">
+            <view class="img-list-item" v-if="!item.id" v-for="(item, key) in coreshopdata.parameters.list" :key="key">
                 <image class="img-list-item-l" :src="item.image== '/images/empty-banner.png'? '/static/images/common/empty-banner.png':item.image" mode='aspectFill'></image>
                 <view class="img-list-item-r">
                     <view class="goods-name list-goods-name">{{item.name}}</view>
@@ -45,16 +45,16 @@
     import { services } from '@/common/mixins/mixinsHelper.js'
     export default {
         mixins: [services],
-        name: "corecmsservice",
+        name: "coreshopservice",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Array,
                 required: false,
             }
         },
         computed: {
             count() {
-                return (this.corecmsdata.parameters.list.length > 0)
+                return (this.coreshopdata.parameters.list.length > 0)
             }
         },
         methods: {
@@ -63,12 +63,14 @@
 </script>
 
 <style lang="scss" scoped>
-    .img-list-item { border-radius: 8px; margin: 5rpx 5rpx 20rpx 5rpx; background-color: #ffffff; padding: 10rpx; position: relative; overflow: hidden; }
-        .img-list-item .item-c { width: 100%; margin-top: 0; }
-    .img-list-item-l { width: 200rpx; height: 200rpx; display: inline-block; float: left; }
-    .img-list-item-r { width: calc(100% - 240rpx); display: inline-block; margin-left: 15rpx; float: left; position: relative; }
-    .description { font-size: 24rpx; color: #929292; }
-    .red-price { color: #FF7159 !important; }
-
-    .btnCart { float: right; }
+    .img-list-item { border-radius: 8px; margin: 5rpx 5rpx 20rpx 5rpx; background-color: #ffffff; padding: 10rpx; position: relative; overflow: hidden;
+        .img-list-item-l { width: 200rpx; height: 200rpx; display: inline-block; float: left; }
+        .img-list-item-r { width: calc(100% - 240rpx); display: inline-block; margin-left: 15rpx; float: left; position: relative;
+            .item-c { width: 100%; margin-top: 0;
+                .description { font-size: 24rpx; color: #929292; }
+                .red-price { color: #FF7159 !important; }
+                .btnCart { float: right; }
+            }
+        }
+    }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-tabbar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-tabbar.vue
similarity index 81%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-tabbar.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-tabbar.vue
index 3916367d2701bb5c12477d664120b4de1989eb11..3c3daddfda90837e83c65f6a8910153617f292f3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-tabbar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-tabbar.vue
@@ -1,16 +1,16 @@
 <template>
     <view class="">
-        <view class="corecms-tabbar bottom-cell-group" ref="tabBar">
+        <view class="coreshop-tabbar u-margin-bottom-20" ref="tabBar">
             <scroll-view scroll-x='true' class="tabbar-list">
-                <view class="tabbar-item" v-for="(item, index) in corecmsdata.parameters.list" :key="index" @click="showSliderInfo(item.linkType, item.linkValue)">
+                <view class="tabbar-item" v-for="(item, index) in coreshopdata.parameters.list" :key="index" @click="showSliderInfo(item.linkType, item.linkValue)">
                     {{item.text}}
                     <view class="active-tabbar"></view>
                 </view>
             </scroll-view>
         </view>
-        <!-- <view class="corecms-tabbar bottom-cell-group tabbar-fixed" v-show="tabbarFixed">
+        <!-- <view class="coreshop-tabbar u-margin-bottom-20 tabbar-fixed" v-show="tabbarFixed">
             <scroll-view scroll-x='true' class="tabbar-list">
-                <view class="tabbar-item" v-for="(item, index) in corecmsdata.parameters.list" :key="index" @click="showSliderInfo(item.linkType, item.linkValue)">
+                <view class="tabbar-item" v-for="(item, index) in coreshopdata.parameters.list" :key="index" @click="showSliderInfo(item.linkType, item.linkValue)">
                     {{item.text}}
                     <view class="active-tabbar"></view>
                 </view>
@@ -24,9 +24,9 @@
     import { goods } from '@/common/mixins/mixinsHelper.js';
     export default {
         mixins: [goods],
-        name: "corecmsTabbar",
+        name: "coreshopTabbar",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Object,
                 required: true,
             }
@@ -56,7 +56,7 @@
         },
         methods: {
             searchStyle() {
-                this.$store.commit('searchStyle', this.corecmsdata.parameters.style)
+                this.$store.commit('searchStyle', this.coreshopdata.parameters.style)
                 // console.log(this.data.parameters.style)
             },
             handleScroll() {
@@ -64,7 +64,7 @@
                 this.scrollTop >= this.searchTop ? this.tabbarFixed = true : this.tabbarFixed = false;
             },
             goClassify() {
-                this.$u.route({type: 'switchTab',url: '/pages/category/index/index'});
+                this.$u.route({ type: 'switchTab', url: '/pages/category/index/index' });
             },
             showSliderInfo(type, val) {
                 console.log(val)
@@ -121,10 +121,13 @@
 </script>
 
 <style lang="scss" scoped>
-    .tabbar-list { padding: 10rpx 0; background-color: #fff; white-space: nowrap; width: 100%; }
-    .tabbar-item { display: inline-block; padding: 10rpx 20rpx; }
-        .tabbar-item:first-of-type { color: #FF7159; }
-    .active-tabbar { display: none; }
-    .tabbar-item:first-of-type .active-tabbar { display: block; width: 100%; height: 4rpx; margin: 10rpx auto 0; background-color: #FF7159; }
+    .tabbar-list { padding: 10rpx 0; background-color: #fff; white-space: nowrap; width: 100%;
+        .tabbar-item { display: inline-block; padding: 10rpx 20rpx;
+            .active-tabbar { display: none; }
+        }
+    }
+    .tabbar-item:first-of-type { color: #FF7159;
+        .active-tabbar { display: block; width: 100%; height: 4rpx; margin: 10rpx auto 0; background-color: #FF7159; }
+    }
     .tabbar-fixed { position: fixed; top: 104rpx; transition: all .5s; z-index: 999; background-color: #fff; width: 100%; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-textarea.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-textarea.vue
similarity index 50%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-textarea.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-textarea.vue
index fd221c128f36b1d8e8f7227dc4d690f5066f90d7..0b9f0dc2456d591e578d2cf32b824d6090d06820 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-textarea.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-textarea.vue
@@ -1,20 +1,20 @@
 <template>
     <view class="clearfix">
-        <view class="textarea bottom-cell-group">
-            <corecmsContent :content="corecmsdata.parameters.value" v-if="corecmsdata.parameters.value"></corecmsContent>
+        <view class="textarea u-margin-bottom-20">
+            <coreshopContent :content="coreshopdata.parameters.value" v-if="coreshopdata.parameters.value"></coreshopContent>
         </view>
     </view>
 </template>
 
 <script>
-    import corecmsContent from '@/components/corecms-page/corecms-content.vue'//视频和文本解析组件
+    import coreshopContent from '@/components/coreshop-page/coreshop-content.vue'//视频和文本解析组件
     export default {
         components: {
-            corecmsContent
+            coreshopContent
         },
-        name: "corecmstextarea",
+        name: "coreshoptextarea",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 // type: Object,
                 required: true,
             }
@@ -31,9 +31,11 @@
 </script>
 
 <style lang="scss" scoped>
-    .textarea { width: 100%; background-color: #fff; padding: 10upx 26upx; /* height: 40upx; */ }
-        .textarea p img { width: 100% !important; }
-        .textarea div { background-color: #000; }
-        .textarea p { background-color: #000; }
+    .textarea { width: 100%; background-color: #fff; padding: 10upx 26upx;
+        p {
+            img { width: 100% !important; background-color: #000; }
+        }
+        div { background-color: #000; }
+    }
     .clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-video.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue
similarity index 59%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-video.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue
index 6f73cc06ee1b8d87425e173e9f58419d8ddd79a8..e050c3a2566a750de4477904a512c856c30df0db 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-page/corecms-video.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue
@@ -1,14 +1,14 @@
 <template>
     <view class="video u-margin-15">
-        <video class="videoCT" id="myVideo" :src="corecmsdata.parameters.list[0].url" :autoplay="autoplay" :poster="corecmsdata.parameters.list[0].image"></video>
+        <video class="videoCT" id="myVideo" :src="coreshopdata.parameters.list[0].url" :autoplay="autoplay" :poster="coreshopdata.parameters.list[0].image"></video>
     </view>
 </template>
 
 <script>
     export default {
-        name: "corecmsvideo",
+        name: "coreshopvideo",
         props: {
-            corecmsdata: {
+            coreshopdata: {
                 type: Object,
                 required: true,
             }
@@ -19,7 +19,7 @@
             }
         },
         created() {
-            if (this.corecmsdata.parameters.autoplay == 'true' || this.corecmsdata.parameters.autoplay == true) {
+            if (this.coreshopdata.parameters.autoplay == 'true' || this.coreshopdata.parameters.autoplay == true) {
                 this.autoplay = true;
             }
 
@@ -36,6 +36,7 @@
 </script>
 
 <style lang="scss" scoped>
-    .video { border-radius: 8px; }
-        .videoCT { width: 100%; min-height: 200upx;}
+    .video { border-radius: 8px;
+        .videoCT { width: 100%; min-height: 200upx; }
+    }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop.vue
new file mode 100644
index 0000000000000000000000000000000000000000..4874fac2935ad5ed718c5d2e4777dca0e086986a
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop.vue
@@ -0,0 +1,102 @@
+<template>
+    <view>
+        <block v-for="(item,index) in coreshopdata" :key="index">
+            <!--�������޸���-->
+            <coreshopsearch :coreshopdata="item" v-if="item.widgetCode=='search' "></coreshopsearch>
+            <!--�л�-->
+            <coreshoptabbar :coreshopdata="item" v-if="item.widgetCode=='tabBar' "></coreshoptabbar>
+            <!--���棨�޸���-->
+            <coreshopnotice :coreshopdata="item" v-if="item.widgetCode=='notice' "></coreshopnotice>
+            <!--ͼƬ�ֲ����޸���-->
+            <coreshopimgSlide :coreshopdata="item" v-if="item.widgetCode=='imgSlide' "></coreshopimgSlide>
+            <!--�Ż�ȯ���޸���-->
+            <coreshopcoupon :coreshopdata="item" v-if="item.widgetCode=='coupon' "></coreshopcoupon>
+            <!--�ո��޸���-->
+            <coreshopblank :coreshopdata="item" v-if="item.widgetCode=='blank' "></coreshopblank>
+            <!--�����ı����������޸���-->
+            <coreshoptextarea :coreshopdata="item" v-if="item.widgetCode=='textarea' "></coreshoptextarea>
+            <!--��Ƶ���޸���-->
+            <coreshopvideo :coreshopdata="item" v-if="item.widgetCode=='video' "></coreshopvideo>
+            <!--ͼƬ�����޸���-->
+            <coreshopimgWindow :coreshopdata="item" v-if="item.widgetCode=='imgWindow' "></coreshopimgWindow>
+            <!--ͼƬ--���޸���-->
+            <coreshopimgSingle :coreshopdata="item" v-if="item.widgetCode=='imgSingle' "></coreshopimgSingle>
+            <!--��Ʒ���޸���-->
+            <coreshopgoods :coreshopdata="item" v-if="item.widgetCode=='goods' "></coreshopgoods>
+            <!--���£��޸���-->
+            <coreshoparticle :coreshopdata="item" v-if="item.widgetCode=='article' "></coreshoparticle>
+            <!--���·��ࣨ�޸���-->
+            <coreshoparticleClassify :coreshopdata="item" v-if="item.widgetCode=='articleClassify' "></coreshoparticleClassify>
+            <!--�����Զ��嵼�����޸���-->
+            <coreshopnavBar :coreshopdata="item" v-if="item.widgetCode=='navBar' "></coreshopnavBar>
+            <!--�Ź����޸���-->
+            <coreshopgroupPurchase :coreshopdata="item" v-if="item.widgetCode=='groupPurchase' "></coreshopgroupPurchase>
+            <!--�����¼���޸���-->
+            <coreshoprecord :coreshopdata="item" v-if="item.widgetCode=='record' "></coreshoprecord>
+            <!--ƴ�ţ��޸���-->
+            <coreshoppinTuan :coreshopdata="item" v-if="item.widgetCode=='pinTuan' "></coreshoppinTuan>
+            <!--�����޸���-->
+            <coreshopservice :coreshopdata="item" v-if="item.widgetCode=='service' "></coreshopservice>
+            <!--�������-->
+            <coreshopadpop :coreshopdata="item" v-if="item.widgetCode=='adpop' "></coreshopadpop>
+            <!--�ı����ݣ��޸���-->
+            <coreshopContent :coreshopdata="item" v-if="item.widgetCode=='content' "></coreshopContent>
+        </block>
+    </view>
+</template>
+
+<script>
+    import coreshopimgSlide from '@/components/coreshop-page/coreshop-imgSlide.vue'
+    import coreshopsearch from '@/components/coreshop-page/coreshop-search.vue'
+    import coreshopnotice from '@/components/coreshop-page/coreshop-notice.vue'
+    import coreshopcoupon from '@/components/coreshop-page/coreshop-coupon.vue'
+    import coreshopblank from '@/components/coreshop-page/coreshop-blank.vue'
+    import coreshoptextarea from '@/components/coreshop-page/coreshop-textarea.vue'
+    import coreshopvideo from '@/components/coreshop-page/coreshop-video.vue'
+    import coreshopimgWindow from '@/components/coreshop-page/coreshop-imgWindow.vue'
+    import coreshopimgSingle from '@/components/coreshop-page/coreshop-imgSingle.vue'
+    import coreshopgoods from '@/components/coreshop-page/coreshop-goods.vue'
+    import coreshoparticle from '@/components/coreshop-page/coreshop-article.vue'
+    import coreshoparticleClassify from '@/components/coreshop-page/coreshop-articleClassify.vue'
+    import coreshopnavBar from '@/components/coreshop-page/coreshop-navBar.vue'
+    import coreshopgroupPurchase from '@/components/coreshop-page/coreshop-groupPurchase.vue'
+    import coreshoprecord from '@/components/coreshop-page/coreshop-record.vue'
+    import coreshoppinTuan from '@/components/coreshop-page/coreshop-pinTuan.vue'
+    import coreshopservice from '@/components/coreshop-page/coreshop-service.vue'
+    import coreshoptabbar from '@/components/coreshop-page/coreshop-tabbar.vue'
+    import coreshopadpop from '@/components/coreshop-page/coreshop-adpop.vue'
+    import coreshopContent from '@/components/coreshop-page/coreshop-content.vue'
+
+    export default {
+        name: 'coreshopPage',
+        components: {
+            coreshopimgSlide,
+            coreshopsearch,
+            coreshopnotice,
+            coreshopcoupon,
+            coreshopblank,
+            coreshoptextarea,
+            coreshopvideo,
+            coreshopimgWindow,
+            coreshopimgSingle,
+            coreshopgoods,
+            coreshoparticle,
+            coreshoparticleClassify,
+            coreshopnavBar,
+            coreshopgroupPurchase,
+            coreshoprecord,
+            coreshoppinTuan,
+            coreshopservice,
+            coreshoptabbar,
+            coreshopadpop,
+            coreshopContent
+        },
+        props: {
+            coreshopdata: {
+                default: function () {
+                    return []
+                }
+            }
+        }
+    }
+</script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByAli.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByAli.vue
similarity index 79%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByAli.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByAli.vue
index b9d2dbe1db2eb07ee8cfc9d5f8c10b3b08628127..1a07e0b1075e0055fea8bb010f905aedd2b16f3f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByAli.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByAli.vue
@@ -2,21 +2,21 @@
     <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 cu-list menu-avatar  padding-xl radius shadow shadow-lg bg-blue margin-top">
-                <view class="cu-item">
-                    <view class="cu-avatar radius">
+            <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="text-grey">{{ item.name }}</view>
-                        <view class="text-gray text-sm flex">
-                            <view class="text-cut">
+                        <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">
-                        <view class="cu-tag round bg-red sm">选择此支付方式</view>
+                        <u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
                     </view>
                 </view>
             </view>
@@ -36,7 +36,6 @@
 </template>
 
 <script>
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js';
     export default {
         props: {
             // 如果是商品订单此参数必须
@@ -179,18 +178,5 @@
 
 
 <style lang="scss">
-    .cu-list.menu-avatar { display: block; overflow: hidden; border-radius: 10upx; margin: 20rpx; }
-        .cu-list.menu-avatar > .cu-item .content { position: absolute; left: 116rpx; width: calc(100% - 66rpx - 60rpx - 120rpx - 20rpx); line-height: 1.6em; }
-        .cu-list.menu-avatar > .cu-item .action { width: 200rpx; text-align: center; }
-
-    .no-show { display: none; }
-    .payment-wx .coreshop-btn { background-color: #fff; line-height: 1.7; padding: 0; width: 724upx; position: relative; display: flex; align-items: center; }
-    .payment-pop { position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 400rpx; height: 272rpx; background-color: #fff; text-align: center; box-shadow: 0 0 20rpx #ccc; }
-
-    .payment-pop-c { padding: 50rpx 30rpx; font-size: 32rpx; color: #999; }
-        .payment-pop-c image { width: 60upx; height: 60upx; }
-    .payment-pop-b { position: absolute; bottom: 0; display: flex; width: 100%; justify-content: space-between; }
-        .payment-pop-b .coreshop-btn { flex: 1; justify-content: center; }
-        .payment-pop-b .coreshop-btn-o { background-color: #FF7159; }
-    .payment-pop .text { font-size: 24upx; }
+    .coreshop-avatar { background: #fff; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByApp.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByApp.vue
similarity index 83%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByApp.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByApp.vue
index 88d3de8561e118cda35827c79d009e4acc8313e8..f1b4a36c0702b2ba115feaa395d4c47c5aad484f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByApp.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByApp.vue
@@ -2,21 +2,21 @@
     <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 cu-list menu-avatar  padding-xl radius shadow shadow-lg bg-blue margin-top">
-                <view class="cu-item">
-                    <view class="cu-avatar radius">
+            <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="text-grey">{{ item.name }}</view>
-                        <view class="text-gray text-sm flex">
-                            <view class="text-cut">
+                        <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">
-                        <view class="cu-tag round bg-red sm">选择此支付方式</view>
+                        <u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
                     </view>
                 </view>
             </view>
@@ -36,7 +36,6 @@
 </template>
 
 <script>
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js'
     export default {
         props: {
             // 如果是商品订单此参数必须
@@ -234,18 +233,5 @@
 
 
 <style lang="scss">
-    .cu-list.menu-avatar { display: block; overflow: hidden; border-radius: 10upx; margin: 20rpx; }
-        .cu-list.menu-avatar > .cu-item .content { position: absolute; left: 116rpx; width: calc(100% - 66rpx - 60rpx - 120rpx - 20rpx); line-height: 1.6em; }
-        .cu-list.menu-avatar > .cu-item .action { width: 200rpx; text-align: center; }
-
-    .no-show { display: none; }
-    .payment-wx .coreshop-btn { background-color: #fff; line-height: 1.7; padding: 0; width: 724upx; position: relative; display: flex; align-items: center; }
-    .payment-pop { position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 400rpx; height: 272rpx; background-color: #fff; text-align: center; box-shadow: 0 0 20rpx #ccc; }
-
-    .payment-pop-c { padding: 50rpx 30rpx; font-size: 32rpx; color: #999; }
-        .payment-pop-c image { width: 60upx; height: 60upx; }
-    .payment-pop-b { position: absolute; bottom: 0; display: flex; width: 100%; justify-content: space-between; }
-        .payment-pop-b .coreshop-btn { flex: 1; justify-content: center; }
-        .payment-pop-b .coreshop-btn-o { background-color: #FF7159; }
-    .payment-pop .text { font-size: 24upx; }
+    .coreshop-avatar { background: #fff; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByH5.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByH5.vue
similarity index 89%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByH5.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByH5.vue
index 2928683f1799fc7021037c668ec9c0b68482a930..91b2fd09c8da4d3371337b9e87a14e038ae8bcd3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByH5.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByH5.vue
@@ -2,21 +2,21 @@
     <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 cu-list menu-avatar  padding-xl radius shadow shadow-lg bg-blue margin-top">
-                <view class="cu-item">
-                    <view class="cu-avatar radius">
+            <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="text-grey">{{ item.name }}</view>
-                        <view class="text-gray text-sm flex">
-                            <view class="text-cut">
+                        <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">
-                        <view class="cu-tag round bg-red sm">选择此支付方式</view>
+                        <u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
                     </view>
                 </view>
             </view>
@@ -36,7 +36,6 @@
 </template>
 
 <script>
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js'
     export default {
         props: {
             // 如果是商品订单此参数必须
@@ -331,18 +330,5 @@
     }
 </script>
 <style lang="scss">
-    .cu-list.menu-avatar { display: block; overflow: hidden; border-radius: 10upx; margin: 20rpx; }
-        .cu-list.menu-avatar > .cu-item .content { position: absolute; left: 116rpx; width: calc(100% - 66rpx - 60rpx - 120rpx - 20rpx); line-height: 1.6em; }
-        .cu-list.menu-avatar > .cu-item .action { width: 200rpx; text-align: center; }
-
-    .no-show { display: none; }
-    .payment-wx .coreshop-btn { background-color: #fff; line-height: 1.7; padding: 0; width: 724upx; position: relative; display: flex; align-items: center; }
-    .payment-pop { position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 400rpx; height: 272rpx; background-color: #fff; text-align: center; box-shadow: 0 0 20rpx #ccc; }
-
-    .payment-pop-c { padding: 50rpx 30rpx; font-size: 32rpx; color: #999; }
-        .payment-pop-c image { width: 60upx; height: 60upx; }
-    .payment-pop-b { position: absolute; bottom: 0; display: flex; width: 100%; justify-content: space-between; }
-        .payment-pop-b .coreshop-btn { flex: 1; justify-content: center; }
-        .payment-pop-b .coreshop-btn-o { background-color: #FF7159; }
-    .payment-pop .text { font-size: 24upx; }
+    .coreshop-avatar { background: #fff; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByTt.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByTt.vue
similarity index 83%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByTt.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByTt.vue
index c4c4741f8c117bec981b1af59dbe213e88cf85bc..27a6d7161ae65222bf93041d7670afd62c7696fd 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByTt.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByTt.vue
@@ -2,22 +2,22 @@
     <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="no-show">
-            <button class="u-reset-button cu-list menu-avatar  padding-xl radius shadow shadow-lg bg-blue margin-top" form-type="submit">
-                <view class="cu-item">
-                    <view class="cu-avatar radius">
+            <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="text-grey">{{ item.name }}</view>
-                        <view class="text-gray text-sm flex">
-                            <view class="text-cut">
+                        <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">
-                        <view class="cu-tag round bg-red sm">选择此支付方式</view>
+                        <u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
                     </view>
                 </view>
             </button>
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js'
     export default {
         props: {
             // 如果是商品订单此参数必须
@@ -229,18 +228,5 @@
 </script>
 
 <style lang="scss">
-    .cu-list.menu-avatar { display: block; overflow: hidden; border-radius: 10upx; margin: 20rpx; }
-        .cu-list.menu-avatar > .cu-item .content { position: absolute; left: 116rpx; width: calc(100% - 66rpx - 60rpx - 120rpx - 20rpx); line-height: 1.6em; }
-        .cu-list.menu-avatar > .cu-item .action { width: 200rpx; text-align: center; }
-
-    .no-show { display: none; }
-    .payment-wx .coreshop-btn { background-color: #fff; line-height: 1.7; padding: 0; width: 724upx; position: relative; display: flex; align-items: center; }
-    .payment-pop { position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 400rpx; height: 272rpx; background-color: #fff; text-align: center; box-shadow: 0 0 20rpx #ccc; }
-
-    .payment-pop-c { padding: 50rpx 30rpx; font-size: 32rpx; color: #999; }
-        .payment-pop-c image { width: 60upx; height: 60upx; }
-    .payment-pop-b { position: absolute; bottom: 0; display: flex; width: 100%; justify-content: space-between; }
-        .payment-pop-b .coreshop-btn { flex: 1; justify-content: center; }
-        .payment-pop-b .coreshop-btn-o { background-color: #FF7159; }
-    .payment-pop .text { font-size: 24upx; }
+    .coreshop-avatar { background: #fff; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByWx.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue
similarity index 60%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByWx.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue
index 6b80ceacfae532af2fc7075b6b0255f82ef5ac51..e2cfd90007cd3e9fe5657515023d4147672b0497 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-payments/corecms-paymentsByWx.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue
@@ -2,22 +2,22 @@
     <view>
         <u-toast ref="uToast" />
         <form v-for="item in payments" :key="item.code" @submit="toPayHandler" v-if="!(type == 2 && item.code == 'balancepay')">
-            <input name="code" :value="item.code" class="no-show">
-            <button class="u-reset-button cu-list menu-avatar  padding-xl radius shadow shadow-lg bg-blue margin-top" form-type="submit">
-                <view class="cu-item">
-                    <view class="cu-avatar radius">
+            <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="text-grey">{{ item.name }}</view>
-                        <view class="text-gray text-sm flex">
-                            <view class="text-cut">
+                        <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">
-                        <view class="cu-tag round bg-red sm">选择此支付方式</view>
+                        <u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
                     </view>
                 </view>
             </button>
@@ -36,7 +36,6 @@
 </template>
 
 <script>
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js'
     export default {
         props: {
             // 如果是商品订单此参数必须
@@ -129,31 +128,51 @@
                     case 'wechatpay':
                         this.$u.api.pay(data).then(res => {
                             if (res.status) {
-                                uni.requestPayment({
-                                    provider: 'wxpay',
-                                    timeStamp: res.data.timeStamp,
-                                    nonceStr: res.data.nonceStr,
-                                    package: res.data.package,
-                                    signType: res.data.signType,
-                                    paySign: res.data.paySign,
-                                    success: function (e) {
-                                        console.log(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 });
-                                                }
-                                            })
+                                if (res.otherData.checkSceneResult && res.otherData.checkSceneResult.is_matched == 1) {
+                                    wx.requestOrderPayment({
+                                        timeStamp: res.data.timeStamp,
+                                        nonceStr: res.data.nonceStr,
+                                        package: res.data.package,
+                                        signType: res.data.signType,
+                                        paySign: res.data.paySign,
+                                        orderInfo: res.otherData.orderInfo,
+                                        success: function (e) {
+                                            console.log(e);
+                                            if (e.errMsg === 'requestOrderPayment:ok') {
+                                                _this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + res.data.paymentId });
+                                            }
+                                        },
+                                        fail: function (res) {
+                                            if (res.errMsg === 'requestPayment:fail cancel') {
+                                                _this.popHide();
+                                                _this.$u.toast("您已经取消此方式支付,可继续选择其他方式支付。")
+                                            }
+                                            console.log(res);
                                         }
-                                    },
-                                    fail: function (res) {
-                                        if (res.errMsg === 'requestPayment:fail cancel') {
-                                            _this.popHide();
-                                            _this.$u.toast("您已经取消此方式支付,可继续选择其他方式支付。")
+                                    });
+                                } else {
+                                    uni.requestPayment({
+                                        provider: 'wxpay',
+                                        timeStamp: res.data.timeStamp,
+                                        nonceStr: res.data.nonceStr,
+                                        package: res.data.package,
+                                        signType: res.data.signType,
+                                        paySign: res.data.paySign,
+                                        success: function (e) {
+                                            console.log(e);
+                                            if (e.errMsg === 'requestPayment:ok') {
+                                                _this.$u.route({ type: 'redirectTo', url: '/pages/payment/result/result?id=' + res.data.paymentId });
+                                            }
+                                        },
+                                        fail: function (res) {
+                                            if (res.errMsg === 'requestPayment:fail cancel') {
+                                                _this.popHide();
+                                                _this.$u.toast("您已经取消此方式支付,可继续选择其他方式支付。")
+                                            }
+                                            console.log(res);
                                         }
-                                        console.log(res);
-                                    }
-                                });
+                                    });
+                                }
                             } else {
                                 _this.$u.toast(res.msg)
                                 _this.popHide();
@@ -193,18 +212,5 @@
 </script>
 
 <style lang="scss">
-    .cu-list.menu-avatar { display: block; overflow: hidden; border-radius: 10upx; margin: 20rpx; }
-        .cu-list.menu-avatar > .cu-item .content { position: absolute; left: 116rpx; width: calc(100% - 66rpx - 60rpx - 120rpx - 20rpx); line-height: 1.6em; }
-        .cu-list.menu-avatar > .cu-item .action { width: 200rpx; text-align: center; }
-
-    .no-show { display: none; }
-    .payment-wx .coreshop-btn { background-color: #fff; line-height: 1.7; padding: 0; width: 724upx; position: relative; display: flex; align-items: center; }
-    .payment-pop { position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 400rpx; height: 272rpx; background-color: #fff; text-align: center; box-shadow: 0 0 20rpx #ccc; }
-
-    .payment-pop-c { padding: 50rpx 30rpx; font-size: 32rpx; color: #999; }
-        .payment-pop-c image { width: 60upx; height: 60upx; }
-    .payment-pop-b { position: absolute; bottom: 0; display: flex; width: 100%; justify-content: space-between; }
-        .payment-pop-b .coreshop-btn { flex: 1; justify-content: center; }
-        .payment-pop-b .coreshop-btn-o { background-color: #FF7159; }
-    .payment-pop .text { font-size: 24upx; }
+    .coreshop-avatar { background: #fff; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByAli.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByAli.vue
similarity index 94%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByAli.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByAli.vue
index 369d099f8e588b96783f2c1255849a0791bd37aa..ed2459608876c3892aaca7efd037a2d35e6b3224 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByAli.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByAli.vue
@@ -1,13 +1,13 @@
 <template>
-    <view class="share-Box">
+    <view class="coreshop-share-Box">
         <u-toast ref="uToast" />
-        <view class="share-pop">
-            <view class="share-item">
+        <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="share-item">
+            <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>
@@ -20,7 +20,6 @@
 </template>
 
 <script>
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js'
     export default {
         props: {
             // 商品id
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByApp.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByApp.vue
similarity index 98%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByApp.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByApp.vue
index 400964984fb5823e9f5e64ee99cd5105644b338b..9224587b94f7617be42beb5e020350e9cf8a7bfc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByApp.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByApp.vue
@@ -1,8 +1,8 @@
 <template>
-    <view class="share-Box">
+    <view class="coreshop-share-Box">
         <u-toast ref="uToast" />
-        <view class="share-pop">
-            <view class="share-item"
+        <view class="coreshop-share-pop">
+            <view class="coreshop-share-item"
                   v-for="(item, index) in providerList"
                   :key="index"
                   @click="clickHandler(item)">
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByTt.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByTt.vue
similarity index 95%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByTt.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByTt.vue
index d100c93ee27d77d1a9b934fd805b1b0c1b981050..7776108f57337c5d532edd882a29d81610ea7022 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByTt.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByTt.vue
@@ -1,8 +1,8 @@
 <template>
-    <view class="share-Box">
+    <view class="coreshop-share-Box">
         <u-toast ref="uToast" />
-        <view class="share-pop">
-            <view class="share-item">
+        <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>
@@ -15,7 +15,6 @@
 </template>
 
 <script>
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js'
     // #ifdef MP-TOUTIAO
     import { ttPlatform } from '@/common/setting/constVarsHelper.js'
     // #endif
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByWx.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByWx.vue
similarity index 94%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByWx.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByWx.vue
index 58da2b6a017364cfccba16b1c6fb94493255ccf0..c0c7810711c7bfbc68c412d52e8b1597bbe7cc14 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByWx.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByWx.vue
@@ -1,13 +1,13 @@
 <template>
-    <view class="share-Box">
+    <view class="coreshop-share-Box">
         <u-toast ref="uToast" />
-        <view class="share-pop">
-            <view class="share-item">
+        <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="share-item">
+            <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>
@@ -20,7 +20,6 @@
 </template>
 
 <script>
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js'
     export default {
         props: {
             // 商品id
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByh5.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByh5.vue
similarity index 96%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByh5.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByh5.vue
index 995189c373e2583c70abb049e00cd83d62923dc0..3b68043e3bd9402ed2fedff18b4c629f65e8323c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-share/shareByh5.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByh5.vue
@@ -1,13 +1,13 @@
 <template>
-    <view class="share-Box">
+    <view class="coreshop-share-Box">
         <u-toast ref="uToast" />
-        <view class="share-pop">
-            <view class="share-item" @click="copyUrl()" v-show="!ifwx">
+        <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="share-item" @click="createPoster()">
+            <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>
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/corecms-spec/corecms-spec.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-spec/coreshop-spec.vue
similarity index 55%
rename from CoreCms.Net.Uni-App/CoreShop/components/corecms-spec/corecms-spec.vue
rename to CoreCms.Net.Uni-App/CoreShop/components/coreshop-spec/coreshop-spec.vue
index cbbf9a51ecb6e5247d39201fb58c69b77daf4455..f044a66878a4389c89c1b8fdd27753c3a24048bc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/corecms-spec/corecms-spec.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-spec/coreshop-spec.vue
@@ -1,9 +1,12 @@
 <template>
     <view>
         <view class="select-item" v-for="(item, index) in specList" :key="index">
-            <view class="text-black u-margin-10">{{ index }}</view>
+            <view class="coreshop-text-black u-margin-10  coreshop-solid-bottom u-padding-bottom-20">{{ index }}</view>
             <view class="select-btn">
-                <button class="cu-btn u-margin-10" :class="spes.cla" v-for="(spes, key) in item" :key="key" @click="specChangeSpes(index, key)"> {{ spes.name }}</button>
+                <button class="sku-btn u-margin-10" :class="spes.cla" v-for="(spes, key) in item" :key="key" @click="specChangeSpes(index, key)">
+                    <u-avatar :src="spes.image" size="50" class="u-margin-right-10 u-margin-top-10" style="margin-left: -20rpx;"></u-avatar>
+                    {{ spes.name }}
+                </button>
             </view>
         </view>
     </view>
@@ -43,13 +46,7 @@
     }
 </script>
 <style scoped lang="scss">
-    .goods-specs, .goods-number { padding: 26upx; border-top: 1px solid #f3f3f3; }
-        .goods-specs:first-child { border: none; }
-    .pop-m-title { margin-right: 10upx; color: #666; }
-    .pop-m-item { display: inline-block; float: left; padding: 6upx 16upx; background-color: #fff; color: #333; margin-right: 16upx; margin-bottom: 10upx; }
-    .pop-m-bd { overflow: hidden; margin-top: 10upx; }
-    .selected { border: 2upx solid #333; background-color: #333; color: #fff; }
-        .selected:not([class*="bg-"]) { background-color: #333; }
+    .selected { border: 2upx solid #ff0000; background-color: #fff5f6; color: #ff0000; }
     .not-selected { border: 2upx solid #ccc; }
-    .none { border: 2upx dashed #ccc; color: #888; }
+    .none { border: 2upx dashed #ccc; color: #888; display: none; }
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/main.js b/CoreCms.Net.Uni-App/CoreShop/main.js
index c59f71fe0a417ca88861bb74cb449095a6e5e77f..7bef6ec8931e71f0391b1d32acfef0398b760ccd 100644
--- a/CoreCms.Net.Uni-App/CoreShop/main.js
+++ b/CoreCms.Net.Uni-App/CoreShop/main.js
@@ -1,50 +1,48 @@
-import Vue from 'vue'
+import Vue from 'vue'
 import App from './App'
-
+//上传方法
 import * as Upload from '@/common/utils/uploadHelper.js'
-
+//常用方法库
 import * as Common from '@/common/utils/commonHelper.js'
+//本地存储封装
 import * as Db from '@/common/utils/dbHelper.js'
-import * as Config from '@/common/setting/constVarsHelper.js'
+//全局常量配置
+import * as GlobalConstVars from '@/common/setting/constVarsHelper.js'
+
+//全局常量配置
+import * as CoreTheme from '@/common/setting/coreThemeHelper.js'
+
 import store from '@/common/store'
 
-//����ȫ��uView
+//引入全局uView
 import uView from 'uview-ui';
 Vue.use(uView);
 
 
-// ����uView��С���������mixin��װ
+// 引入uView对小程序分享的mixin封装
 let mpShare = require('@/uview-ui/libs/mixin/mpShare.js');
 Vue.mixin(mpShare)
 
-//����ȫ��colorUIͷ��
-import cuCustom from '@/static/colorui/components/cu-custom.vue'
-Vue.component('cu-custom', cuCustom)
-
-import { apiFilesUrl } from '@/common/setting/constVarsHelper.js'
-
-
 Vue.config.productionTip = false
 Vue.prototype.$upload = Upload;
 Vue.prototype.$common = Common;
 Vue.prototype.$db = Db;
-Vue.prototype.$config = Config;
+Vue.prototype.$globalConstVars = GlobalConstVars;
+Vue.prototype.$coreTheme = CoreTheme;
 Vue.prototype.$store = store;
 
-Vue.prototype.$apiFilesUrl = apiFilesUrl;
-
 App.mpType = 'app'
 
 const app = new Vue({
     ...App
 })
 
-// http������
+// http拦截器
 import httpInterceptor from '@/common/request/http.interceptor.js'
-// ������Ҫд�������Ϊ�˵�Vue����������ɣ�����"app"����(Ҳ��ҳ���"this"ʵ��)
+// 这里需要写在最后，是为了等Vue创建对象完成，引入"app"对象(也即页面的"this"实例)
 Vue.use(httpInterceptor, app)
 
-// http�ӿ�API���й������벿��
+// http接口API集中管理引入部分
 import httpApi from '@/common/request/http.api.js'
 Vue.use(httpApi, app)
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/manifest.json b/CoreCms.Net.Uni-App/CoreShop/manifest.json
index b51ee04dbc9d4233ca6f08f7ad9779c595316a54..21508a970dbadcf7b4a2f3f2da427d3e1e176ce2 100644
--- a/CoreCms.Net.Uni-App/CoreShop/manifest.json
+++ b/CoreCms.Net.Uni-App/CoreShop/manifest.json
@@ -1,7 +1,7 @@
 {
-  "name": "核心小程序商城系统",
+  "name": "核心商城系统",
   "appid": "__UNI__EAACF14",
-  "description": "核心小程序商城系统（CoreShop）是基于 Asp.Net Core 5.0、Uni-App开发，支持可视化布局的小程序商城系统",
+  "description": "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序",
   "versionName": "1.0",
   "versionCode": 1,
   "transformPx": false,
@@ -60,6 +60,38 @@
         "oauth": {
           "univerify": {}
         }
+      },
+      "icons": {
+        "android": {
+          "hdpi": "unpackage/res/icons/72x72.png",
+          "xhdpi": "unpackage/res/icons/96x96.png",
+          "xxhdpi": "unpackage/res/icons/144x144.png",
+          "xxxhdpi": "unpackage/res/icons/192x192.png"
+        },
+        "ios": {
+          "appstore": "unpackage/res/icons/1024x1024.png",
+          "ipad": {
+            "app": "unpackage/res/icons/76x76.png",
+            "app@2x": "unpackage/res/icons/152x152.png",
+            "notification": "unpackage/res/icons/20x20.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "proapp@2x": "unpackage/res/icons/167x167.png",
+            "settings": "unpackage/res/icons/29x29.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "spotlight": "unpackage/res/icons/40x40.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png"
+          },
+          "iphone": {
+            "app@2x": "unpackage/res/icons/120x120.png",
+            "app@3x": "unpackage/res/icons/180x180.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "notification@3x": "unpackage/res/icons/60x60.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "settings@3x": "unpackage/res/icons/87x87.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png",
+            "spotlight@3x": "unpackage/res/icons/120x120.png"
+          }
+        }
       }
     },
     "splashscreen": {
@@ -88,11 +120,11 @@
     }
   },
   "h5": {
-    "title": "核心小程序商城系统",
+    "title": "核心商城系统",
     "domain": "https://h5.demo.coreshop.com.cn/",
     "router": {
-      "base": "/h5/",
-      "mode": "history"
+      "base": "./",
+      "mode": "hash"
     },
     "template": "index.html",
     "devServer": {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json
index 0f620957cdb434f4ccb44548905ef3340e4e8918..6ebf87c2d15967295930fa3f4dbcddf062fa80f4 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages.json
+++ b/CoreCms.Net.Uni-App/CoreShop/pages.json
@@ -1,4 +1,5 @@
 {
+  "usingShopPlugin": true,
   "easycom": {
     // 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
     // 下载安装方式
@@ -142,27 +143,6 @@
         "navigationBarTitleText": "授权登录"
       }
     },
-    {
-      "path": "pages/login/loginByGetPhoneNumber/loginByGetPhoneNumber",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "手机授权"
-      }
-    },
-    {
-      "path": "pages/login/loginByAccount/loginByAccount",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "账户登录"
-      }
-    },
-    {
-      "path": "pages/login/forget/forget",
-      "style": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "忘记密码"
-      }
-    },
     {
       "path": "pages/share/sharePoster/sharePoster",
       "style": {
@@ -170,16 +150,6 @@
         "navigationBarTitleText": "分享"
       }
     },
-    {
-      "path": "pages/login/author/author",
-      "style": {
-        "navigationBarTextStyle": "black",
-        // #ifdef H5
-        "titleNView": false,
-        // #endif
-        "navigationBarTitleText": "获取授权中"
-      }
-    },
     {
       "path": "pages/activity/pinTuan/list/list",
       "style": {
@@ -304,49 +274,49 @@
           }
         },
         {
-          "path": "balance/index",
+          "path": "balance/index/index",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "我的余额"
           }
         },
         {
-          "path": "balance/recharge",
+          "path": "balance/recharge/recharge",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "储值"
           }
         },
         {
-          "path": "balance/withdrawCash",
+          "path": "balance/withdrawCash/withdrawCash",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "提现"
           }
         },
         {
-          "path": "balance/details",
+          "path": "balance/details/details",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "余额明细"
           }
         },
         {
-          "path": "balance/cashlist",
+          "path": "balance/cashlist/cashlist",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "提现记录"
           }
         },
         {
-          "path": "balance/bankcard",
+          "path": "balance/bankcard/bankcard",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "我的银行卡"
           }
         },
         {
-          "path": "balance/addBankCard",
+          "path": "balance/addBankCard/addBankCard",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "添加银行卡"
@@ -367,14 +337,14 @@
           }
         },
         {
-          "path": "address/list",
+          "path": "address/list/list",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "地址管理"
           }
         },
         {
-          "path": "address/index",
+          "path": "address/index/index",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "修改地址"
@@ -430,219 +400,226 @@
           }
         },
         {
-          "path": "order/orderlist",
+          "path": "order/index/index",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "订单列表"
           }
         },
         {
-          "path": "order/orderdetail",
+          "path": "order/detail/detail",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "订单详情"
           }
         },
         {
-          "path": "order/invitationGroup",
+          "path": "order/invitationGroup/invitationGroup",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "邀请拼单"
           }
         },
         {
-          "path": "afterSales/index",
+          "path": "afterSales/submit/submit",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "申请售后"
           }
         },
         {
-          "path": "afterSales/list",
+          "path": "afterSales/list/list",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "售后列表"
           }
         },
         {
-          "path": "afterSales/detail",
+          "path": "afterSales/detail/detail",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "售后详情"
           }
         },
         {
-          "path": "order/evaluate",
+          "path": "order/evaluate/evaluate",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "订单评价"
           }
         },
         {
-          "path": "order/expressDelivery",
+          "path": "order/expressDelivery/expressDelivery",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "物流信息"
           }
         },
         {
-          "path": "distribution/index",
+          "path": "distribution/index/index",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "分销中心"
           }
         },
         {
-          "path": "distribution/apply",
+          "path": "distribution/apply/apply",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "申请成为分销"
           }
         },
         {
-          "path": "distribution/applyState",
+          "path": "distribution/applyState/applyState",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "审核状态"
           }
         },
         {
-          "path": "distribution/panel",
+          "path": "distribution/panel/panel",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "分销中心"
           }
         },
         {
-          "path": "distribution/agreement",
+          "path": "distribution/agreement/agreement",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "分销协议"
           }
         },
         {
-          "path": "distribution/order",
+          "path": "distribution/order/order",
           "style": {
-            "navigationBarTextStyle": "white",
+            "navigationBarTextStyle": "black",
             "navigationBarTitleText": "推广订单"
           }
         },
         {
-          "path": "distribution/myStore",
+          "path": "distribution/myStore/myStore",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "我的店铺"
           }
         },
         {
-          "path": "distribution/storeSetting",
+          "path": "distribution/storeSetting/storeSetting",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "店铺设置"
           }
         },
         {
-          "path": "distribution/team",
+          "path": "distribution/team/team",
           "style": {
-            "navigationBarTextStyle": "white",
+            "navigationBarTextStyle": "black",
             "navigationBarTitleText": "我的团队"
           }
         },
         {
-          "path": "distribution/commissionDetails",
+          "path": "distribution/commissionDetails/commissionDetails",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "佣金明细"
           }
         },
         {
-          "path": "distribution/rankings",
+          "path": "distribution/rankings/rankings",
           "style": {
-            "navigationBarTextStyle": "white",
+            "navigationBarTextStyle": "black",
             "navigationBarTitleText": "分销排行"
           }
         },
         {
-          "path": "agent/index",
+          "path": "distribution/shareLog/shareLog",
+          "style": {
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "分享记录"
+          }
+        },
+        {
+          "path": "agent/index/index",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "代理中心"
           }
         },
         {
-          "path": "agent/apply",
+          "path": "agent/apply/apply",
           "style": {
-            "navigationBarTextStyle": "white",
+            "navigationBarTextStyle": "black",
             "navigationBarTitleText": "申请成为代理"
           }
         },
         {
-          "path": "agent/applyState",
+          "path": "agent/applyState/applyState",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "审核状态"
           }
         },
         {
-          "path": "agent/panel",
+          "path": "agent/panel/panel",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "代理中心"
           }
         },
         {
-          "path": "agent/agreement",
+          "path": "agent/agreement/agreement",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "代理协议"
           }
         },
         {
-          "path": "agent/order",
+          "path": "agent/order/order",
           "style": {
-            "navigationBarTextStyle": "white",
+            "navigationBarTextStyle": "black",
             "navigationBarTitleText": "推广订单"
           }
         },
         {
-          "path": "agent/myStore",
+          "path": "agent/myStore/myStore",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "我的店铺"
           }
         },
         {
-          "path": "agent/storeSetting",
+          "path": "agent/storeSetting/storeSetting",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "店铺设置"
           }
         },
         {
-          "path": "agent/team",
+          "path": "agent/team/team",
           "style": {
-            "navigationBarTextStyle": "white",
+            "navigationBarTextStyle": "black",
             "navigationBarTitleText": "我的团队"
           }
         },
         {
-          "path": "agent/commissionDetails",
+          "path": "agent/commissionDetails/commissionDetails",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "佣金明细"
           }
         },
         {
-          "path": "agent/rankings",
+          "path": "agent/rankings/rankings",
           "style": {
-            "navigationBarTextStyle": "white",
+            "navigationBarTextStyle": "black",
             "navigationBarTitleText": "代理排行"
           }
         },
         {
-          "path": "distribution/shareLog",
+          "path": "agent/shareLog/shareLog",
           "style": {
-            "navigationBarTextStyle": "white",
+            "navigationBarTextStyle": "black",
             "navigationBarTitleText": "分享记录"
           }
         },
@@ -654,14 +631,14 @@
           }
         },
         {
-          "path": "serviceOrder/index",
+          "path": "serviceOrder/index/index",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "我的服务卡"
           }
         },
         {
-          "path": "serviceOrder/details",
+          "path": "serviceOrder/details/details",
           "style": {
             "navigationBarTextStyle": "black",
             "navigationBarTitleText": "服务卡详情"
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.scss b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.scss
new file mode 100644
index 0000000000000000000000000000000000000000..7089f0772a9a0dc3bb290787845b2004a3cbba75
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.scss
@@ -0,0 +1,3 @@
+.coreshop-good-footer-fixed .tabbar .btn-group { width: 50%; padding: 10rpx;
+    button { padding: 0rpx; flex: 1; margin: 0rpx; max-width: none; }
+}
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 ccb6c30e10c79f5e2e077be77953feca5c795628..514188f3d871f398f8aaf3d9d164efba342aca84 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
@@ -1,13 +1,13 @@
 <template>
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <view class="nav-back">
+        <view class="coreshop-full-screen-nav-back">
             <view class="back-btn" @click="toBackBtn()">
-                <image class="icon" src="/static/images/common/back-black.png" mode=""></image>
+                <u-icon name="arrow-left" size="40" top="12"></u-icon>
             </view>
         </view>
         <!--幻灯片-->
-        <view class="coreshop-banner-swiper-box">
+        <view class="coreshop-full-screen-banner-swiper-box">
             <swiper class="screen-swiper" circular autoplay @change="bannerSwiper">
                 <swiper-item v-for="(item,index) in goodsInfo.album" :key="index" @click="clickImg(item)">
                     <u-image width="100%" height="750rpx" :src="item">
@@ -16,173 +16,140 @@
                 </swiper-item>
             </swiper>
             <!--页码-->
-            <text class="tag bg-grey round sm coreshop-page">{{bannerCur + 1}} / {{goodsInfo.album.length}}</text>
+            <text class="coreshop-bg-grey tag round coreshop-page">{{bannerCur + 1}} / {{goodsInfo.album.length}}</text>
         </view>
 
-
         <!--限时秒杀-->
-        <view class="coreshop-limited-seckill-box  bg-orange">
-            <text class="text-price text-xxl">{{ product.price || '0.00' }}</text>
-            <view class="text-xs coreshop-cost-price-num price-4">
+        <view class="coreshop-limited-seckill-box coreshop-bg-orange">
+            <text class="coreshop-text-price u-font-40">{{ product.price || '0.00' }}</text>
+            <view class="u-font-xs coreshop-cost-price-num price-4">
                 <view>已售{{ goodsInfo.buyCount || '0' }}件/剩余{{ product.stock || '0' }}件</view>
                 <view>累计销售{{ goodsInfo.buyCount || '0' }}件</view>
             </view>
-            <view class="text-right coreshop-time-right">
+            <view class="u-text-right coreshop-time-right">
                 <view>距结束仅剩</view>
-                <view class="text-xs u-margin-top-10">
+                <view class="u-font-xs u-margin-top-10">
                     <u-count-down :timestamp="goodsInfo.groupTimestamp" separator="zh" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true" font-size="24" separator-size="24"></u-count-down>
                 </view>
             </view>
-            <view class="text-right coreshop-share-right">
+            <view class="u-text-right coreshop-share-right">
                 <u-icon name="share" @click="goShare()" label="分享" size="40" label-size="22" label-color="#fff" label-pos="bottom"></u-icon>
             </view>
         </view>
 
 
         <!--标题-->
-        <view class="bg-white coreshop-view-box coreshop-title-view-box">
+        <view class="coreshop-bg-white coreshop-common-view-box coreshop-good-title-view-box">
             <view class="title-view">
-                <text class="cu-tag bg-red radius sm" v-if="goodsInfo.brand">{{goodsInfo.brand.name}}</text>
-                <text class="text-black text-lg text-bold">{{ goodsInfo.name || '' }}</text>
+                <u-tag :text="goodsInfo.brand.name" type="error"  mode="dark" v-if="goodsInfo.brand" size="mini"/>
+                <text class="coreshop-text-black u-font-lg coreshop-text-bold">{{ goodsInfo.name || '' }}</text>
             </view>
-            <view class="light bg-orange radius margin-top-sm coreshop-title-tip-box">
-                <view>
-                    <text class="text-sm">{{ goodsInfo.brief || '' }}</text>
-                </view>
+            <view class="light coreshop-bg-orange radius u-margin-top-20 coreshop-title-tip-box">
+                <text class="u-font-sm">{{ goodsInfo.brief || '' }}</text>
             </view>
         </view>
 
-        <!--促销（团购秒杀本就是促销的一种，所以没必要显示）-->
-        <!--<view class="margin-top bg-white coreshop-view-box coreshop-promotion-view-box" v-if="promotion.length > 0" @tap="promotionTap">
-            <view class="flex flex-wrap text-sm" @tap="promotionTap">
-                <view class="basis-1">
-                    <text class="text-gray">促销</text>
-                </view>
-                <view class="basis-7">
-                    <view v-for="(item, index) in promotion" :key="index" :class="index> 1 ? 'u-margin-top-10':''">
-                        <text class="cu-tag line-orange sm radius">{{item.name}}</text>
-                    </view>
-                </view>
-                <view class="basis-2">
-                    <view class="text-gray text-right icon-view">
-                        <text class="cuIcon-right icon" />
-                    </view>
+         <!--服务-->
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box" @tap="serviceTap" v-if="serviceDescription.service.length>0">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">服务</text>
                 </view>
-            </view>
-        </view>-->
-        <!--服务-->
-        <!--服务-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-service-view-box" @tap="serviceTap" v-if="serviceDescription.service.length>0">
-            <view class="flex flex-wrap text-sm">
-                <view class="basis-1">
-                    <text class="text-gray">服务</text>
-                </view>
-                <view class="basis-7">
+                <view class="coreshop-basis-7">
                     <view class="tag-view-box">
-                        <text class="cu-tag bg-white tag-view" v-for="(item, index) in serviceDescription.service" :key="index">
-                            <text class="cuIcon-roundcheck text-red" />
-                            <text class="margin-left-xs">{{item.title}}</text>
-                        </text>
+                        <u-icon name="checkmark-circle" size="20" label-size="24" color="#e54d42" :label="item.title"  v-for="(item, index) in serviceDescription.service" :key="index" class="u-margin-right-10"></u-icon>
                     </view>
                 </view>
-                <view class="basis-2">
-                    <view class="text-gray text-right icon-view">
-                        <text class="cuIcon-right icon" />
+                <view class="coreshop-basis-2">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right-double"></u-icon>
                     </view>
                 </view>
             </view>
         </view>
 
-
         <!--发货/规格-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-select-view-box">
-            <view class="flex flex-wrap text-sm" v-if="serviceDescription.delivery.length>0">
-                <view class="basis-1">
-                    <text class="text-gray">发货</text>
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box" v-if="serviceDescription.delivery.length>0">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">发货</text>
                 </view>
-                <view class="basis-9" v-for="(item, index) in serviceDescription.delivery" :key="index">
-                    <text class="text-sm">{{item.description}}</text>
+                <view class="coreshop-coreshop-basis-9" v-for="(item, index) in serviceDescription.delivery" :key="index">
+                    <text class="u-font-sm">{{item.description}}</text>
                 </view>
             </view>
-
-            <view class="coreshop-border-view" v-if="serviceDescription.delivery.length>0" />
-
-            <view class="flex flex-wrap text-sm" @tap="selectTap()" v-if="isSpes">
-                <view class="basis-1">
-                    <text class="text-gray">规格</text>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" v-if="serviceDescription.delivery.length>0" />
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-top-20" @tap="selectTap(0)" v-if="isSpes">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">规格</text>
                 </view>
-                <view class="basis-8">
-                    <text class="text-sm">{{ product.spesDesc || ''}}</text>
+                <view class="coreshop-basis-8">
+                    <text class="u-font-sm">{{ product.spesDesc || ''}}</text>
                 </view>
-                <view class="basis-1">
-                    <view class="text-gray text-right">
-                        <text class="cuIcon-right icon" />
+                <view class="coreshop-basis-1">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right-double"></u-icon>
                     </view>
                 </view>
             </view>
         </view>
 
         <!--评论-->
-        <view class="margin-top bg-white coreshop-comment-view-box" v-if="goodsComments.length">
-            <view class="cu-bar bg-white">
-                <view class="action">
-                    <text class="text-black text-df">评价（{{goodsComments.length}}）</text>
-                </view>
-                <view class="action">
-                    <view class="text-sm">
-                        <text class="cuIcon-right icon margin-left-xs" @tap="goGoodComments(goodsInfo.id)" />
+        <view class="u-margin-top-20 coreshop-bg-white  u-padding-left-20 u-padding-right-20 u-padding-bottom-20" v-if="goodsComments.length">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-top-20">
+                <view class="coreshop-basis-2">
+                    <text class="coreshop-text-black u-font-md">评价（{{goodsComments.length}}）</text>
+                </view>
+                <view class="coreshop-basis-7"></view>
+                <view class="coreshop-basis-1">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right"  @tap="goGoodComments(goodsInfo.id)"></u-icon>
                     </view>
                 </view>
             </view>
             <view v-for="(item, index) in goodsComments" :key="index">
-                <view class="coreshop-border-view" />
-                <view class="coreshop-view-box">
-                    <view class="flex flex-wrap text-sm">
-                        <view class="basis-1">
-                            <view class="cu-avatar sm round" :style="[{backgroundImage:'url('+ item.avatarImage +')'}]" />
-                        </view>
-                        <view class="basis-9 text-sm">
-                            <view>{{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }}</view>
-                            <view class="margin-top-xs">{{ item.contentBody || ''}}</view>
-                            <view class="text-gray margin-top-sm">
-                                <u-rate :current="item.score" :disabled="true" size="26"></u-rate>
-                            </view>
-                            <view class="text-gray margin-top-sm">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
+                <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+                <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-20">
+                    <view class="coreshop-basis-1">
+                        <view class="coreshop-avatar sm round" :style="[{backgroundImage:'url('+ item.avatarImage +')'}]" />
+                    </view>
+                    <view class="coreshop-basis-9 u-font-sm">
+                        <view>{{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }}</view>
+                        <view class="u-margin-top-20">{{ item.contentBody || ''}}</view>
+                        <view class="coreshop-text-gray u-margin-top-10">
+                            <u-rate :current="item.score" :disabled="true" size="26"></u-rate>
                         </view>
+                        <view class="coreshop-text-gray u-margin-top-10">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
                     </view>
                 </view>
             </view>
         </view>
 
         <!--内容区-->
-        <view class="margin-top bg-white coreshop-details-view-box">
-            <view class="text-df title-view">
-                <text class="cuIcon-titles text-red" />
-                <text class="text-black">商品详情</text>
+        <view class="u-margin-top-20 u-padding-top-10 coreshop-bg-white">
+            <view class="u-font-md u-padding-top-10 u-padding-bottom-10 u-padding-left-20 u-padding-right-10">
+                <u-icon name="more-circle" color="#e54d42"></u-icon>
+                <text class="u-margin-left-10 coreshop-text-black">商品详情</text>
             </view>
             <!--参数-->
             <view class="grid col-2">
                 <view class="col-item" v-for="(item, index) in goodsParams" :key="index">
-                    <text class="text-gray">{{ item.name || ''}}：</text>
-                    <text class="text-black">{{ item.value || ''}}</text>
+                    <text class="coreshop-text-gray">{{ item.name || ''}}：</text>
+                    <text class="coreshop-text-black">{{ item.value || ''}}</text>
                 </view>
             </view>
-            <!--<view class="text-cut col-item">
-                <text class="text-gray">详细信息：</text>
-                <text class="text-black">有发票，有配件，有包装</text>
-            </view>-->
             <view class="u-padding-top-10">
                 <u-parse :html="goodsInfo.intro" :selectable="true" v-if="goodsInfo.intro"></u-parse>
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="详情为空" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="详情为空" mode="list"></u-empty>
                 </view>
             </view>
         </view>
 
         <!-- 分享弹窗 -->
         <view class="u-padding-10">
-            <lvv-popup position="bottom" ref="share">
+            <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 -->
@@ -198,63 +165,63 @@
                 <!-- #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 -->
-            </lvv-popup>
+            </u-popup>
         </view>
 
-
         <!--常见问题-->
-        <view class="margin-top bg-white margin-bottom coreshop-view-box coreshop-goods-help-view-box">
-            <view class="text-black text-lg margin-bottom-sm">常见说明</view>
+        <view class="u-margin-top-20 coreshop-bg-white u-margin-bottom-30 coreshop-common-view-box">
+            <view class="u-font-md u-padding-bottom-20">
+                <u-icon name="question-circle" color="#e54d42"></u-icon>
+                <text class="u-margin-left-10 coreshop-text-black">常见说明</text>
+            </view>
 
-            <view class="flex flex-wrap margin-bottom" v-for="(item, index) in serviceDescription.commonQuestion" :key="index">
-                <view class="basis-2">
-                    <text class="cu-tag bg-grey radius sm">{{item.title}}</text>
+            <view class="coreshop-flex coreshop-flex-wrap u-margin-bottom-20" v-for="(item, index) in serviceDescription.commonQuestion" :key="index">
+                <view class="coreshop-basis-2">
+                    <u-tag :text="item.title" type="info" size="mini" />
                 </view>
-                <view class="basis-8">
-                    <view class="text-sm">{{item.description}}</view>
+                <view class="coreshop-basis-8">
+                    <view class="u-font-sm">{{item.description}}</view>
                 </view>
             </view>
 
-            <view class="coreshop-border-view" />
-            <view class="text-center text-blue" @tap="goArticleList()">查看更多问题</view>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+            <view class="u-text-center coreshop-text-blue  u-padding-top-20" @tap="goArticleList()">查看更多问题</view>
         </view>
-
-
+        
         <!--商家及推荐-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-goods-info-view-box">
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box coreshop-goods-shop-info-view-box">
             <view class="coreshop-shop-view">
-                <view class="cu-avatar lg round" :style="[{backgroundImage:'url('+ shopLogo +')'}]" />
-                <view class="text-view">
-                    <view class="margin-bottom-xs">{{shopName}}</view>
-                    <view class="text-sm text-cut">{{shareTitle}}</view>
+                <view class="u-absolute">
+                     <u-avatar :src="shopLogo"></u-avatar>
+                </view>
+                <view class="u-margin-left-20 u-padding-left-80 u-padding-right-80">
+                    <view class="u-margin-bottom-10">{{shopName}}</view>
+                    <view class="u-font-sm u-line-1">{{shareTitle}}</view>
                 </view>
-                <button class="cu-btn radius sm line-red" @tap="doPhoneCall">联系商家</button>
+                <u-button type="error" size="mini" :plain="true" @click="doPhoneCall">联系商家</u-button>
             </view>
-            <view class="coreshop-border-view" />
-            <view class="live-tag-view">
+            <view class="coreshop-solid-bottom u-padding-top-10 u-padding-bottom-20" />
+            <view class="live-tag-view u-margin-top-20 u-margin-bottom-20">
                 <view class="text-view">
-                    <text class="cu-tag bg-orange radius sm">
-                        <text class="cuIcon-title" />
-                        <text>已定位</text>
-                    </text>
-                    <text class="margin-left-xs text-cut">可直接获取商家地理位置信息</text>
+                    <u-tag text="已定位" mode="plain" size="mini" type="warning" />
+                    <text class="u-margin-left-10 u-line-1">可直接获取商家地理位置信息</text>
                 </view>
-                <view class="text-sm text-red text-right-view" @tap="goShopMap">
-                    <text class="margin-right-xs">去地图</text>
-                    <text class="cuIcon-right" />
+                <view class="u-font-sm coreshop-text-red go-map-box" @tap="goShopMap">
+                    <text class="u-margin-right-10">去地图</text>
+                    <u-icon name="arrow-right"></u-icon>
                 </view>
             </view>
-            <view class="coreshop-border-view" />
-            <view class="coreshop-recommend-list-box">
-                <view class="text-sm">本店推荐</view>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+            <view class="coreshop-good-shop-recommend-list-box">
+                <view class="u-font-sm u-padding-top-20 ">本店推荐</view>
                 <!--滑动列表-->
                 <view class="recommend-scroll-box">
                     <scroll-view class="recommend-scroll" scroll-x>
                         <block v-for="(items,indexs) in shopRecommendData" :key="indexs">
                             <view :id="['scroll' + (indexs + 1 )]" class="recommend-scroll-item" @tap="goGoodsDetail(items.id)">
-                                <view class="cu-avatar xl radius" :style="[{backgroundImage:'url('+ items.image +')'}]" />
-                                <view class="text-cut-2 text-sm text-black margin-tb-sm u-line-2" style="height:64rpx;">{{items.name}}</view>
-                                <view class="text-red text-price margin-tb-sm text-df">
+                                <view class="coreshop-avatar xl radius" :style="[{backgroundImage:'url('+ items.image +')'}]" />
+                                <view class="u-line-1-2 u-font-sm coreshop-text-black u-margin-top-20 u-margin-bottom-20 u-line-2" style="height: 64rpx;">{{items.name}}</view>
+                                <view class="coreshop-text-red coreshop-text-price u-margin-top-20 u-margin-bottom-20 u-font-md">
                                     {{items.price}}元
                                 </view>
                             </view>
@@ -263,98 +230,90 @@
                 </view>
             </view>
         </view>
-
-
-        <!--其他推荐-->
-        <view class="margin-top coreshop-view-box coreshop-recommend-list-view-box">
-            <view class="flex flex-wrap">
-                <view class="basis-sm text-right">
-                    <image class="img-aau" src="/static/images/common/aau.png" lazy-load mode="widthFix" />
+        
+         <!--为您推荐-->
+        <view class="coreshop-recommended-title-view">
+            <view class="u-flex u-flex-wrap">
+                <view class="u-flex-4 u-text-right">
+                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
-                <view class="basis-xs text-center">
-                    <text class="text-black text-lg">其他推荐</text>
+                <view class="u-flex-4 u-text-center">
+                    <text class="coreshop-text-black u-font-lg">为您推荐</text>
                 </view>
-                <view class="basis-sm text-left">
-                    <image class="img-aau" src="/static/images/common/aau.png" lazy-load mode="widthFix" />
+                <view class="u-flex-4 u-text-left">
+                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
             </view>
+        </view>
 
-            <view class="margin-bottom coreshop-goods-list-box">
-                <view class="grid col-2">
-                    <block v-for="(items,indexs) in otherRecommendData" :key="indexs">
-                        <view class="list-itme" @click="goGoodsDetail(items.id)">
-                            <view class="bg-white list-radius">
-                                <view class="goods-img">
-                                    <view class="cu-avatar" :style="[{backgroundImage:'url('+ items.image +')'}]" />
-                                    <view class="mold-view" v-if="items.mold">
-                                        <text class="cu-tag radius sm bg-orange">自营</text>
-                                    </view>
-                                </view>
-                                <view class="view-goods-info">
-                                    <view class="text-cut text-black text-sm margin-bottom-sm">{{items.name}}</view>
-                                    <view class="text-price text-red text-lg">
-                                        {{items.price}}元  <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{items.mktprice}}元</span>
-                                    </view>
-                                </view>
-                            </view>
+         <!--推荐列表-->
+        <view class="coreshop-goods-group" v-if="otherRecommendData.length>0">
+            <u-grid col="2" :border="false" :align="center">
+                <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in otherRecommendData" :key="index" @click="goGoodsDetail(item.id)">
+                    <view class="good_box">
+                        <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
+                        <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
+                        <view class="good_title u-line-2">
+                            {{item.name}}
                         </view>
-                    </block>
-                </view>
-            </view>
+                        <view class="good-price">
+                            {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
+                        </view>
+                        <view class="good-tag-recommend" v-if="item.isRecommend">
+                            推荐
+                        </view>
+                        <view class="good-tag-hot" v-if="item.isHot">
+                            热门
+                        </view>
+                    </view>
+                </u-grid-item>
+            </u-grid>
         </view>
 
 
-
-
-        <view class="cu-modal bottom-modal coreshop-bottom-modal-box" :class="bottomModal?'show':''">
-            <view class="cu-dialog bg-white">
+        <u-popup class="coreshop-bottom-popup-box"  v-model="bottomModal" mode="bottom">
+            <view class="radius coreshop-bg-white">
                 <!--标题-->
-                <view class="text-black text-center margin-tb text-lg coreshop-title-bar">
+                <view class="coreshop-text-black u-text-center u-margin-top-30 u-margin-bottom-30 u-font-lg coreshop-title-bar">
                     <text>{{modalTitle}}</text>
-                    <text class="cuIcon-close close-icon" @tap="hideModal"></text>
+                    <u-icon name="close"  @tap="hideModal" class="close-icon"></u-icon>
                 </view>
-
                 <!--内容区域-->
                 <view class="coreshop-modal-content">
-
                     <!--服务区域-->
-                    <view class="coreshop-view-box service" v-if="modalType=='service'">
+                    <view class="coreshop-common-view-box service" v-if="modalType=='service'">
                         <view v-for="(item, index) in serviceDescription.service" :key="index">
                             <view class="text-view">
-                                <text class="cuIcon-title text-red" />
-                                <text class="text-cut text-black">{{item.title}}</text>
+                                <u-icon name="more-circle" color="#e54d42" :label="item.title"></u-icon>
                             </view>
-                            <view class="text-sm text-list-view">
-                                <view class="margin-left text-cut text-gray">{{item.description}}</view>
+                            <view class="u-font-sm text-list-view">
+                                <view class="u-margin-left-20 coreshop-text-gray">{{item.description}}</view>
                             </view>
                         </view>
                     </view>
 
                     <!--促销区域-->
-                    <view class="coreshop-view-box promotion" v-if="modalType=='promotion'">
+                    <view class="coreshop-common-view-box promotion" v-if="modalType=='promotion'">
                         <view class="text-view" v-for="(item, index) in promotion" :key="index">
                             <text class="cu-tag line-orange radius sm">{{item.name}}</text>
-                            <text class="margin-left-xs text-cut text-black">{{item.name}}</text>
+                            <text class="u-margin-left-20 u-line-5 coreshop-text-black">{{item.name}}</text>
                         </view>
                     </view>
 
                     <!--选择规格-->
-                    <view class="coreshop-view-box select hide" :class="modalType=='select' ?'show':''">
+                    <view class="coreshop-common-view-box select hide" :class="modalType=='select' ?'show':''">
                         <!--商品信息-->
-                        <view class="cu-list menu-avatar">
-                            <view class="cu-item">
-                                <view class="cu-avatar radius lg" :style="[{backgroundImage:'url('+ product.images +')'}] " />
+                        <view class="coreshop-list menu-avatar">
+                            <view class="coreshop-list-item">
+                                <view class="coreshop-avatar radius lg" :style="[{backgroundImage:'url('+ product.images +')'}] " />
                                 <view class="content">
-                                    <view class="text-price-view">
-                                        <text class="text-price text-red margin-right-xs">{{ product.price || ''}}</text>
-                                        <text class="text-sm text-gray text-through">￥{{ product.mktprice || ''}}</text>
-                                        <text class="cu-tag bg-gradual-red radius sm">
-                                            <text class="cuIcon-hotfill" />
-                                            <text>秒杀中</text>
-                                        </text>
+                                    <view class="coreshop-text-price-view">
+                                        <text class="coreshop-text-price coreshop-text-red u-margin-right-20">{{ product.price || ''}}</text>
+                                        <text class="u-font-sm coreshop-text-gray coreshop-text-through u-margin-right-20">￥{{ product.mktprice || ''}}</text>
+                                        <u-tag text="秒杀中" mode="plain" type="error" shape="circle" size="mini"/>
                                     </view>
-                                    <view class="text-black text-sm flex">
-                                        <view class="text-cut">已选: {{ product.spesDesc || '无'}}</view>
+                                    <view class="coreshop-text-black u-font-sm flex">
+                                        <view class="u-line-1">已选: {{ product.spesDesc || '无'}}</view>
                                     </view>
                                 </view>
                             </view>
@@ -363,7 +322,7 @@
                         <view class="coreshop-select-btn-list-box">
                             <spec :spesData="defaultSpesDesc" ref="spec" @changeSpes="changeSpes"></spec>
                             <view class="select-item">
-                                <view class="text-black">数量</view>
+                                <view class="coreshop-text-black">数量</view>
                                 <view class="select-btn">
                                     <u-number-box v-model="buyNum" :min="minNums" :max="product.stock"></u-number-box>
                                 </view>
@@ -372,96 +331,73 @@
                     </view>
 
                     <!--公共按钮-->
-                    <view class="coreshop-modal-footer-fixed" v-if="modalType=='select'">
-                        <view class="flex flex-direction">
-                            <u-button type="error" size="medium" hover-class="btn-hover2" @click="clickHandle()" :disabled='submitStatus' :loading='submitStatus' v-if="product.stock>0">确定</u-button>
-                            <u-button type="default" size="medium" v-else>已售罄</u-button>
-                        </view>
+                    <view class="u-padding-30 u-text-center" v-if="modalType=='select'">
+                        <u-button type="error" :custom-style="customStyle" size="medium"  @click="clickHandle()" :disabled='submitStatus' :loading='submitStatus' v-if="product.stock>0" shape="circle">确定</u-button>
+                        <u-button type="default" size="medium" v-else>已售罄</u-button>
                     </view>
                 </view>
             </view>
-        </view>
+        </u-popup>
         <!--占位底部距离-->
-        <view class="cu-tabbar-height" />
+        <view class="coreshop-tabbar-height" />
         <!--底部操作-->
-        <view class="coreshop-footer-fixed">
-            <view class="cu-bar bg-white tabbar border shop">
-                <!-- 客服按钮 -->
+        <view class="coreshop-good-footer-fixed">
+            <view class="tabbar">
+                 <!-- 客服按钮 -->
                 <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-                <view class="action" @click="showChat()">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
+                <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 -->
-                <button class="action" hover-class="none" open-type="contact" bindcontact="showChat" :session-from="kefupara">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
-                </button>
-                <!-- #endif -->
-                <!-- #ifdef MP-ALIPAY -->
-                <view class="action">
-                    <contact-button class="goods-bottom-ic icon" icon="/static/images/customerservice.png" size="80rpx*80rpx" tnt-inst-id="WKPKUZXG" scene="SCE00040186" hover-class="none" />
+                <view class="action" >
+                    <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
                 </view>
                 <!-- #endif -->
-                <!-- #ifdef MP-TOUTIAO -->
-                <view class="action" @click="showChat()">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
+                <view class="action"  @click="collection">
+                    <u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
                 </view>
-                <!-- #endif -->
-                <button class="action" @click="collection">
-                    <view :class="isfav ? 'cuIcon-favorfill':'cuIcon-favor'" />
-                    <view v-if="!isfav">收藏</view>
-                    <view v-if="isfav">已收藏</view>
-                </button>
                 <view class="action" @click="redirectCart">
-                    <view class="cuIcon-cart">
-                        <view class="cu-tag badge" v-if="cartNums">{{cartNums}}</view>
-                    </view>
-                    <text>购物车</text>
+                    <u-badge class="car-num" :count="cartNums?cartNums:0" type="error" :offset="[-3, -6]"></u-badge>
+				    <u-icon name="shopping-cart" :size="40"  label="购物车" :label-size="22" label-pos="bottom"></u-icon>
                 </view>
-                <view class="btn-group">
-                    <button class="cu-btn bg-orange radius shadow-blur  y-f buyBtn" @tap="selectTap()">立即{{ typeName || '' }}</button>
+                <view class="btn-box">
+                    <u-button type="error" :custom-style="customStyle" size="medium" @click="selectTap()" shape="circle" class="coreshop-bg-orange">立即{{ typeName || '' }}</u-button>
                 </view>
             </view>
         </view>
 
         <!-- 右边浮动球 -->
-        <corecms-fab horizontal="right" vertical="bottom" direction="vertical"></corecms-fab>
+        <coreshop-fab horizontal="right" vertical="bottom" direction="vertical"></coreshop-fab>
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
 
     </view>
 </template>
 <script>
     import { mapMutations, mapActions, mapState } from 'vuex';
-    import lvvPopup from '@/components/corecms-lvv-popup/corecms-lvv-popup.vue';
-    import corecmsFab from '@/components/corecms-fab/corecms-fab.vue';
-    import { get } from '@/common/utils/dbHelper.js';
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js';
+    import coreshopFab from '@/components/coreshop-fab/coreshop-fab.vue';
     import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js'
-    import spec from '@/components/corecms-spec/corecms-spec.vue';
+    import spec from '@/components/coreshop-spec/coreshop-spec.vue';
     // #ifdef H5
-    import shareByH5 from '@/components/corecms-share/shareByh5.vue';
+    import shareByH5 from '@/components/coreshop-share/shareByh5.vue';
     // #endif
     // #ifdef MP-WEIXIN
-    import shareByWx from '@/components/corecms-share/shareByWx.vue';
+    import shareByWx from '@/components/coreshop-share/shareByWx.vue';
     // #endif
     // #ifdef MP-TOUTIAO
-    import shareByTt from '@/components/corecms-share/shareByTt.vue';
+    import shareByTt from '@/components/coreshop-share/shareByTt.vue';
     // #endif
     // #ifdef MP-ALIPAY
-    import shareByAli from '@/components/corecms-share/shareByAli.vue';
+    import shareByAli from '@/components/coreshop-share/shareByAli.vue';
     // #endif
     // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import shareByApp from '@/components/corecms-share/shareByApp.vue';
+    import shareByApp from '@/components/coreshop-share/shareByApp.vue';
     // #endif
     export default {
         mixins: [goods, articles, commonUse, tools],
         components: {
-            lvvPopup,
-            corecmsFab,
+            coreshopFab,
             spec,
             // #ifdef H5
             shareByH5,
@@ -481,6 +417,9 @@
         },
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 bannerCur: 0,
                 current: 0, // init tab位
                 goodsId: 0, // 商品id
@@ -509,6 +448,7 @@
                 modalType: 'promotion',
                 selectType: '',
                 shareUrl: '/pages/share/jump/jump',
+                shareBox: false,
                 serviceDescription: {
                     commonQuestion: [],
                     delivery: [],
@@ -592,10 +532,10 @@
                 let pages = getCurrentPages();
                 let page = pages[pages.length - 1];
                 // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
-                return apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
                 // #endif
                 // #ifdef MP-ALIPAY
-                return apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
                 // #endif
             },
             defaultSpesDesc() {
@@ -626,7 +566,7 @@
                     groupId: this.groupId
                 };
                 // 如果用户已经登录 要传用户token
-                let userToken = get('userToken');
+                let userToken = this.$db.get('userToken');
                 if (userToken) {
                     data['token'] = userToken;
                 }
@@ -853,10 +793,10 @@
             },
             // 跳转到h5分享页面
             goShare() {
-                this.$refs.share.show();
+                this.shareBox = true;
             },
             closeShare() {
-                this.$refs.share.close();
+                this.shareBox = false;
             },
             // 图片点击放大
             clickImg(imgs) {
@@ -977,7 +917,6 @@
         },
     };
 </script>
-<style lang="scss">
-    @import '../../../../static/style/goodDetails.scss';
-    .buyBtn { height: 74rpx; width: 90%; }
+<style lang="scss" scoped>
+    @import "details.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.scss
new file mode 100644
index 0000000000000000000000000000000000000000..7557a7c8b050e2aa1b46fd7d550070019e379e97
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.scss
@@ -0,0 +1,11 @@
+.goods-item { margin-bottom: 2rpx;
+    .cu-progress { width: 225rpx; }
+    .progress-text { color: #999999; font-size: 20rpx; margin-left: 25rpx; }
+    .buy-btn { position: absolute; right: 0; bottom: -20rpx; }
+    .btn-ing { background: linear-gradient(45deg,#f43f3b,#ed1c24); box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); color: #ffffff; }
+}
+    .goods-item .btn-end,
+    .goods-item .btn-nostart { background: #eeeeee; color: #999999; }
+.activity-goods-box {
+    .goods-right { width: 480rpx; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
index 21b33b927884e6731abe6e9f254e27a67e80bd71..0ca50a96a8d3d413d1cb14d0b693914aa93ecb22 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
@@ -1,46 +1,40 @@
 <template>
     <view class="pageBox">
         <u-navbar title="团购"></u-navbar>
-        <view class="content-box">
-            <view class="goods-item" v-for="item in goodsList" :key="item.id" v-if="goodsList.length>0">
-                <view class="activity-goods-box x-bc">
-                    <view class="img-box">
-                        <slot name="tag"></slot>
-                        <image class="img" :src="item.image" mode="aspectFill"></image>
-                    </view>
-                    <view class="goods-right y-bc">
-                        <view class="title u-line-1">{{ item.name }}</view>
-                        <view class="tip u-line-1">{{ item.brief }}</view>
-                        <view class="slod-end">
-
-                            <view class="x-f">
-                                <view class="cu-progress round sm">
-                                    <view class="progress--color" :style="[{ width: loading ? getProgress(item.buyPromotionCount, item.stock) : '' }]"></view>
-                                </view>
-                                <view class="progress-text">已抢{{ getProgress(item.buyPromotionCount, item.stock) }}</view>
-                            </view>
-
+        <view class="goods-item" v-for="item in goodsList" :key="item.id" v-if="goodsList.length>0">
+            <view class="activity-goods-box u-flex u-row-between">
+                <view class="img-box">
+                    <slot name="tag"></slot>
+                    <image class="img" :src="item.image" mode="aspectFill"></image>
+                </view>
+                <view class="goods-right u-flex u-row-between coreshop-flex-direction">
+                    <view class="title u-line-1">{{ item.name }}</view>
+                    <view class="tip u-line-1">{{ item.brief }}</view>
+                    <view class="slod-end">
+                        <view class="coreshop-flex coreshop-align-center">
+                            <u-line-progress :striped="true" :percent="getPercent(item.buyPromotionCount, item.stock)" :striped-active="true" :show-percent="true" class="cu-progress"></u-line-progress>
+                            <view class="progress-text">已抢{{ getProgress(item.buyPromotionCount, item.stock) }}</view>
                         </view>
-                        <view class=" price-box">
-                            <view class="x-f">
-                                <view class="current">￥{{ item.price }}</view>
-                                <view class="original">￥{{ item.mktprice }}</view>
-                            </view>
+                    </view>
+                    <view class="price-box">
+                        <view class="coreshop-flex coreshop-align-center">
+                            <view class="current">￥{{ item.price }}</view>
+                            <view class="original">￥{{ item.mktprice }}</view>
                         </view>
-                        <button class="cu-btn buy-btn" :class="btnType[tabCurrent].color" v-if="tabCurrent=='ing'" @click="goGroupBuyingDetail(item.id, item.groupId)">{{ btnType[tabCurrent].name }}</button>
-                        <button class="cu-btn buy-btn" :class="btnType[tabCurrent].color" v-else>{{ btnType[tabCurrent].name }}</button>
                     </view>
+                    <u-button type="error" class="buy-btn" size="mini" v-if="tabCurrent=='ing'" @click="goGroupBuyingDetail(item.id, item.groupId)">{{ btnType[tabCurrent].name }}</u-button>
+                    <u-button type="error" class="buy-btn" size="mini" v-else>{{ btnType[tabCurrent].name }}</u-button>
                 </view>
             </view>
-            <!-- 无数据时默认显示 -->
-            <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="暂无团购信息" mode="list"></u-empty>
-            </view>
-            <!-- 加载更多 -->
-            <u-loadmore :status="loadStatus" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
         </view>
+        <!-- 无数据时默认显示 -->
+        <view class="coreshop-emptybox" v-else>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="暂无团购信息" mode="list"></u-empty>
+        </view>
+        <!-- 加载更多 -->
+        <u-loadmore :status="loadStatus" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
@@ -77,7 +71,7 @@
                         name: '已结束',
                         color: 'btn-end',
                     },
-                }
+                },
             };
         },
         onLoad() {
@@ -101,6 +95,16 @@
                 }
                 return unit;
             },
+            // 进度数
+            getPercent(sales, stock) {
+                let unit = 0;
+                if (stock + sales > 0) {
+                    let num = (sales / (sales + stock)) * 100;
+                } else {
+                    unit = 30;
+                }
+                return unit;
+            },
             // 秒杀列表
             getGoodsList() {
                 let _this = this;
@@ -135,20 +139,5 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../../../static/style/pinTuan.scss';
-    .tab-box .tab-item { flex: 1; line-height: 84rpx; text-align: center; background: #636363; color: #fff; font-size: 28rpx; font-family: PingFang SC; font-weight: 500; color: #ffffff; position: relative; border-right: 1rpx solid #fff; }
-        .tab-box .tab-item .tab-triangle { position: absolute; z-index: 2; bottom: -14rpx; left: 50%; transform: translateX(-50%); width: 28rpx; height: 28rpx; background: #e54d42; transform: rotate(45deg); transform-origin: center; }
-    .tab-box .tab-active { background: #e54d42; }
-    .goods-item { margin-bottom: 2rpx; }
-        .goods-item .cu-progress { width: 225rpx; height: 16rpx; }
-            .goods-item .cu-progress .progress--color { background: #e54d42; }
-        .goods-item .progress-text { color: #999999; font-size: 20rpx; margin-left: 25rpx; }
-        .goods-item .buy-btn { position: absolute; right: 0; bottom: -20rpx; width: 140rpx; height: 60rpx; border-radius: 30rpx; font-size: 26rpx; font-family: PingFang SC; font-weight: 400; padding: 0; }
-        .goods-item .btn-end,
-        .goods-item .btn-nostart { background: #eeeeee; color: #999999; }
-        .goods-item .btn-ing { background: linear-gradient(45deg,#f43f3b,#ed1c24); box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); color: #ffffff; }
-
-
-
-    .activity-goods-box .goods-right { width: 480rpx; }
+    @import "list.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.scss b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.scss
new file mode 100644
index 0000000000000000000000000000000000000000..8141ba1232d5cf60604c6e8ebdf36c9320e1ea47
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.scss
@@ -0,0 +1,36 @@
+
+.groupHeight { height: 122rpx !important; }
+
+.group-swiper-c { height: 242rpx; }
+    .group-swiper-c .swiper-item .coreshop-cell-item { height: 50%; }
+        .group-swiper-c .swiper-item .coreshop-cell-item .user-head-img { width: 80rpx; height: 80rpx; border-radius: 50%; }
+        .group-swiper-c .swiper-item .coreshop-cell-item .coreshop-cell-hd-title { max-width: 200rpx; width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex: 1; }
+        .group-swiper-c .swiper-item .coreshop-cell-item .coreshop-cell-item-bd { min-width: 150rpx; text-align: center; display: block; }
+            .group-swiper-c .swiper-item .coreshop-cell-item .coreshop-cell-item-bd .coreshop-cell-bd-view { margin-bottom: 0; }
+            .group-swiper-c .swiper-item .coreshop-cell-item .coreshop-cell-item-bd .coreshop-cell-bd-text { float: none; }
+    .group-swiper-c .commodity-day > text { background: none !important; padding: 0; }
+    .group-swiper-c .swiper-item .coreshop-cell-item .coreshop-cell-item-ft .btn { font-size: 26rpx; color: #fff; background-color: #ff7159; text-align: center; }
+
+
+.ig-top { text-align: center; background-color: #fff; padding: 20upx 26upx; width: 100%; height: 350rpx; background: #FFFFFF; position: absolute; left: 0; bottom: 0; }
+.ig-top-t,
+.ig-top-m { margin-bottom: 20upx; }
+    .ig-top-t > view { display: inline-block; padding: 0 10upx; color: #999; }
+.user-head-img-c { position: relative; width: 80upx; height: 80upx; border-radius: 50%; margin-right: 20upx; box-sizing: border-box; display: inline-block; border: 1px solid #f3f3f3; }
+.user-head-img-tip { position: absolute; top: -6upx; left: -10upx; display: inline-block; background-color: #FF7159; color: #fff; font-size: 22upx; z-index: 98; padding: 0 10upx; border-radius: 10upx; transform: scale(.8); }
+.user-head-img-c .user-head-img { width: 100%; height: 100%; border-radius: 50%; }
+.user-head-img-c:first-child { border: 1px solid #FF7159; }
+.uhihn { width: 80upx; height: 80upx; border-radius: 50%; display: inline-block; border: 2upx dashed #e1e1e1; text-align: center; color: #d1d1d1; font-size: 40upx; box-sizing: border-box; position: relative; }
+    .uhihn > text { position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); }
+.igtb-top { font-size: 32upx; color: #333; margin-bottom: 16upx; }
+.igtb-mid { margin-bottom: 16upx; }
+    .igtb-mid .coreshop-btn { width: 100%; background-color: #FF7159; color: #fff; }
+.igtb-bot { font-size: 24upx; color: #666; }
+.coreshop-cell-ft-text { max-width: 520upx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.group-notice .coreshop-cell-ft-text { color: #999; margin-left: 20upx; font-size: 26upx; }
+
+.coreshop-lower-shelf { }
+    .coreshop-lower-shelf .coreshop-cell-item-hd { opacity: 0.4; }
+    .coreshop-lower-shelf .coreshop-cell-item-bd { opacity: 0.4; }
+    .coreshop-lower-shelf .coreshop-cell-item-ft { opacity: 0.4; }
+    .coreshop-lower-shelf .coreshop-lower-box { position: absolute; height: calc(100% - 40rpx); width: calc(100% - 20rpx); background-color: rgba(0, 0, 0, 0.6); text-align: center; font-size: 28rpx; color: #dedede; -webkit-transition: left .15s; transition: left .15s; z-index: 999; -webkit-transition: all .15s; transition: all .15s; line-height: 80rpx; }
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 1d3910c70f99cd100c44546b8ca64da90b6d232d..05511471db400e5c30d24f919519ad00f6c772e1 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
@@ -1,13 +1,13 @@
 <template>
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <view class="nav-back">
+        <view class="coreshop-full-screen-nav-back">
             <view class="back-btn" @click="toBackBtn()">
-                <image class="icon" src="/static/images/common/back-black.png" mode=""></image>
+                <u-icon name="arrow-left" size="40" top="12"></u-icon>
             </view>
         </view>
         <!--幻灯片-->
-        <view class="coreshop-banner-swiper-box">
+        <view class="coreshop-full-screen-banner-swiper-box">
             <swiper class="screen-swiper" circular autoplay @change="bannerSwiper">
                 <swiper-item v-for="(item,index) in goodsInfo.album" :key="index" @click="clickImg(item)">
                     <u-image width="100%" height="750rpx" :src="item">
@@ -16,122 +16,95 @@
                 </swiper-item>
             </swiper>
             <!--页码-->
-            <text class="tag bg-grey round sm coreshop-page">{{bannerCur + 1}} / {{goodsInfo.album.length}}</text>
+            <text class="coreshop-bg-grey tag round coreshop-page">{{bannerCur + 1}} / {{goodsInfo.album.length}}</text>
         </view>
 
         <!--限时秒杀-->
-        <view class="coreshop-limited-seckill-box  bg-pink">
-            <!--<text class="text-price text-xxl">{{ goodsInfo.pinTuanPrice || '0.00' }}</text>-->
-            <text class="text-price text-xxl">{{ price || '0.00' }}</text>
-            <view class="text-xs coreshop-cost-price-num price-4">
-                <view class="linethrough">已售{{ goodsInfo.buyPinTuanCount || '0' }}件/剩余{{ product.stock || '0' }}件</view>
+        <view class="coreshop-limited-seckill-box coreshop-bg-pink">
+            <text class="coreshop-text-price u-font-40">{{ price || '0.00' }}</text>
+            <view class="u-font-xs coreshop-cost-price-num price-4">
+                <view class="coreshop-text-through">已售{{ goodsInfo.buyPinTuanCount || '0' }}件/剩余{{ product.stock || '0' }}件</view>
                 <view>累计销售{{ goodsInfo.buyCount || '0' }}件</view>
             </view>
-            <view class="text-right coreshop-time-right" v-if="goodsInfo.pinTuanRule.pinTuanStartStatus == 1">
+            <view class="u-text-right coreshop-time-right" v-if="goodsInfo.pinTuanRule.pinTuanStartStatus == 1">
                 <view>距结束仅剩</view>
-                <view class="text-xs u-margin-top-10">
+                <view class="u-font-xs u-margin-top-10">
                     <u-count-down :timestamp="goodsInfo.pinTuanRule.lastTime" separator="zh" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true" font-size="24" separator-size="24"></u-count-down>
                 </view>
             </view>
-            <view class="text-right coreshop-time-right" v-if="goodsInfo.pinTuanRule.pinTuanStartStatus == 2">
+            <view class="u-text-right coreshop-time-right" v-if="goodsInfo.pinTuanRule.pinTuanStartStatus == 2">
                 <view>即将开团</view>
-                <view class="text-xs u-margin-top-10">
+                <view class="u-font-xs u-margin-top-10">
                     <u-count-down :timestamp="goodsInfo.pinTuanRule.lastTime" separator="zh" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true" font-size="24" separator-size="24"></u-count-down>
                 </view>
             </view>
-            <view class="text-right coreshop-share-right">
+            <view class="u-text-right coreshop-share-right">
                 <u-icon name="share" @click="goShare()" label="分享" size="40" label-size="22" label-color="#fff" label-pos="bottom"></u-icon>
             </view>
         </view>
 
         <!--标题-->
-        <view class="bg-white coreshop-view-box coreshop-title-view-box">
+        <view class="coreshop-bg-white coreshop-common-view-box coreshop-good-title-view-box">
             <view class="title-view">
-                <text class="cu-tag bg-red radius sm" v-if="goodsInfo.brand">{{goodsInfo.brand.name}}</text>
-                <text class="text-black text-lg text-bold">{{ goodsInfo.name || '' }}</text>
+                <u-tag :text="goodsInfo.brand.name" type="error"  mode="dark" v-if="goodsInfo.brand" size="mini"/>
+                <text class="coreshop-text-black u-font-lg coreshop-text-bold">{{ goodsInfo.name || '' }}</text>
             </view>
-            <view class="light bg-pink radius margin-top-sm coreshop-title-tip-box">
-                <view>
-                    <text class="text-sm">{{ goodsInfo.brief || '' }}</text>
-                </view>
+            <view class="light coreshop-bg-pink radius u-margin-top-20 coreshop-title-tip-box">
+                <text class="u-font-sm">{{ goodsInfo.brief || '' }}</text>
             </view>
         </view>
 
-        <!--促销-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-promotion-view-box" v-if="promotion.length > 0" @tap="promotionTap">
-            <view class="flex flex-wrap text-sm" @tap="promotionTap">
-                <view class="basis-1">
-                    <text class="text-gray">促销</text>
-                </view>
-                <view class="basis-7">
-                    <view v-for="(item, index) in promotion" :key="index" :class="index> 1 ? 'u-margin-top-10':''">
-                        <text class="cu-tag line-orange sm radius">{{item.name}}</text>
-                    </view>
-                </view>
-                <view class="basis-2">
-                    <view class="text-gray text-right icon-view">
-                        <text class="cuIcon-right icon" />
-                    </view>
+         <!--服务-->
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box" @tap="serviceTap" v-if="serviceDescription.service.length>0">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">服务</text>
                 </view>
-            </view>
-        </view>
-
-        <!--服务-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-service-view-box" @tap="serviceTap" v-if="serviceDescription.service.length>0">
-            <view class="flex flex-wrap text-sm">
-                <view class="basis-1">
-                    <text class="text-gray">服务</text>
-                </view>
-                <view class="basis-7">
+                <view class="coreshop-basis-7">
                     <view class="tag-view-box">
-                        <text class="cu-tag bg-white tag-view" v-for="(item, index) in serviceDescription.service" :key="index">
-                            <text class="cuIcon-roundcheck text-red" />
-                            <text class="margin-left-xs">{{item.title}}</text>
-                        </text>
+                        <u-icon name="checkmark-circle" size="20" label-size="24" color="#e54d42" :label="item.title"  v-for="(item, index) in serviceDescription.service" :key="index" class="u-margin-right-10"></u-icon>
                     </view>
                 </view>
-                <view class="basis-2">
-                    <view class="text-gray text-right icon-view">
-                        <text class="cuIcon-right icon" />
+                <view class="coreshop-basis-2">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right-double"></u-icon>
                     </view>
                 </view>
             </view>
         </view>
 
         <!--发货/规格-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-select-view-box">
-            <view class="flex flex-wrap text-sm" v-if="serviceDescription.delivery.length>0">
-                <view class="basis-1">
-                    <text class="text-gray">发货</text>
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box" v-if="serviceDescription.delivery.length>0">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">发货</text>
                 </view>
-                <view class="basis-9" v-for="(item, index) in serviceDescription.delivery" :key="index">
-                    <text class="text-sm">{{item.description}}</text>
+                <view class="coreshop-coreshop-basis-9" v-for="(item, index) in serviceDescription.delivery" :key="index">
+                    <text class="u-font-sm">{{item.description}}</text>
                 </view>
             </view>
-
-            <view class="coreshop-border-view" v-if="serviceDescription.delivery.length>0" />
-
-            <view class="flex flex-wrap text-sm" v-if="isSpes">
-                <view class="basis-1">
-                    <text class="text-gray">规格</text>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" v-if="serviceDescription.delivery.length>0" />
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-top-20" v-if="isSpes">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">规格</text>
                 </view>
-                <view class="basis-8">
-                    <text class="text-sm">{{ product.spesDesc || ''}}</text>
+                <view class="coreshop-basis-8">
+                    <text class="u-font-sm">{{ product.spesDesc || ''}}</text>
+                </view>
+                <view class="coreshop-basis-1">
+                    <!--<view class="coreshop-text-gray u-text-right coreshop-justify-end"  @tap="selectTap(0)">
+                        <u-icon name="arrow-right-double"></u-icon>
+                    </view>-->
                 </view>
-                <!--<view class="basis-1">
-                    <view class="text-gray text-right">
-                        <text class="cuIcon-right icon" />
-                    </view>
-                </view>-->
             </view>
         </view>
 
         <!-- 团购拼单 -->
         <view class="tuan">
-            <view class="cell-group margin-cell-group" v-if="pinTuanRecord.length > 0">
-                <view class="cell-item right-img">
-                    <view class="cell-item-hd">
-                        <view class="cell-hd-title">{{ teamCount || '0' }}人在拼单，可直接参与</view>
+            <view class="coreshop-cell-group u-margin-top-20 u-margin-bottom-20" v-if="pinTuanRecord.length > 0">
+                <view class="coreshop-cell-item right-img">
+                    <view class="coreshop-cell-item-hd">
+                        <view class="coreshop-cell-hd-title">{{ teamCount || '0' }}人在拼单，可直接参与</view>
                     </view>
                 </view>
                 <view class="group-swiper">
@@ -139,184 +112,175 @@
                         <swiper-item v-for="(item, index) in pinTuanRecord" :key="index">
                             <view class="swiper-item">
 
-                                <view class="cell-item" :class="item[0].isOverdue?'coreshop-lower-shelf':''">
+                                <view class="coreshop-cell-item" :class="item[0].isOverdue?'coreshop-lower-shelf':''">
                                     <view class="img-lower-box" :class="item[0].isOverdue?'coreshop-lower-box':''" v-if="item[0].isOverdue">已结束</view>
-                                    <view class="cell-item-hd">
+                                    <view class="coreshop-cell-item-hd">
                                         <u-image width="80rpx" height="80rpx" :src="item[0].userAvatar" shape="circle" class="u-margin-right-8"></u-image>
-                                        <view class="cell-hd-title">{{ item[0].nickName || '' }}</view>
+                                        <view class="coreshop-cell-hd-title">{{ item[0].nickName || '' }}</view>
                                     </view>
-                                    <view class="cell-item-bd">
-                                        <view class="cell-bd-view">
-                                            <text class="cell-bd-text u-font-xs">
+                                    <view class="coreshop-cell-item-bd">
+                                        <view class="coreshop-cell-bd-view">
+                                            <text class="coreshop-cell-bd-text u-font-xs">
                                                 还差
-                                                <text class="text-red">{{ item[0].teamNums || '' }}人</text>
+                                                <text class="coreshop-text-red">{{ item[0].teamNums || '' }}人</text>
                                                 拼成
                                             </text>
                                         </view>
-                                        <view class="cell-bd-view">
+                                        <view class="coreshop-cell-bd-view">
                                             <view class="commodity-day">
                                                 <text class="u-font-xs">剩余：</text>
                                                 <u-count-down :timestamp="item[0].lastTime" separator="zh" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true" font-size="22" separator-size="22" color="#ff7300" bg-color="#ffd4b0" @end="end(index,0)"></u-count-down>
                                             </view>
                                         </view>
                                     </view>
-                                    <view class="cell-item-ft">
-                                        <button class="cu-btn round bg-pink sm" @click="selectTap(2, item[0].teamId)" v-if="!item[0].isOverdue">去拼单</button>
-                                        <button class="cu-btn round bg-grey sm" v-if="item[0].isOverdue">已结束</button>
+                                    <view class="coreshop-cell-item-ft">
+                                        <u-button type="success" size="mini" @click="selectTap(2, item[0].teamId)" v-if="!item[0].isOverdue">去拼单</u-button>
+                                        <u-button type="default" size="mini" v-if="item[0].isOverdue">已结束</u-button>
                                     </view>
-
                                 </view>
-                                <view class="cell-item" v-if="item[1]" :class="item[1].isOverdue?'coreshop-lower-shelf':''">
+                                <view class="coreshop-cell-item" v-if="item[1]" :class="item[1].isOverdue?'coreshop-lower-shelf':''">
                                     <view class="img-lower-box" :class="item[1].isOverdue?'coreshop-lower-box':''" v-if="item[1].isOverdue">已结束</view>
-                                    <view class="cell-item-hd">
+                                    <view class="coreshop-cell-item-hd">
                                         <u-image width="80rpx" height="80rpx" :src="item[1].userAvatar" shape="circle" class="u-margin-right-8"></u-image>
-                                        <view class="cell-hd-title">{{ item[1].nickName || '' }}</view>
+                                        <view class="coreshop-cell-hd-title">{{ item[1].nickName || '' }}</view>
                                     </view>
-                                    <view class="cell-item-bd">
-                                        <view class="cell-bd-view">
-                                            <text class="cell-bd-text u-font-xs">
+                                    <view class="coreshop-cell-item-bd">
+                                        <view class="coreshop-cell-bd-view">
+                                            <text class="coreshop-cell-bd-text u-font-xs">
                                                 还差
-                                                <text class="text-red">{{ item[1].teamNums || '' }}人</text>
+                                                <text class="coreshop-text-red">{{ item[1].teamNums || '' }}人</text>
                                                 拼成
                                             </text>
                                         </view>
-                                        <view class="cell-bd-view">
+                                        <view class="coreshop-cell-bd-view">
                                             <view class="commodity-day">
                                                 <text class="u-font-xs">剩余：</text>
                                                 <u-count-down :timestamp="item[1].lastTime" separator="zh" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true" font-size="22" separator-size="22" color="#ff7300" bg-color="#ffd4b0" @end="end(index,1)"></u-count-down>
                                             </view>
                                         </view>
                                     </view>
-                                    <view class="cell-item-ft">
-                                        <button class="cu-btn round bg-pink sm" @click="selectTap(2, item[1].id)" v-if="!item[1].isOverdue">去拼单</button>
-                                        <button class="cu-btn round bg-grey sm" v-if="item[1].isOverdue">已结束</button>
+                                    <view class="coreshop-cell-item-ft">
+                                        <u-button type="success" size="mini" @click="selectTap(2, item[1].teamId)" v-if="!item[1].isOverdue">去拼单</u-button>
+                                        <u-button type="default" size="mini" v-if="item[1].isOverdue">已结束</u-button>
                                     </view>
-
                                 </view>
                             </view>
                         </swiper-item>
                     </swiper>
                 </view>
             </view>
-            <view class="cell-group margin-cell-group" v-else>
-                <view class="cell-item right-img">
-                    <view class="cell-item-hd"><view class="cell-hd-title">暂无开团信息</view></view>
+            <view class="coreshop-cell-group u-margin-top-20 u-margin-bottom-20" v-else>
+                <view class="coreshop-cell-item right-img">
+                    <view class="coreshop-cell-item-hd"><view class="coreshop-cell-hd-title">暂无开团信息</view></view>
                 </view>
             </view>
         </view>
 
         <!--评论-->
-        <view class="margin-top bg-white coreshop-comment-view-box" v-if="goodsComments.length">
-            <view class="cu-bar bg-white">
-                <view class="action">
-                    <text class="text-black text-df">评价（{{goodsComments.length}}）</text>
+        <view class="u-margin-top-20 coreshop-bg-white  u-padding-left-20 u-padding-right-20 u-padding-bottom-20" v-if="goodsComments.length">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-top-20">
+                <view class="coreshop-basis-2">
+                    <text class="coreshop-text-black u-font-md">评价（{{goodsComments.length}}）</text>
                 </view>
-                <view class="action">
-                    <view class="text-sm">
-                        <text class="cuIcon-right icon margin-left-xs" @tap="goGoodComments(goodsInfo.id)" />
+                <view class="coreshop-basis-7"></view>
+                <view class="coreshop-basis-1">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right"  @tap="goGoodComments(goodsInfo.id)"></u-icon>
                     </view>
                 </view>
             </view>
             <view v-for="(item, index) in goodsComments" :key="index">
-                <view class="coreshop-border-view" />
-                <view class="coreshop-view-box">
-                    <view class="flex flex-wrap text-sm">
-                        <view class="basis-1">
-                            <view class="cu-avatar sm round" :style="[{backgroundImage:'url('+ item.avatarImage +')'}]" />
-                        </view>
-                        <view class="basis-9 text-sm">
-                            <view>{{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }}</view>
-                            <view class="margin-top-xs">{{ item.contentBody || ''}}</view>
-                            <view class="text-gray margin-top-sm">
-                                <u-rate :current="item.score" :disabled="true" size="26"></u-rate>
-                            </view>
-                            <view class="text-gray margin-top-sm">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
+                <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+                <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-20">
+                    <view class="coreshop-basis-1">
+                        <view class="coreshop-avatar sm round" :style="[{backgroundImage:'url('+ item.avatarImage +')'}]" />
+                    </view>
+                    <view class="coreshop-basis-9 u-font-sm">
+                        <view>{{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }}</view>
+                        <view class="u-margin-top-20">{{ item.contentBody || ''}}</view>
+                        <view class="coreshop-text-gray u-margin-top-10">
+                            <u-rate :current="item.score" :disabled="true" size="26"></u-rate>
                         </view>
+                        <view class="coreshop-text-gray u-margin-top-10">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
                     </view>
                 </view>
             </view>
         </view>
 
-
         <!--内容区-->
-        <view class="margin-top bg-white coreshop-details-view-box">
-            <view class="text-df title-view">
-                <text class="cuIcon-titles text-red" />
-                <text class="text-black">商品详情</text>
+        <view class="u-margin-top-20 u-padding-top-10 coreshop-bg-white">
+            <view class="u-font-md u-padding-top-10 u-padding-bottom-10 u-padding-left-20 u-padding-right-10">
+                <u-icon name="more-circle" color="#e54d42"></u-icon>
+                <text class="u-margin-left-10 coreshop-text-black">商品详情</text>
             </view>
             <!--参数-->
             <view class="grid col-2">
                 <view class="col-item" v-for="(item, index) in goodsParams" :key="index">
-                    <text class="text-gray">{{ item.name || ''}}：</text>
-                    <text class="text-black">{{ item.value || ''}}</text>
+                    <text class="coreshop-text-gray">{{ item.name || ''}}：</text>
+                    <text class="coreshop-text-black">{{ item.value || ''}}</text>
                 </view>
             </view>
-            <!--<view class="text-cut col-item">
-                <text class="text-gray">详细信息：</text>
-                <text class="text-black">有发票，有配件，有包装</text>
-            </view>-->
-            <view class="u-padding-top-10">
+            <view class="u-padding-10">
                 <u-parse :html="goodsInfo.intro" :selectable="true" v-if="goodsInfo.intro"></u-parse>
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="详情为空" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="详情为空" mode="list"></u-empty>
                 </view>
             </view>
         </view>
 
-
         <!--常见问题-->
-        <view class="margin-top bg-white margin-bottom coreshop-view-box coreshop-goods-help-view-box">
-            <view class="text-black text-lg margin-bottom-sm">常见说明</view>
-
-            <view class="flex flex-wrap margin-bottom" v-for="(item, index) in serviceDescription.commonQuestion" :key="index">
-                <view class="basis-2">
-                    <text class="cu-tag bg-grey radius sm">{{item.title}}</text>
+        <view class="u-margin-top-20 coreshop-bg-white u-margin-bottom-30 coreshop-common-view-box">
+            <view class="u-font-md u-padding-bottom-20">
+                <u-icon name="question-circle" color="#e54d42"></u-icon>
+                <text class="u-margin-left-10 coreshop-text-black">常见说明</text>
+            </view>
+            <view class="coreshop-flex coreshop-flex-wrap u-margin-bottom-20" v-for="(item, index) in serviceDescription.commonQuestion" :key="index">
+                <view class="coreshop-basis-2">
+                    <u-tag :text="item.title" type="info" size="mini" />
                 </view>
-                <view class="basis-8">
-                    <view class="text-sm">{{item.description}}</view>
+                <view class="coreshop-basis-8">
+                    <view class="u-font-sm">{{item.description}}</view>
                 </view>
             </view>
-
-            <view class="coreshop-border-view" />
-            <view class="text-center text-blue" @tap="goArticleList()">查看更多问题</view>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+            <view class="u-text-center coreshop-text-blue  u-padding-top-20" @tap="goArticleList()">查看更多问题</view>
         </view>
 
         <!--商家及推荐-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-goods-info-view-box">
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box coreshop-goods-shop-info-view-box">
             <view class="coreshop-shop-view">
-                <view class="cu-avatar lg round" :style="[{backgroundImage:'url('+ shopLogo +')'}]" />
-                <view class="text-view">
-                    <view class="margin-bottom-xs">{{shopName}}</view>
-                    <view class="text-sm text-cut">{{shareTitle}}</view>
+                <view class="u-absolute">
+                     <u-avatar :src="shopLogo"></u-avatar>
+                </view>
+                <view class="u-margin-left-20 u-padding-left-80 u-padding-right-80">
+                    <view class="u-margin-bottom-10">{{shopName}}</view>
+                    <view class="u-font-sm u-line-1">{{shareTitle}}</view>
                 </view>
-                <button class="cu-btn radius sm line-red" @tap="doPhoneCall">联系商家</button>
+                <u-button type="error" size="mini" :plain="true" @click="doPhoneCall">联系商家</u-button>
             </view>
-            <view class="coreshop-border-view" />
-            <view class="live-tag-view">
+            <view class="coreshop-solid-bottom u-padding-top-10 u-padding-bottom-20" />
+            <view class="live-tag-view u-margin-top-20 u-margin-bottom-20">
                 <view class="text-view">
-                    <text class="cu-tag bg-pink radius sm">
-                        <text class="cuIcon-title" />
-                        <text>已定位</text>
-                    </text>
-                    <text class="margin-left-xs text-cut">可直接获取商家地理位置信息</text>
+                    <u-tag text="已定位" mode="plain" size="mini" type="warning" />
+                    <text class="u-margin-left-10 u-line-1">可直接获取商家地理位置信息</text>
                 </view>
-                <view class="text-sm text-red text-right-view" @tap="goShopMap">
-                    <text class="margin-right-xs">去地图</text>
-                    <text class="cuIcon-right" />
+                <view class="u-font-sm coreshop-text-red go-map-box" @tap="goShopMap">
+                    <text class="u-margin-right-10">去地图</text>
+                    <u-icon name="arrow-right"></u-icon>
                 </view>
             </view>
-            <view class="coreshop-border-view" />
-            <view class="coreshop-recommend-list-box">
-                <view class="text-sm">本店推荐</view>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+            <view class="coreshop-good-shop-recommend-list-box">
+                <view class="u-font-sm u-padding-top-20 ">本店推荐</view>
                 <!--滑动列表-->
                 <view class="recommend-scroll-box">
                     <scroll-view class="recommend-scroll" scroll-x>
                         <block v-for="(items,indexs) in shopRecommendData" :key="indexs">
                             <view :id="['scroll' + (indexs + 1 )]" class="recommend-scroll-item" @tap="goGoodsDetail(items.id)">
-                                <view class="cu-avatar xl radius" :style="[{backgroundImage:'url('+ items.image +')'}]" />
-                                <view class="text-cut-2 text-sm text-black margin-tb-sm u-line-2" style="height:64rpx;">{{items.name}}</view>
-                                <view class="text-red text-price margin-tb-sm text-df">
+                                <view class="coreshop-avatar xl radius" :style="[{backgroundImage:'url('+ items.image +')'}]" />
+                                <view class="u-line-1-2 u-font-sm coreshop-text-black u-margin-top-20 u-margin-bottom-20 u-line-2" style="height: 64rpx;">{{items.name}}</view>
+                                <view class="coreshop-text-red coreshop-text-price u-margin-top-20 u-margin-bottom-20 u-font-md">
                                     {{items.price}}元
                                 </view>
                             </view>
@@ -327,7 +291,7 @@
         </view>
 
         <!--单个拼团数据展示-->
-        <lvv-popup position="bottom" ref="pinTuanpop">
+        <u-popup mode="bottom" v-model="pinTuanpop">
             <view class="ig-top" v-if="teamInfo.teams.length > 0">
                 <view class="ig-top-t">
                     <view class="">
@@ -338,7 +302,7 @@
                 <view class="ig-top-m">
                     <view class="user-head-img-c" v-for="(item, index) in teamInfo.teams" :key="index">
                         <view class="user-head-img-tip" v-if="item.recordId == item.teamId">拼主</view>
-                        <image class="user-head-img cell-hd-icon have-none" :src="item.userAvatar" mode=""></image>
+                        <image class="user-head-img coreshop-head-icon " :src="item.userAvatar" mode=""></image>
                     </view>
                     <view class="user-head-img-c uhihn" v-if="teamInfo.teamNums" v-for="n in teamInfo.teamNums" :key="n"><text>?</text></view>
                 </view>
@@ -351,11 +315,11 @@
                     <view class="igtb-mid"><button class="coreshop-btn" @click="selectTap(2, teamInfo.id)">参与拼团</button></view>
                 </view>
             </view>
-        </lvv-popup>
+        </u-popup>
 
         <!-- 分享弹窗 -->
         <view class="u-padding-10">
-            <lvv-popup position="bottom" ref="share">
+            <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 -->
@@ -371,159 +335,146 @@
                 <!-- #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 -->
-            </lvv-popup>
+            </u-popup>
             <div id="qrCode" ref="qrCodeDiv"></div>
         </view>
 
-        <!--其他推荐-->
-        <view class="margin-top coreshop-view-box coreshop-recommend-list-view-box">
-            <view class="flex flex-wrap">
-                <view class="basis-sm text-right">
-                    <image class="img-aau" src="/static/images/common/aau.png" lazy-load mode="widthFix" />
+        
+        <!--为您推荐-->
+        <view class="coreshop-recommended-title-view">
+            <view class="u-flex u-flex-wrap">
+                <view class="u-flex-4 u-text-right">
+                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
-                <view class="basis-xs text-center">
-                    <text class="text-black text-lg">其他推荐</text>
+                <view class="u-flex-4 u-text-center">
+                    <text class="coreshop-text-black u-font-lg">为您推荐</text>
                 </view>
-                <view class="basis-sm text-left">
-                    <image class="img-aau" src="/static/images/common/aau.png" lazy-load mode="widthFix" />
+                <view class="u-flex-4 u-text-left">
+                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
             </view>
+        </view>
 
-            <view class="margin-bottom coreshop-goods-list-box">
-                <view class="grid col-2">
-                    <block v-for="(items,indexs) in otherRecommendData" :key="indexs">
-                        <view class="list-itme" @click="goGoodsDetail(items.id)">
-                            <view class="bg-white list-radius">
-                                <view class="goods-img">
-                                    <view class="cu-avatar" :style="[{backgroundImage:'url('+ items.image +')'}]" />
-                                    <view class="mold-view" v-if="items.mold">
-                                        <text class="cu-tag radius sm bg-pink">自营</text>
-                                    </view>
-                                </view>
-                                <view class="view-goods-info">
-                                    <view class="text-cut text-black text-sm margin-bottom-sm">{{items.name}}</view>
-                                    <view class="text-price text-red text-lg">
-                                        {{items.price}}元  <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{items.mktprice}}元</span>
-                                    </view>
-                                </view>
-                            </view>
+         <!--推荐列表-->
+        <view class="coreshop-goods-group" v-if="otherRecommendData.length>0">
+            <u-grid col="2" :border="false" :align="center">
+                <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in otherRecommendData" :key="index" @click="goGoodsDetail(item.id)">
+                    <view class="good_box">
+                        <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
+                        <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
+                        <view class="good_title u-line-2">
+                            {{item.name}}
                         </view>
-                    </block>
-                </view>
-            </view>
+                        <view class="good-price">
+                            {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
+                        </view>
+                        <view class="good-tag-recommend" v-if="item.isRecommend">
+                            推荐
+                        </view>
+                        <view class="good-tag-hot" v-if="item.isHot">
+                            热门
+                        </view>
+                    </view>
+                </u-grid-item>
+            </u-grid>
         </view>
 
         <!--占位底部距离-->
-        <view class="cu-tabbar-height" />
+        <view class="coreshop-tabbar-height" />
         <!--底部操作-->
-        <view class="coreshop-footer-fixed">
-            <view class="cu-bar bg-white tabbar border shop">
+        <view class="coreshop-good-footer-fixed">
+            <view class="tabbar">
                 <!-- 客服按钮 -->
                 <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-                <view class="action" @click="showChat()">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
+                <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 -->
-                <button class="action" hover-class="none" open-type="contact" bindcontact="showChat" :session-from="kefupara">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
-                </button>
-                <!-- #endif -->
-                <!-- #ifdef MP-ALIPAY -->
-                <view class="action">
-                    <contact-button class="goods-bottom-ic icon" icon="/static/images/customerservice.png" size="80rpx*80rpx" tnt-inst-id="WKPKUZXG" scene="SCE00040186" hover-class="none" />
+                <view class="action" >
+                    <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
                 </view>
                 <!-- #endif -->
-                <!-- #ifdef MP-TOUTIAO -->
-                <view class="action" @click="showChat()">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
+                <view class="action"  @click="collection">
+                    <u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
                 </view>
-                <!-- #endif -->
-                <button class="action" @click="collection">
-                    <view :class="isfav ? 'cuIcon-favorfill':'cuIcon-favor'" />
-                    <view v-if="!isfav">收藏</view>
-                    <view v-if="isfav">已收藏</view>
-                </button>
-                <view class="action" @click="redirectCart">
-                    <view class="cuIcon-cart">
-                        <view class="cu-tag badge" v-if="cartNums">{{cartNums}}</view>
-                    </view>
-                    <text>购物车</text>
+                 <view class="action" @click="redirectCart">
+                    <u-badge class="car-num" :count="cartNums?cartNums:0" type="error" :offset="[-3, -6]"></u-badge>
+				    <u-icon name="shopping-cart" :size="40"  label="购物车" :label-size="22" label-pos="bottom"></u-icon>
                 </view>
                 <view class="btn-group">
-                    <button class="cu-btn bg-grey radius shadow-blur  y-f buyBtn" @tap="selectTap(1)">
-                        <text class="price">￥{{ product.price || '0' }}</text>
-                        <text>单独购买</text>
-                    </button>
-                    <button class="cu-btn bg-pink radius shadow-blur  y-f buyBtn" v-if="goodsInfo.pinTuanRule.pinTuanStartStatus == 1" @tap="selectTap(2)">
-                        <text class="price">￥{{ pinTuanPrice || '0' }}</text>
-                        <text>发起拼团</text>
-                    </button>
-                    <button class="cu-btn bg-pink radius shadow-blur  y-f buyBtn" v-if="goodsInfo.pinTuanRule.pinTuanStartStatus == 2">
-                        <text class="price">￥{{ pinTuanPrice || '0' }}</text>
-                        <text>即将开团</text>
-                    </button>
-                    <button class="cu-btn bg-pink radius shadow-blur y-f buyBtn" v-if="goodsInfo.pinTuanRule.pinTuanStartStatus == 3">
-                        <text class="price">￥{{ pinTuanPrice || '0' }}</text>
-                        <text>拼团已结束</text>
-                    </button>
+
+                    <u-button type="error" size="medium" @click="selectTap(1)" shape="square">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-center coreshop-line-height-initial">
+                            <text class="price">￥{{ product.price || '0' }}</text>
+                            <text>单独购买</text>
+                        </view>
+                    </u-button>
+                    <u-button type="success" size="medium" @click="selectTap(2)" shape="square" v-if="goodsInfo.pinTuanRule.pinTuanStartStatus == 1">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-center coreshop-line-height-initial">
+                            <text class="price">￥{{ pinTuanPrice || '0' }}</text>
+                            <text>发起拼团</text>
+                        </view>
+                    </u-button>
+                    <u-button type="primary" size="medium" shape="square" v-if="goodsInfo.pinTuanRule.pinTuanStartStatus == 2">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-center coreshop-line-height-initial">
+                            <text class="price">￥{{ pinTuanPrice || '0' }}</text>
+                            <text>即将开团</text>
+                        </view>
+                    </u-button>
+                    <u-button type="default" size="medium" shape="square" v-if="goodsInfo.pinTuanRule.pinTuanStartStatus == 3">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-center coreshop-line-height-initial">
+                            <text class="price">￥{{ pinTuanPrice || '0' }}</text>
+                            <text>拼团已结束</text>
+                        </view>
+                    </u-button>
                 </view>
             </view>
         </view>
 
         <!--弹出框-->
-        <view class="cu-modal bottom-modal coreshop-bottom-modal-box" :class="bottomModal?'show':''">
-            <view class="cu-dialog bg-white">
-                <!--标题-->
-                <view class="text-black text-center margin-tb text-lg coreshop-title-bar">
+        <u-popup class="coreshop-bottom-popup-box"  v-model="bottomModal" mode="bottom">
+            <view class="radius coreshop-bg-white">
+                 <!--标题-->
+                <view class="coreshop-text-black u-text-center u-margin-top-30 u-margin-bottom-30 u-font-lg coreshop-title-bar">
                     <text>{{modalTitle}}</text>
-                    <text class="cuIcon-close close-icon" @tap="hideModal"></text>
+                    <u-icon name="close"  @tap="hideModal" class="close-icon"></u-icon>
                 </view>
-
                 <!--内容区域-->
                 <view class="coreshop-modal-content">
-
                     <!--服务区域-->
-                    <view class="coreshop-view-box service" v-if="modalType=='service'">
+                    <view class="coreshop-common-view-box service" v-if="modalType=='service'">
                         <view v-for="(item, index) in serviceDescription.service" :key="index">
                             <view class="text-view">
-                                <text class="cuIcon-title text-red" />
-                                <text class="text-cut text-black">{{item.title}}</text>
+                                <u-icon name="more-circle" color="#e54d42" :label="item.title"></u-icon>
                             </view>
-                            <view class="text-sm text-list-view">
-                                <view class="margin-left text-cut text-gray">{{item.description}}</view>
+                            <view class="u-font-sm text-list-view">
+                                <view class="u-margin-left-20 coreshop-text-gray">{{item.description}}</view>
                             </view>
                         </view>
                     </view>
 
                     <!--促销区域-->
-                    <view class="coreshop-view-box promotion" v-if="modalType=='promotion'">
+                    <view class="coreshop-common-view-box promotion" v-if="modalType=='promotion'">
                         <view class="text-view" v-for="(item, index) in promotion" :key="index">
                             <text class="cu-tag line-orange radius sm">{{item.name}}</text>
-                            <text class="margin-left-xs text-cut text-black">{{item.name}}</text>
+                            <text class="u-margin-left-20 u-line-1 coreshop-text-black">{{item.name}}</text>
                         </view>
                     </view>
 
                     <!--选择规格-->
-                    <view class="coreshop-view-box select hide" :class="modalType=='select' ?'show':''">
+                    <view class="coreshop-common-view-box select hide" :class="modalType=='select' ?'show':''">
                         <!--商品信息-->
-                        <view class="cu-list menu-avatar">
-                            <view class="cu-item">
-                                <view class="cu-avatar radius lg" :style="[{backgroundImage:'url('+ product.images +')'}] " />
+                        <view class="coreshop-list menu-avatar">
+                            <view class="coreshop-list-item">
+                                <view class="coreshop-avatar radius lg" :style="[{backgroundImage:'url('+ product.images +')'}] " />
                                 <view class="content">
-                                    <view class="text-price-view">
-                                        <text class="text-price text-red margin-right-xs">{{ price || ''}}</text>
-                                        <text class="text-sm text-gray text-through">￥{{ product.mktprice || ''}}</text>
-                                        <!--<text class="cu-tag bg-gradual-red radius sm">
-                                            <text class="cuIcon-hotfill"/>
-                                            <text>秒杀中</text>
-                                        </text>-->
+                                    <view class="coreshop-text-price-view">
+                                        <text class="coreshop-text-price coreshop-text-red u-margin-right-20">{{ price || ''}}</text>
+                                        <text class="u-font-sm coreshop-text-gray coreshop-text-through">￥{{ product.mktprice || ''}}</text>
                                     </view>
-                                    <view class="text-black text-sm flex">
-                                        <view class="text-cut">已选: {{ product.spesDesc || '无'}}</view>
+                                    <view class="coreshop-text-black u-font-sm flex">
+                                        <view class="u-line-1">已选: {{ product.spesDesc || '无'}}</view>
                                     </view>
                                 </view>
                             </view>
@@ -532,7 +483,7 @@
                         <view class="coreshop-select-btn-list-box">
                             <spec :spesData="defaultSpesDesc" ref="spec" @changeSpes="changeSpes"></spec>
                             <view class="select-item">
-                                <view class="text-black">数量</view>
+                                <view class="coreshop-text-black">数量</view>
                                 <view class="select-btn">
                                     <u-number-box v-model="buyNum" :min="minNums" :max="product.stock"></u-number-box>
                                 </view>
@@ -542,49 +493,44 @@
 
                     <!--公共按钮-->
                     <view class="coreshop-modal-footer-fixed" v-if="modalType=='select'">
-                        <view class="flex flex-direction">
-                            <u-button type="error" size="medium" hover-class="btn-hover2" @click="clickHandle()" :disabled='submitStatus' :loading='submitStatus' v-if="product.stock>0">确定</u-button>
-                            <u-button type="default" size="medium" v-else>已售罄</u-button>
-                        </view>
+                        <u-button type="error" :custom-style="customStyle" size="medium"  @click="clickHandle()" :disabled='submitStatus' :loading='submitStatus' v-if="product.stock>0">确定</u-button>
+                        <u-button type="default" size="medium" v-else>已售罄</u-button>
                     </view>
                 </view>
             </view>
-        </view>
+        </u-popup>
         <!-- 右边浮动球 -->
-        <corecms-fab horizontal="right" vertical="bottom" direction="vertical"></corecms-fab>
+        <coreshop-fab horizontal="right" vertical="bottom" direction="vertical"></coreshop-fab>
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 
 </template>
 <script>
     import { mapMutations, mapActions, mapState } from 'vuex';
-    import lvvPopup from '@/components/corecms-lvv-popup/corecms-lvv-popup.vue';
-    import corecmsFab from '@/components/corecms-fab/corecms-fab.vue';
-    import { get } from '@/common/utils/dbHelper.js';
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js';
+    import coreshopFab from '@/components/coreshop-fab/coreshop-fab.vue';
+
     import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js'
-    import spec from '@/components/corecms-spec/corecms-spec.vue';
+    import spec from '@/components/coreshop-spec/coreshop-spec.vue';
     // #ifdef H5
-    import shareByH5 from '@/components/corecms-share/shareByh5.vue';
+    import shareByH5 from '@/components/coreshop-share/shareByh5.vue';
     // #endif
     // #ifdef MP-WEIXIN
-    import shareByWx from '@/components/corecms-share/shareByWx.vue';
+    import shareByWx from '@/components/coreshop-share/shareByWx.vue';
     // #endif
     // #ifdef MP-TOUTIAO
-    import shareByTt from '@/components/corecms-share/shareByTt.vue';
+    import shareByTt from '@/components/coreshop-share/shareByTt.vue';
     // #endif
     // #ifdef MP-ALIPAY
-    import shareByAli from '@/components/corecms-share/shareByAli.vue';
+    import shareByAli from '@/components/coreshop-share/shareByAli.vue';
     // #endif
     // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import shareByApp from '@/components/corecms-share/shareByApp.vue';
+    import shareByApp from '@/components/coreshop-share/shareByApp.vue';
     // #endif
     export default {
         mixins: [goods, articles, commonUse, tools],
         components: {
-            lvvPopup,
-            corecmsFab,
+            coreshopFab,
             spec,
             // #ifdef H5
             shareByH5,
@@ -604,6 +550,9 @@
         },
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 bannerCur: 0,
                 current: 0, // init tab位
                 goodsId: 0, // 商品id
@@ -627,7 +576,7 @@
                     duration: 500,
                     groupHeight: '',
                 },
-
+                pinTuanpop: false,
                 pinTuanPrice: 0,
                 discountAmount: 0, //拼团优惠金额
                 price: 0,
@@ -644,6 +593,7 @@
                 modalType: 'promotion',
                 selectType: '',
                 shareUrl: '/pages/share/jump/jump',
+                shareBox: false,
                 serviceDescription: {
                     commonQuestion: [],
                     delivery: [],
@@ -723,10 +673,10 @@
                 let pages = getCurrentPages();
                 let page = pages[pages.length - 1];
                 // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
-                return apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
                 // #endif
                 // #ifdef MP-ALIPAY
-                return apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
                 // #endif
             },
             defaultSpesDesc() {
@@ -758,7 +708,7 @@
                     data: 1
                 };
                 // 如果用户已经登录 要传用户token
-                let userToken = get('userToken');
+                let userToken = this.$db.get('userToken');
                 if (userToken) {
                     data['token'] = userToken;
                 }
@@ -992,14 +942,14 @@
             },
             // 跳转到h5分享页面
             goShare() {
-                this.$refs.share.show();
+                this.shareBox = true;
             },
             closeShare() {
-                this.$refs.share.close();
+                this.shareBox = false;
             },
             // 拼团弹出层
             pinTuanShow() {
-                this.$refs.pinTuanpop.show();
+                this.pinTuanpop = true;
             },
             // 图片点击放大
             clickImg(imgs) {
@@ -1184,44 +1134,5 @@
     };
 </script>
 <style lang="scss">
-    @import '../../../../static/style/goodDetails.scss';
-    .buyBtn { height: 74rpx; }
-        .buyBtn text { width: 100%; line-height: 1.3em; font-size: 24rpx; }
-        .buyBtn .price { font-size: 28rpx; }
-
-    .groupHeight { height: 122rpx !important; }
-
-    .group-swiper-c { height: 242rpx; }
-        .group-swiper-c .swiper-item .cell-item { height: 50%; }
-            .group-swiper-c .swiper-item .cell-item .user-head-img { width: 80rpx; height: 80rpx; border-radius: 50%; }
-            .group-swiper-c .swiper-item .cell-item .cell-hd-title { max-width: 200rpx; width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex: 1; }
-            .group-swiper-c .swiper-item .cell-item .cell-item-bd { min-width: 150rpx; text-align: center; display: block; }
-                .group-swiper-c .swiper-item .cell-item .cell-item-bd .cell-bd-view { margin-bottom: 0; }
-                .group-swiper-c .swiper-item .cell-item .cell-item-bd .cell-bd-text { float: none; }
-        .group-swiper-c .commodity-day > text { background: none !important; padding: 0; }
-        .group-swiper-c .swiper-item .cell-item .cell-item-ft .btn { font-size: 26rpx; color: #fff; background-color: #ff7159; text-align: center; }
-
-
-    .ig-top { text-align: center; background-color: #fff; padding: 20upx 26upx; width: 100%; height: 350rpx; background: #FFFFFF; position: absolute; left: 0; bottom: 0; }
-    .ig-top-t,
-    .ig-top-m { margin-bottom: 20upx; }
-        .ig-top-t > view { display: inline-block; padding: 0 10upx; color: #999; }
-    .user-head-img-c { position: relative; width: 80upx; height: 80upx; border-radius: 50%; margin-right: 20upx; box-sizing: border-box; display: inline-block; border: 1px solid #f3f3f3; }
-    .user-head-img-tip { position: absolute; top: -6upx; left: -10upx; display: inline-block; background-color: #FF7159; color: #fff; font-size: 22upx; z-index: 98; padding: 0 10upx; border-radius: 10upx; transform: scale(.8); }
-    .user-head-img-c .user-head-img { width: 100%; height: 100%; border-radius: 50%; }
-    .user-head-img-c:first-child { border: 1px solid #FF7159; }
-    .uhihn { width: 80upx; height: 80upx; border-radius: 50%; display: inline-block; border: 2upx dashed #e1e1e1; text-align: center; color: #d1d1d1; font-size: 40upx; box-sizing: border-box; position: relative; }
-        .uhihn > text { position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); }
-    .igtb-top { font-size: 32upx; color: #333; margin-bottom: 16upx; }
-    .igtb-mid { margin-bottom: 16upx; }
-        .igtb-mid .coreshop-btn { width: 100%; background-color: #FF7159; color: #fff; }
-    .igtb-bot { font-size: 24upx; color: #666; }
-    .cell-ft-text { max-width: 520upx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-    .group-notice .cell-ft-text { color: #999; margin-left: 20upx; font-size: 26upx; }
-
-    .coreshop-lower-shelf { }
-        .coreshop-lower-shelf .cell-item-hd { opacity: 0.4; }
-        .coreshop-lower-shelf .cell-item-bd { opacity: 0.4; }
-        .coreshop-lower-shelf .cell-item-ft { opacity: 0.4; }
-        .coreshop-lower-shelf .coreshop-lower-box { position: absolute; height: calc(100% - 40rpx); width: calc(100% - 20rpx); background-color: rgba(0, 0, 0, 0.6); text-align: center; font-size: 28rpx; color: #dedede; -webkit-transition: left .15s; transition: left .15s; z-index: 999; -webkit-transition: all .15s; transition: all .15s; line-height: 80rpx; }
+    @import "details.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.scss
new file mode 100644
index 0000000000000000000000000000000000000000..eb43496f6f7f027d818671d5a7a08f534a07988a
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.scss
@@ -0,0 +1,5 @@
+.group-wrap { background: url('/static/images/pinTuan/pinTuanListBg.png') no-repeat; background-size: 100% 374rpx; }
+.group-head { padding: 0 25rpx; height: 100rpx;
+    .group-head__title { font-size: 32rpx; font-family: PingFang SC; font-weight: 500; color: rgba(255, 255, 255, 1); }
+    .group-head__notice { font-size: 26rpx; font-family: PingFang SC; font-weight: 500; color: rgba(255, 255, 255, 1); }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
index 015a6f14a895f94ffec67346005f8de484bbc9fe..195c7c9dcccd2c85472dd077d83ded3d8d93ef74 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
@@ -4,23 +4,23 @@
         <view class="content">
             <!-- 列表图片 -->
             <scroll-view class="scroll-box" scroll-y>
-                <view class="group-wrap bg-red">
-                    <view class="group-head x-bc">
+                <view class="group-wrap coreshop-bg-red">
+                    <view class="group-head u-flex u-row-between">
                         <text class="group-head__title">爆款推荐</text>
                         <text class="group-head__notice">省钱省心限时拼</text>
                     </view>
                     <view class="group-box">
                         <view class="goods-item" v-for="(item, index) in goodsList" :key="item.id" v-if="goodsList.length>0">
-                            <view class="activity-goods-box x-bc">
+                            <view class="activity-goods-box u-flex u-row-between">
                                 <view class="img-box">
                                     <view class="tag" v-if="index < 3">TOP{{ index + 1 }}</view>
                                     <image class="img" :src="item.image" mode="aspectFill"></image>
                                 </view>
-                                <view class="goods-right y-bc">
+                                <view class="goods-right u-flex u-row-between coreshop-flex-direction">
                                     <view class="title u-line-1">{{ item.name }}</view>
                                     <view class="tip u-line-1">{{ item.brief }}</view>
                                     <view class="slod-end">
-                                        <view class="x-f">
+                                        <view class="coreshop-flex coreshop-align-center">
                                             <view class="sell-box">
                                                 <text class="cuIcon-hotfill"></text>
                                                 <text class="sell-num">已拼{{ item.buyPinTuanCount }}件</text>
@@ -29,7 +29,7 @@
                                         </view>
                                     </view>
                                     <view class="price-box">
-                                        <view class="x-f">
+                                        <view class="coreshop-flex coreshop-align-center">
                                             <view class="current">￥{{ item.pinTuanPrice  }}</view>
                                             <view class="original">￥{{ item.price }}</view>
                                         </view>
@@ -40,7 +40,7 @@
                         </view>
                         <!-- 无数据时默认显示 -->
                         <view class="coreshop-emptybox" v-else>
-                            <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无提现明细" mode="list"></u-empty>
+                            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无提现明细" mode="list"></u-empty>
                         </view>
 
                     </view>
@@ -49,7 +49,7 @@
             </scroll-view>
         </view>
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
@@ -98,5 +98,5 @@
 </script>
 
 <style lang="scss">
-    @import '../../../../static/style/pinTuan.scss';
+    @import "list.scss";
 </style>
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 783603f51d0ca57ad6279362669c116381cc0655..add5b728a680a2d9e4978f2ef5a245b80578fbdd 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
@@ -1,13 +1,13 @@
 <template>
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <view class="nav-back">
+        <view class="coreshop-full-screen-nav-back">
             <view class="back-btn" @click="toBackBtn()">
-                <image class="icon" src="/static/images/common/back-black.png" mode=""></image>
+                <u-icon name="arrow-left" size="40" top="12"></u-icon>
             </view>
         </view>
         <!--幻灯片-->
-        <view class="coreshop-banner-swiper-box">
+        <view class="coreshop-full-screen-banner-swiper-box">
             <swiper class="screen-swiper" circular autoplay @change="bannerSwiper">
                 <swiper-item v-for="(item,index) in goodsInfo.album" :key="index" @click="clickImg(item)">
                     <u-image width="100%" height="750rpx" :src="item">
@@ -16,78 +16,54 @@
                 </swiper-item>
             </swiper>
             <!--页码-->
-            <text class="tag bg-grey round sm coreshop-page">{{bannerCur + 1}} / {{goodsInfo.album.length}}</text>
+            <text class="coreshop-bg-grey tag round coreshop-page">{{bannerCur + 1}} / {{goodsInfo.album.length}}</text>
         </view>
 
 
         <!--限时秒杀-->
-        <view class="coreshop-limited-seckill-box  bg-mauve">
-            <text class="text-price text-xxl">{{ product.price || '0.00' }}</text>
-            <view class="text-xs coreshop-cost-price-num price-4">
+        <view class="coreshop-limited-seckill-box  coreshop-bg-mauve">
+            <text class="coreshop-text-price u-font-40">{{ product.price || '0.00' }}</text>
+            <view class="u-font-xs coreshop-cost-price-num price-4">
                 <view>已售{{ goodsInfo.buyCount || '0' }}件/剩余{{ product.stock || '0' }}件</view>
                 <view>累计销售{{ goodsInfo.buyCount || '0' }}件</view>
             </view>
-            <view class="text-right coreshop-time-right">
+            <view class="u-text-right coreshop-time-right">
                 <view>距结束仅剩</view>
-                <view class="text-xs u-margin-top-10">
+                <view class="u-font-xs u-margin-top-10">
                     <u-count-down :timestamp="goodsInfo.groupTimestamp" separator="zh" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true" font-size="24" separator-size="24"></u-count-down>
                 </view>
             </view>
-            <view class="text-right coreshop-share-right">
+            <view class="u-text-right coreshop-share-right">
                 <u-icon name="share" @click="goShare()" label="分享" size="40" label-size="22" label-color="#fff" label-pos="bottom"></u-icon>
             </view>
         </view>
 
 
         <!--标题-->
-        <view class="bg-white coreshop-view-box coreshop-title-view-box">
+        <view class="coreshop-bg-white coreshop-common-view-box coreshop-good-title-view-box">
             <view class="title-view">
-                <text class="cu-tag bg-red radius sm" v-if="goodsInfo.brand">{{goodsInfo.brand.name}}</text>
-                <text class="text-black text-lg text-bold">{{ goodsInfo.name || '' }}</text>
+                <u-tag :text="goodsInfo.brand.name" type="error"  mode="dark" v-if="goodsInfo.brand" size="mini"/>
+                <text class="coreshop-text-black u-font-lg coreshop-text-bold">{{ goodsInfo.name || '' }}</text>
             </view>
-            <view class="light bg-mauve radius margin-top-sm coreshop-title-tip-box">
-                <view>
-                    <text class="text-sm">{{ goodsInfo.brief || '' }}</text>
-                </view>
+            <view class="light coreshop-bg-red radius u-margin-top-20 coreshop-title-tip-box">
+                <text class="u-font-sm">{{ goodsInfo.brief || '' }}</text>
             </view>
         </view>
 
-        <!--促销（团购秒杀本就是促销的一种，所以没必要显示）-->
-        <!--<view class="margin-top bg-white coreshop-view-box coreshop-promotion-view-box" v-if="promotion.length > 0" @tap="promotionTap">
-            <view class="flex flex-wrap text-sm" @tap="promotionTap">
-                <view class="basis-1">
-                    <text class="text-gray">促销</text>
-                </view>
-                <view class="basis-7">
-                    <view v-for="(item, index) in promotion" :key="index" :class="index> 1 ? 'u-margin-top-10':''">
-                        <text class="cu-tag line-orange sm radius">{{item.name}}</text>
-                    </view>
-                </view>
-                <view class="basis-2">
-                    <view class="text-gray text-right icon-view">
-                        <text class="cuIcon-right icon" />
-                    </view>
-                </view>
-            </view>
-        </view>-->
         <!--服务-->
-        <!--服务-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-service-view-box" @tap="serviceTap" v-if="serviceDescription.service.length>0">
-            <view class="flex flex-wrap text-sm">
-                <view class="basis-1">
-                    <text class="text-gray">服务</text>
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box" @tap="serviceTap" v-if="serviceDescription.service.length>0">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">服务</text>
                 </view>
-                <view class="basis-7">
+                <view class="coreshop-basis-7">
                     <view class="tag-view-box">
-                        <text class="cu-tag bg-white tag-view" v-for="(item, index) in serviceDescription.service" :key="index">
-                            <text class="cuIcon-roundcheck text-red" />
-                            <text class="margin-left-xs">{{item.title}}</text>
-                        </text>
+                        <u-icon name="checkmark-circle" size="20" label-size="24" color="#e54d42" :label="item.title"  v-for="(item, index) in serviceDescription.service" :key="index" class="u-margin-right-10"></u-icon>
                     </view>
                 </view>
-                <view class="basis-2">
-                    <view class="text-gray text-right icon-view">
-                        <text class="cuIcon-right icon" />
+                <view class="coreshop-basis-2">
+                     <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right-double"></u-icon>
                     </view>
                 </view>
             </view>
@@ -95,94 +71,86 @@
 
 
         <!--发货/规格-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-select-view-box">
-            <view class="flex flex-wrap text-sm" v-if="serviceDescription.delivery.length>0">
-                <view class="basis-1">
-                    <text class="text-gray">发货</text>
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box ">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm" v-if="serviceDescription.delivery.length>0">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">发货</text>
                 </view>
-                <view class="basis-9" v-for="(item, index) in serviceDescription.delivery" :key="index">
-                    <text class="text-sm">{{item.description}}</text>
+                <view class="coreshop-coreshop-basis-9" v-for="(item, index) in serviceDescription.delivery" :key="index">
+                    <text class="u-font-sm">{{item.description}}</text>
                 </view>
             </view>
-
-            <view class="coreshop-border-view" v-if="serviceDescription.delivery.length>0" />
-
-            <view class="flex flex-wrap text-sm" @tap="selectTap()" v-if="isSpes">
-                <view class="basis-1">
-                    <text class="text-gray">规格</text>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" v-if="serviceDescription.delivery.length>0" />
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-top-20" @tap="selectTap()" v-if="isSpes">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">规格</text>
                 </view>
-                <view class="basis-8">
-                    <text class="text-sm">{{ product.spesDesc || ''}}</text>
+                <view class="coreshop-basis-8">
+                    <text class="u-font-sm">{{ product.spesDesc || ''}}</text>
                 </view>
-                <view class="basis-1">
-                    <view class="text-gray text-right">
-                        <text class="cuIcon-right icon" />
+                <view class="coreshop-basis-1">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right-double"></u-icon>
                     </view>
                 </view>
             </view>
         </view>
-
-        <!--评论-->
-        <view class="margin-top bg-white coreshop-comment-view-box" v-if="goodsComments.length">
-            <view class="cu-bar bg-white">
-                <view class="action">
-                    <text class="text-black text-df">评价（{{goodsComments.length}}）</text>
-                </view>
-                <view class="action">
-                    <view class="text-sm">
-                        <text class="cuIcon-right icon margin-left-xs" @tap="goGoodComments(goodsInfo.id)" />
+ <!--评论-->
+        <view class="u-margin-top-20 coreshop-bg-white  u-padding-left-20 u-padding-right-20 u-padding-bottom-20" v-if="goodsComments.length">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-top-20">
+                <view class="coreshop-basis-2">
+                    <text class="coreshop-text-black u-font-md">评价（{{goodsComments.length}}）</text>
+                </view>
+                <view class="coreshop-basis-7"></view>
+                <view class="coreshop-basis-1">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right"  @tap="goGoodComments(goodsInfo.id)"></u-icon>
                     </view>
                 </view>
             </view>
             <view v-for="(item, index) in goodsComments" :key="index">
-                <view class="coreshop-border-view" />
-                <view class="coreshop-view-box">
-                    <view class="flex flex-wrap text-sm">
-                        <view class="basis-1">
-                            <view class="cu-avatar sm round" :style="[{backgroundImage:'url('+ item.avatarImage +')'}]" />
-                        </view>
-                        <view class="basis-9 text-sm">
-                            <view>{{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }}</view>
-                            <view class="margin-top-xs">{{ item.contentBody || ''}}</view>
-                            <view class="text-gray margin-top-sm">
-                                <u-rate :current="item.score" :disabled="true" size="26"></u-rate>
-                            </view>
-                            <view class="text-gray margin-top-sm">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
+                <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+                <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-20">
+                    <view class="coreshop-basis-1">
+                        <view class="coreshop-avatar sm round" :style="[{backgroundImage:'url('+ item.avatarImage +')'}]" />
+                    </view>
+                    <view class="coreshop-basis-9 u-font-sm">
+                        <view>{{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }}</view>
+                        <view class="u-margin-top-20">{{ item.contentBody || ''}}</view>
+                        <view class="coreshop-text-gray u-margin-top-10">
+                            <u-rate :current="item.score" :disabled="true" size="26"></u-rate>
                         </view>
+                        <view class="coreshop-text-gray u-margin-top-10">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
                     </view>
                 </view>
             </view>
         </view>
 
         <!--内容区-->
-        <view class="margin-top bg-white coreshop-details-view-box">
-            <view class="text-df title-view">
-                <text class="cuIcon-titles text-red" />
-                <text class="text-black">商品详情</text>
+         <view class="u-margin-top-20 u-padding-top-10 coreshop-bg-white">
+            <view class="u-font-md u-padding-top-10 u-padding-bottom-10 u-padding-left-20 u-padding-right-10">
+                <u-icon name="more-circle" color="#e54d42"></u-icon>
+                <text class="u-margin-left-10 coreshop-text-black">商品详情</text>
             </view>
             <!--参数-->
             <view class="grid col-2">
                 <view class="col-item" v-for="(item, index) in goodsParams" :key="index">
-                    <text class="text-gray">{{ item.name || ''}}：</text>
-                    <text class="text-black">{{ item.value || ''}}</text>
+                    <text class="coreshop-text-gray">{{ item.name || ''}}：</text>
+                    <text class="coreshop-text-black">{{ item.value || ''}}</text>
                 </view>
             </view>
-            <!--<view class="text-cut col-item">
-                <text class="text-gray">详细信息：</text>
-                <text class="text-black">有发票，有配件，有包装</text>
-            </view>-->
             <view class="u-padding-top-10">
                 <u-parse :html="goodsInfo.intro" :selectable="true" v-if="goodsInfo.intro"></u-parse>
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="详情为空" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="详情为空" mode="list"></u-empty>
                 </view>
             </view>
         </view>
 
         <!-- 分享弹窗 -->
         <view class="u-padding-10">
-            <lvv-popup position="bottom" ref="share">
+            <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 -->
@@ -198,63 +166,61 @@
                 <!-- #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 -->
-            </lvv-popup>
+            </u-popup>
         </view>
 
-
-        <!--常见问题-->
-        <view class="margin-top bg-white margin-bottom coreshop-view-box coreshop-goods-help-view-box">
-            <view class="text-black text-lg margin-bottom-sm">常见说明</view>
-
-            <view class="flex flex-wrap margin-bottom" v-for="(item, index) in serviceDescription.commonQuestion" :key="index">
-                <view class="basis-2">
-                    <text class="cu-tag bg-grey radius sm">{{item.title}}</text>
+         <!--常见问题-->
+        <view class="u-margin-top-20 coreshop-bg-white u-margin-bottom-30 coreshop-common-view-box">
+            <view class="u-font-md u-padding-bottom-20">
+                <u-icon name="question-circle" color="#e54d42"></u-icon>
+                <text class="u-margin-left-10 coreshop-text-black">常见说明</text>
+            </view>
+            <view class="coreshop-flex coreshop-flex-wrap u-margin-bottom-20" v-for="(item, index) in serviceDescription.commonQuestion" :key="index">
+                <view class="coreshop-basis-2">
+                    <u-tag :text="item.title" type="info" size="mini" />
                 </view>
-                <view class="basis-8">
-                    <view class="text-sm">{{item.description}}</view>
+                <view class="coreshop-basis-8">
+                    <view class="u-font-sm">{{item.description}}</view>
                 </view>
             </view>
-
-            <view class="coreshop-border-view" />
-            <view class="text-center text-blue" @tap="goArticleList()">查看更多问题</view>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+            <view class="u-text-center coreshop-text-blue  u-padding-top-20" @tap="goArticleList()">查看更多问题</view>
         </view>
 
-
         <!--商家及推荐-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-goods-info-view-box">
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box coreshop-goods-shop-info-view-box">
             <view class="coreshop-shop-view">
-                <view class="cu-avatar lg round" :style="[{backgroundImage:'url('+ shopLogo +')'}]" />
-                <view class="text-view">
-                    <view class="margin-bottom-xs">{{shopName}}</view>
-                    <view class="text-sm text-cut">{{shareTitle}}</view>
+                <view class="u-absolute">
+                     <u-avatar :src="shopLogo"></u-avatar>
+                </view>
+                <view class="u-margin-left-20 u-padding-left-80 u-padding-right-80">
+                    <view class="u-margin-bottom-10">{{shopName}}</view>
+                    <view class="u-font-sm u-line-1">{{shareTitle}}</view>
                 </view>
-                <button class="cu-btn radius sm line-red" @tap="doPhoneCall">联系商家</button>
+                <u-button type="error" size="mini" :plain="true" @click="doPhoneCall">联系商家</u-button>
             </view>
-            <view class="coreshop-border-view" />
-            <view class="live-tag-view">
+            <view class="coreshop-solid-bottom u-padding-top-10 u-padding-bottom-20" />
+            <view class="live-tag-view u-margin-top-20 u-margin-bottom-20">
                 <view class="text-view">
-                    <text class="cu-tag bg-mauve radius sm">
-                        <text class="cuIcon-title" />
-                        <text>已定位</text>
-                    </text>
-                    <text class="margin-left-xs text-cut">可直接获取商家地理位置信息</text>
+                    <u-tag text="已定位" mode="plain" size="mini" type="warning" />
+                    <text class="u-margin-left-10 u-line-1">可直接获取商家地理位置信息</text>
                 </view>
-                <view class="text-sm text-red text-right-view" @tap="goShopMap">
-                    <text class="margin-right-xs">去地图</text>
-                    <text class="cuIcon-right" />
+                <view class="u-font-sm coreshop-text-red go-map-box" @tap="goShopMap">
+                    <text class="u-margin-right-10">去地图</text>
+                    <u-icon name="arrow-right"></u-icon>
                 </view>
             </view>
-            <view class="coreshop-border-view" />
-            <view class="coreshop-recommend-list-box">
-                <view class="text-sm">本店推荐</view>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+            <view class="coreshop-good-shop-recommend-list-box">
+                <view class="u-font-sm u-padding-top-20 ">本店推荐</view>
                 <!--滑动列表-->
                 <view class="recommend-scroll-box">
                     <scroll-view class="recommend-scroll" scroll-x>
                         <block v-for="(items,indexs) in shopRecommendData" :key="indexs">
                             <view :id="['scroll' + (indexs + 1 )]" class="recommend-scroll-item" @tap="goGoodsDetail(items.id)">
-                                <view class="cu-avatar xl radius" :style="[{backgroundImage:'url('+ items.image +')'}]" />
-                                <view class="text-cut-2 text-sm text-black margin-tb-sm u-line-2" style="height:64rpx;">{{items.name}}</view>
-                                <view class="text-red text-price margin-tb-sm text-df">
+                                <view class="coreshop-avatar xl radius" :style="[{backgroundImage:'url('+ items.image +')'}]" />
+                                <view class="u-line-1-2 u-font-sm coreshop-text-black u-margin-top-20 u-margin-bottom-20 u-line-2" style="height: 64rpx;">{{items.name}}</view>
+                                <view class="coreshop-text-red coreshop-text-price u-margin-top-20 u-margin-bottom-20 u-font-md">
                                     {{items.price}}元
                                 </view>
                             </view>
@@ -264,97 +230,92 @@
             </view>
         </view>
 
-
-        <!--其他推荐-->
-        <view class="margin-top coreshop-view-box coreshop-recommend-list-view-box">
-            <view class="flex flex-wrap">
-                <view class="basis-sm text-right">
-                    <image class="img-aau" src="/static/images/common/aau.png" lazy-load mode="widthFix" />
+        <!--为您推荐-->
+        <view class="coreshop-recommended-title-view">
+            <view class="u-flex u-flex-wrap">
+                <view class="u-flex-4 u-text-right">
+                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
-                <view class="basis-xs text-center">
-                    <text class="text-black text-lg">其他推荐</text>
+                <view class="u-flex-4 u-text-center">
+                    <text class="coreshop-text-black u-font-lg">为您推荐</text>
                 </view>
-                <view class="basis-sm text-left">
-                    <image class="img-aau" src="/static/images/common/aau.png" lazy-load mode="widthFix" />
+                <view class="u-flex-4 u-text-left">
+                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
             </view>
+        </view>
 
-            <view class="margin-bottom coreshop-goods-list-box">
-                <view class="grid col-2">
-                    <block v-for="(items,indexs) in otherRecommendData" :key="indexs">
-                        <view class="list-itme" @click="goGoodsDetail(items.id)">
-                            <view class="bg-white list-radius">
-                                <view class="goods-img">
-                                    <view class="cu-avatar" :style="[{backgroundImage:'url('+ items.image +')'}]" />
-                                    <view class="mold-view" v-if="items.mold">
-                                        <text class="cu-tag radius sm bg-mauve">自营</text>
-                                    </view>
-                                </view>
-                                <view class="view-goods-info">
-                                    <view class="text-cut text-black text-sm margin-bottom-sm">{{items.name}}</view>
-                                    <view class="text-price text-red text-lg">
-                                        {{items.price}}元  <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{items.mktprice}}元</span>
-                                    </view>
-                                </view>
-                            </view>
+         <!--推荐列表-->
+        <view class="coreshop-goods-group" v-if="otherRecommendData.length>0">
+            <u-grid col="2" :border="false" :align="center">
+                <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in otherRecommendData" :key="index" @click="goGoodsDetail(item.id)">
+                    <view class="good_box">
+                        <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
+                        <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
+                        <view class="good_title u-line-2">
+                            {{item.name}}
                         </view>
-                    </block>
-                </view>
-            </view>
+                        <view class="good-price">
+                            {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
+                        </view>
+                        <view class="good-tag-recommend" v-if="item.isRecommend">
+                            推荐
+                        </view>
+                        <view class="good-tag-hot" v-if="item.isHot">
+                            热门
+                        </view>
+                    </view>
+                </u-grid-item>
+            </u-grid>
         </view>
 
 
 
-
-        <view class="cu-modal bottom-modal coreshop-bottom-modal-box" :class="bottomModal?'show':''">
-            <view class="cu-dialog bg-white">
+        <!--弹出框-->
+        <u-popup class="coreshop-bottom-popup-box"  v-model="bottomModal" mode="bottom">
+            <view class="radius coreshop-bg-white">
                 <!--标题-->
-                <view class="text-black text-center margin-tb text-lg coreshop-title-bar">
+                <view class="coreshop-text-black u-text-center u-margin-top-30 u-margin-bottom-30 u-font-lg coreshop-title-bar">
                     <text>{{modalTitle}}</text>
-                    <text class="cuIcon-close close-icon" @tap="hideModal"></text>
+                    <u-icon name="close"  @tap="hideModal" class="close-icon"></u-icon>
                 </view>
-
                 <!--内容区域-->
                 <view class="coreshop-modal-content">
-
                     <!--服务区域-->
-                    <view class="coreshop-view-box service" v-if="modalType=='service'">
+                    <view class="coreshop-common-view-box service" v-if="modalType=='service'">
                         <view v-for="(item, index) in serviceDescription.service" :key="index">
                             <view class="text-view">
-                                <text class="cuIcon-title text-red" />
-                                <text class="text-cut text-black">{{item.title}}</text>
+                                <text class="cuIcon-title coreshop-text-red" />
+                                <text class="u-line-1 coreshop-text-black">{{item.title}}</text>
                             </view>
-                            <view class="text-sm text-list-view">
-                                <view class="margin-left text-cut text-gray">{{item.description}}</view>
+                            <view class="u-font-sm text-list-view">
+                                <view class="margin-left u-line-1 coreshop-text-gray">{{item.description}}</view>
                             </view>
                         </view>
                     </view>
 
                     <!--促销区域-->
-                    <view class="coreshop-view-box promotion" v-if="modalType=='promotion'">
+                    <view class="coreshop-common-view-box promotion" v-if="modalType=='promotion'">
                         <view class="text-view" v-for="(item, index) in promotion" :key="index">
                             <text class="cu-tag line-orange radius sm">{{item.name}}</text>
-                            <text class="margin-left-xs text-cut text-black">{{item.name}}</text>
+                            <text class="u-margin-left-20 u-line-1 coreshop-text-black">{{item.name}}</text>
                         </view>
                     </view>
 
                     <!--选择规格-->
-                    <view class="coreshop-view-box select hide" :class="modalType=='select' ?'show':''">
+                    <view class="coreshop-common-view-box select hide" :class="modalType=='select' ?'show':''">
                         <!--商品信息-->
-                        <view class="cu-list menu-avatar">
-                            <view class="cu-item">
-                                <view class="cu-avatar radius lg" :style="[{backgroundImage:'url('+ product.images +')'}] " />
+                        <view class="coreshop-list menu-avatar">
+                            <view class="coreshop-list-item">
+                                <view class="coreshop-avatar radius lg" :style="[{backgroundImage:'url('+ product.images +')'}] " />
                                 <view class="content">
-                                    <view class="text-price-view">
-                                        <text class="text-price text-red margin-right-xs">{{ product.price || ''}}</text>
-                                        <text class="text-sm text-gray text-through">￥{{ product.mktprice || ''}}</text>
-                                        <text class="cu-tag bg-gradual-red radius sm">
-                                            <text class="cuIcon-hotfill" />
-                                            <text>秒杀中</text>
-                                        </text>
+                                    <view class="coreshop-text-price-view">
+                                        <text class="coreshop-text-price coreshop-text-red u-margin-right-20">{{ product.price || ''}}</text>
+                                        <text class="u-font-sm coreshop-text-gray coreshop-text-through u-margin-right-20">￥{{ product.mktprice || ''}}</text>
+                                        <u-tag text="秒杀中" mode="plain" type="error" shape="circle" size="mini"/>
                                     </view>
-                                    <view class="text-black text-sm flex">
-                                        <view class="text-cut">已选: {{ product.spesDesc || '无'}}</view>
+                                    <view class="coreshop-text-black u-font-sm flex">
+                                        <view class="u-line-1">已选: {{ product.spesDesc || '无'}}</view>
                                     </view>
                                 </view>
                             </view>
@@ -363,7 +324,7 @@
                         <view class="coreshop-select-btn-list-box">
                             <spec :spesData="defaultSpesDesc" ref="spec" @changeSpes="changeSpes"></spec>
                             <view class="select-item">
-                                <view class="text-black">数量</view>
+                                <view class="coreshop-text-black">数量</view>
                                 <view class="select-btn">
                                     <u-number-box v-model="buyNum" :min="minNums" :max="product.stock"></u-number-box>
                                 </view>
@@ -372,96 +333,75 @@
                     </view>
 
                     <!--公共按钮-->
-                    <view class="coreshop-modal-footer-fixed" v-if="modalType=='select'">
-                        <view class="flex flex-direction">
-                            <u-button type="error" size="medium" hover-class="btn-hover2" @click="clickHandle()" :disabled='submitStatus' :loading='submitStatus' v-if="product.stock>0">确定</u-button>
-                            <u-button type="default" size="medium" v-else>已售罄</u-button>
-                        </view>
+                    <view class="u-padding-30 u-text-center" v-if="modalType=='select'">
+                        <u-button type="error" :custom-style="customStyle" size="medium"  @click="clickHandle()" :disabled='submitStatus' :loading='submitStatus' v-if="product.stock>0">确定</u-button>
+                        <u-button type="default" size="medium" v-else>已售罄</u-button>
                     </view>
                 </view>
             </view>
-        </view>
+        </u-popup>
         <!--占位底部距离-->
-        <view class="cu-tabbar-height" />
+        <view class="coreshop-tabbar-height" />
+
         <!--底部操作-->
-        <view class="coreshop-footer-fixed">
-            <view class="cu-bar bg-white tabbar border shop">
-                <!-- 客服按钮 -->
+        <view class="coreshop-good-footer-fixed">
+            <view class="tabbar">
+                 <!-- 客服按钮 -->
                 <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-                <view class="action" @click="showChat()">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
+                <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 -->
-                <button class="action" hover-class="none" open-type="contact" bindcontact="showChat" :session-from="kefupara">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
-                </button>
-                <!-- #endif -->
-                <!-- #ifdef MP-ALIPAY -->
-                <view class="action">
-                    <contact-button class="goods-bottom-ic icon" icon="/static/images/customerservice.png" size="80rpx*80rpx" tnt-inst-id="WKPKUZXG" scene="SCE00040186" hover-class="none" />
+                <view class="action" >
+                    <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
                 </view>
                 <!-- #endif -->
-                <!-- #ifdef MP-TOUTIAO -->
-                <view class="action" @click="showChat()">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
+                <view class="action"  @click="collection">
+                    <u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
                 </view>
-                <!-- #endif -->
-                <button class="action" @click="collection">
-                    <view :class="isfav ? 'cuIcon-favorfill':'cuIcon-favor'" />
-                    <view v-if="!isfav">收藏</view>
-                    <view v-if="isfav">已收藏</view>
-                </button>
+
                 <view class="action" @click="redirectCart">
-                    <view class="cuIcon-cart">
-                        <view class="cu-tag badge" v-if="cartNums">{{cartNums}}</view>
-                    </view>
-                    <text>购物车</text>
+                    <u-badge class="car-num" :count="cartNums?cartNums:0" type="error" :offset="[-3, -6]"></u-badge>
+				    <u-icon name="shopping-cart" :size="40"  label="购物车" :label-size="22" label-pos="bottom"></u-icon>
                 </view>
-                <view class="btn-group">
-                    <button class="cu-btn bg-mauve radius shadow-blur  y-f buyBtn" @tap="selectTap()">立即{{ typeName || '' }}</button>
+                <view class="btn-box">
+                    <u-button type="error" :custom-style="customStyle" size="medium" @click="selectTap()" shape="circle">立即{{ typeName || '' }}</u-button>
                 </view>
             </view>
         </view>
 
         <!-- 右边浮动球 -->
-        <corecms-fab horizontal="right" vertical="bottom" direction="vertical"></corecms-fab>
+        <coreshop-fab horizontal="right" vertical="bottom" direction="vertical"></coreshop-fab>
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
 
     </view>
 </template>
 <script>
     import { mapMutations, mapActions, mapState } from 'vuex';
-    import lvvPopup from '@/components/corecms-lvv-popup/corecms-lvv-popup.vue';
-    import corecmsFab from '@/components/corecms-fab/corecms-fab.vue';
-    import { get } from '@/common/utils/dbHelper.js';
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js';
+    import coreshopFab from '@/components/coreshop-fab/coreshop-fab.vue';
     import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js'
-    import spec from '@/components/corecms-spec/corecms-spec.vue';
+    import spec from '@/components/coreshop-spec/coreshop-spec.vue';
     // #ifdef H5
-    import shareByH5 from '@/components/corecms-share/shareByh5.vue';
+    import shareByH5 from '@/components/coreshop-share/shareByh5.vue';
     // #endif
     // #ifdef MP-WEIXIN
-    import shareByWx from '@/components/corecms-share/shareByWx.vue';
+    import shareByWx from '@/components/coreshop-share/shareByWx.vue';
     // #endif
     // #ifdef MP-TOUTIAO
-    import shareByTt from '@/components/corecms-share/shareByTt.vue';
+    import shareByTt from '@/components/coreshop-share/shareByTt.vue';
     // #endif
     // #ifdef MP-ALIPAY
-    import shareByAli from '@/components/corecms-share/shareByAli.vue';
+    import shareByAli from '@/components/coreshop-share/shareByAli.vue';
     // #endif
     // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import shareByApp from '@/components/corecms-share/shareByApp.vue';
+    import shareByApp from '@/components/coreshop-share/shareByApp.vue';
     // #endif
     export default {
         mixins: [goods, articles, commonUse, tools],
         components: {
-            lvvPopup,
-            corecmsFab,
+            coreshopFab,
             spec,
             // #ifdef H5
             shareByH5,
@@ -481,6 +421,9 @@
         },
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 bannerCur: 0,
                 current: 0, // init tab位
                 goodsId: 0, // 商品id
@@ -509,6 +452,7 @@
                 modalType: 'promotion',
                 selectType: '',
                 shareUrl: '/pages/share/jump/jump',
+                shareBox: false,
                 serviceDescription: {
                     commonQuestion: [],
                     delivery: [],
@@ -592,10 +536,10 @@
                 let pages = getCurrentPages();
                 let page = pages[pages.length - 1];
                 // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
-                return apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
                 // #endif
                 // #ifdef MP-ALIPAY
-                return apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&groupId=' + this.groupId;
                 // #endif
             },
             defaultSpesDesc() {
@@ -626,7 +570,7 @@
                     groupId: this.groupId
                 };
                 // 如果用户已经登录 要传用户token
-                let userToken = get('userToken');
+                let userToken = this.$db.get('userToken');
                 if (userToken) {
                     data['token'] = userToken;
                 }
@@ -852,10 +796,10 @@
             },
             // 跳转到h5分享页面
             goShare() {
-                this.$refs.share.show();
+                this.shareBox = true;
             },
             closeShare() {
-                this.$refs.share.close();
+                this.shareBox = false;
             },
             // 图片点击放大
             clickImg(imgs) {
@@ -977,6 +921,5 @@
     };
 </script>
 <style lang="scss">
-    @import '../../../../static/style/goodDetails.scss';
     .buyBtn { height: 74rpx; width: 90%; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.scss
new file mode 100644
index 0000000000000000000000000000000000000000..868a25b5b2ff37fbdbc52449398da4937f9b1931
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.scss
@@ -0,0 +1,18 @@
+.tab-box {
+    .tab-item { flex: 1; line-height: 84rpx; text-align: center; background: #636363; color: #fff; font-size: 28rpx; font-family: PingFang SC; font-weight: 500; color: #ffffff; position: relative; border-right: 1rpx solid #fff;
+        .tab-triangle { position: absolute; z-index: 2; bottom: -14rpx; left: 50%; transform: translateX(-50%); width: 28rpx; height: 28rpx; background: #e54d42; transform: rotate(45deg); transform-origin: center; }
+    }
+    .tab-active { background: #e54d42; }
+}
+
+.goods-item { margin-bottom: 2rpx;
+    .cu-progress { width: 225rpx; }
+    .progress-text { color: #999999; font-size: 20rpx; margin-left: 25rpx; }
+    .buy-btn { position: absolute; right: 0; bottom: -20rpx; width: 140rpx; height: 60rpx; border-radius: 30rpx; font-size: 26rpx; font-family: PingFang SC; font-weight: 400; padding: 0; }
+    .btn-ing { background: linear-gradient(45deg,#f43f3b,#ed1c24); box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); color: #ffffff; }
+}
+    .goods-item .btn-end,
+    .goods-item .btn-nostart { background: #eeeeee; color: #999999; }
+.activity-goods-box {
+    .goods-right { width: 480rpx; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
index 2cacf976ab462ec979ee5c1ad6d6661b6ada8016..86b016fbaef60f280e6392951dd8239432e3215f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="pageBox">
         <u-navbar title="限时秒杀"></u-navbar>
-        <view class="tab-box x-f">
+        <view class="tab-box coreshop-flex coreshop-align-center">
             <view class="tab-item" @tap="onTab(tab.id,tab.status)" :class="{ 'tab-active': tabCurrent === tab.id }" v-for="tab in tabList" :key="tab.id">
                 <text class="tab-title">{{ tab.title }}</text>
                 <text v-show="tabCurrent === tab.id" class="tab-triangle"></text>
@@ -10,47 +10,42 @@
         <view class="content-box">
             <scroll-view scroll-y="true" enable-back-to-top @scrolltolower="loadMore" class="scroll-box">
                 <view class="goods-item" v-for="item in goodsList" :key="item.id" v-if="goodsList.length>0">
-
-                    <view class="activity-goods-box x-bc">
+                    <view class="activity-goods-box u-flex u-row-between">
                         <view class="img-box">
                             <slot name="tag"></slot>
                             <image class="img" :src="item.image" mode="aspectFill"></image>
                         </view>
-                        <view class="goods-right y-bc">
+                        <view class="goods-right u-flex u-row-between coreshop-flex-direction">
                             <view class="title u-line-1">{{ item.name }}</view>
                             <view class="tip u-line-1">{{ item.brief }}</view>
                             <view class="slod-end">
-
-                                <view class="x-f">
-                                    <view class="cu-progress round sm">
-                                        <view class="progress--color" :style="[{ width: loading ? getProgress(item.buyPromotionCount, item.stock) : '' }]"></view>
-                                    </view>
+                                <view class="coreshop-flex coreshop-align-center">
+                                    <u-line-progress :striped="true" :percent="getPercent(item.buyPromotionCount, item.stock)" :striped-active="true" :show-percent="true" class="cu-progress"></u-line-progress>
                                     <view class="progress-text">已抢{{ getProgress(item.buyPromotionCount, item.stock) }}</view>
                                 </view>
-
                             </view>
                             <view class=" price-box">
-                                <view class="x-f">
+                                <view class="coreshop-flex coreshop-align-center">
                                     <view class="current">￥{{ item.price }}</view>
                                     <view class="original">￥{{ item.mktprice }}</view>
                                 </view>
                             </view>
-                            <button class="cu-btn buy-btn" :class="btnType[tabCurrent].color" v-if="tabCurrent=='ing'" @click="goSeckillDetail(item.id, item.groupId)">{{ btnType[tabCurrent].name }}</button>
-                            <button class="cu-btn buy-btn" :class="btnType[tabCurrent].color" v-else>{{ btnType[tabCurrent].name }}</button>
+                            <u-button type="error" class="buy-btn" size="mini" v-if="tabCurrent=='ing'" @click="goSeckillDetail(item.id, item.groupId)">{{ btnType[tabCurrent].name }}</u-button>
+                            <u-button type="error" class="buy-btn" size="mini" v-else>{{ btnType[tabCurrent].name }}</u-button>
                         </view>
                     </view>
 
                 </view>
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="暂无秒杀信息" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="暂无秒杀信息" mode="list"></u-empty>
                 </view>
                 <!-- 加载更多 -->
                 <u-loadmore :status="loadStatus" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
             </scroll-view>
         </view>
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
@@ -139,6 +134,16 @@
                 }
                 return unit;
             },
+            // 进度数
+            getPercent(sales, stock) {
+                let unit = 0;
+                if (stock + sales > 0) {
+                    let num = (sales / (sales + stock)) * 100;
+                } else {
+                    unit = 30;
+                }
+                return unit;
+            },
             // 加载更多
             loadMore() {
                 if (this.page < this.lastPage) {
@@ -180,20 +185,5 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../../../static/style/pinTuan.scss';
-    .tab-box .tab-item { flex: 1; line-height: 84rpx; text-align: center; background: #636363; color: #fff; font-size: 28rpx; font-family: PingFang SC; font-weight: 500; color: #ffffff; position: relative; border-right: 1rpx solid #fff; }
-        .tab-box .tab-item .tab-triangle { position: absolute; z-index: 2; bottom: -14rpx; left: 50%; transform: translateX(-50%); width: 28rpx; height: 28rpx; background: #e54d42; transform: rotate(45deg); transform-origin: center; }
-    .tab-box .tab-active { background: #e54d42; }
-    .goods-item { margin-bottom: 2rpx; }
-        .goods-item .cu-progress { width: 225rpx; height: 16rpx; }
-            .goods-item .cu-progress .progress--color { background: #e54d42; }
-        .goods-item .progress-text { color: #999999; font-size: 20rpx; margin-left: 25rpx; }
-        .goods-item .buy-btn { position: absolute; right: 0; bottom: -20rpx; width: 140rpx; height: 60rpx; border-radius: 30rpx; font-size: 26rpx; font-family: PingFang SC; font-weight: 400; padding: 0; }
-        .goods-item .btn-end,
-        .goods-item .btn-nostart { background: #eeeeee; color: #999999; }
-        .goods-item .btn-ing { background: linear-gradient(45deg,#f43f3b,#ed1c24); box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); color: #ffffff; }
-
-
-
-    .activity-goods-box .goods-right { width: 480rpx; }
+    @import "list.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.scss b/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.scss
new file mode 100644
index 0000000000000000000000000000000000000000..b27b3aaf66537c501ca98c9f050b743cc806b543
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.scss
@@ -0,0 +1,6 @@
+
+.article-title { font-size: 32upx; color: #333; margin: 20upx 0upx; position: relative; text-align: center; }
+.article-time { margin-top: 10rpx; font-size: 22rpx; text-align: center; }
+
+.u-content { margin-top: 20rpx; color: $u-content-color; font-size: 28rpx; line-height: 1.8; }
+    .u-content p { color: $u-tips-color; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue
index 42cf3fac05745fb8d632f7dd808034649199ff31..da601e50244791c210513c4a7abadf026299b6d0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue
@@ -2,26 +2,27 @@
     <!-- 页面主体 -->
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar :title="title"></u-navbar>
-        <view class="page-body">
+        <u-navbar :custom-back="goBack" :title="title"></u-navbar>
+        <view class="coreshop-bg-white u-padding-20 u-margin-20">
             <u-image width="100%" height="300rpx" v-if="info.coverImage" :src="info.coverImage && info.coverImage!='null' ?  info.coverImage+'?x-oss-process=image/resize,m_lfit,h_320,w_240' : '/static/images/common/empty-banner.png'"></u-image>
             <view class="article-title">
                 {{ info.title }}
             </view>
             <view class="article-time" v-if="info.createTime">{{ info.createTime }}</view>
+            <u-line color="info" border-style="dashed" margin="20rpx 0" />
             <view class="u-content">
                 <u-parse :html="contentBody" :selectable="true"></u-parse>
             </view>
         </view>
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
 <script>
+    import { tools } from '@/common/mixins/mixinsHelper.js';
     export default {
-        components: {
-        },
+        mixins: [tools],
         data() {
             return {
                 idType: 1, //1文章 2公告 3微信图文消息
@@ -35,10 +36,6 @@
         onLoad(e) {
             this.idType = e.idType;
             this.id = e.id;
-
-            console.log(e.idType);
-            console.log(e.id);
-
             if (!this.idType && !this.id) {
                 this.$refs.uToast.show({ title: '获取失败', type: 'error', isTab: true, url: '/pages/index/default/default' });
             } else if (this.idType == 1) {
@@ -150,11 +147,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .page-body { background: #FFFFFF; border-top-left-radius: 38rpx; border-top-right-radius: 38rpx; margin: 25rpx; padding: 25rpx; }
-
-    .article-title { font-size: 32upx; color: #333; margin: 20upx 0upx; position: relative; text-align: center; }
-    .article-time { margin-top: 10rpx; font-size: 22rpx; text-align: center; }
-
-    .u-content { margin-top: 20rpx; color: $u-content-color; font-size: 28rpx; line-height: 1.8; }
-        .u-content p { color: $u-tips-color; }
+    @import "details.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.scss
new file mode 100644
index 0000000000000000000000000000000000000000..4698e39fc789ff2a726961d5206a91dea276fedf
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.scss
@@ -0,0 +1,11 @@
+.help-bg { height: 350rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; border-radius: 0 0 50rpx 50rpx; }
+.help-body { margin-top: -300rpx; padding: 25rpx;
+    .help-h3 { font-size: 45rpx; color: #FFFFFF !important; margin: 20rpx 20rpx; }
+    .help-content-box { background-color: #fff; min-height: 150rpx; }
+}
+
+
+.u-page-item { font-size: 28rpx; color: #333; padding: 10rpx 0rpx; }
+.u-card-wrap { background-color: $u-bg-color; padding: 1px; }
+.u-body-item { font-size: 28rpx; color: #333; padding: 20rpx 10rpx; }
+    .u-body-item image { width: 50rpx; flex: 0 0 50rpx; height: 50rpx; border-radius: 8rpx; margin-right: 12rpx; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue
index 74af3783e2b4c9ece72f3d16ca1f90770a93e850..9208dd8373952603720ff5fabe61020f76f2d9b2 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue
@@ -1,27 +1,38 @@
 <template>
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar :title="typeName"></u-navbar>
-        <view class="help-bg bg-red"></view>
+        <u-navbar :custom-back="goBack" :title="typeName"></u-navbar>
+        <view class="help-bg coreshop-bg-red"></view>
         <view class="help-body">
             <view class="help-h3">帮助中心</view>
             <u-tabs :list="articleType" :is-scroll="false" :current="current" @change="change"></u-tabs>
-            <view class="groupBox">
-                <u-cell-group class="u-padding-top-20 u-padding-bottom-20">
-                    <u-cell-item icon="list-dot" :title="item.title" v-for="item in list" :key="item.id" @click="goArticleDetail(item.id)"></u-cell-item>
-                </u-cell-group>
-                <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="0" margin-bottom="20" class="u-padding-top-20" />
-            </view>
+
+            <u-card :title="articleType[current].name">
+                <view class="" slot="body">
+                    <view class="u-body-item u-flex u-border-bottom u-row-between u-flex-nowrap" v-for="item in list" :key="item.id" @click="goArticleDetail(item.id)">
+                        <view class="u-flex u-flex-nowrap">
+                            <u-image width="50rpx" height="50rpx" :src="item.coverImage" mode="aspectFill" class="u-margin-right-10"></u-image>
+                            <view class="u-body-item-title u-line-2">{{item.title}}</view>
+                        </view>
+                        <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                            <u-icon name="arrow-right-double"></u-icon>
+                        </view>
+                    </view>
+                </view>
+                <view class="" slot="foot">
+                    <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="0" margin-bottom="20" class="u-padding-top-20" />
+                </view>
+            </u-card>
         </view>
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
 <script>
-    import { articles } from '@/common/mixins/mixinsHelper.js';
+    import { articles, tools } from '@/common/mixins/mixinsHelper.js';
     export default {
-        mixins: [articles],
+        mixins: [articles, tools],
         data() {
             return {
                 cid: 0, // 文章分类id
@@ -42,7 +53,7 @@
         },
         onLoad(options) {
             if (options.cid) {
-                this.cid = options.cid;
+                this.cid = Number(options.cid);
             } else {
                 this.cid = 1;
             }
@@ -68,6 +79,11 @@
                 this.$u.api.articleList(data).then(res => {
                     if (res.status) {
                         this.articleType = res.data.articleType;
+                        for (var i = 0; i < this.articleType.length; i++) {
+                            if (this.cid === this.articleType[i].id) {
+                                this.current = i;
+                            }
+                        }
                         this.typeName = res.data.typeName;
                         const _list = res.data.list;
                         this.list = [...this.list, ..._list];
@@ -98,8 +114,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .help-bg { height: 350rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; border-radius: 0 0 50rpx 50rpx; }
-    .help-body { margin-top: -300rpx; padding: 25rpx; }
-    .help-h3 { font-size: 45rpx; color: #FFFFFF !important; margin: 20rpx 20rpx; }
-    .groupBox { background-color: #fff; min-height: 150rpx; }
+    @import "list.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.scss
new file mode 100644
index 0000000000000000000000000000000000000000..2b0486595db46c8f3b964e3d8767a722fe022f5a
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.scss
@@ -0,0 +1,25 @@
+
+.u-wrap { height: calc(100vh); /* #ifdef H5 */ height: calc(100vh - var(--window-top)); /* #endif */ display: flex; flex-direction: column; }
+.u-search-box { padding: 18rpx 30rpx; background: #fff; }
+.u-menu-wrap { flex: 1; display: flex; overflow: hidden; }
+.u-search-inner { background-color: rgb(234, 234, 234); border-radius: 100rpx; display: flex; align-items: center; padding: 10rpx 16rpx; }
+.u-search-text { font-size: 26rpx; color: $u-tips-color; margin-left: 10rpx; }
+.u-tab-view { width: 250rpx; height: 100%; background: #f6f6f6; }
+.u-tab-item { height: 110rpx; background: #f6f6f6; box-sizing: border-box; display: flex; align-items: center; justify-content: center; font-size: 26rpx; color: #444; font-weight: 400; line-height: 1; }
+.u-tab-item-active { position: relative; color: #000; font-weight: 600; background: #fff; }
+    .u-tab-item-active::before { content: ""; position: absolute; border-left: 4px solid #e02e24; height: 32rpx; left: 0; top: 39rpx; }
+.right-box { background-color: rgb(250, 250, 250); }
+.page-view { padding: 16rpx; }
+.class-item { margin-bottom: 30rpx; background-color: #fff; padding: 16rpx; border-radius: 8rpx; }
+.item-title { font-size: 26rpx; color: $u-main-color; font-weight: bold; }
+.item-menu-name { font-weight: normal; font-size: 24rpx; color: $u-main-color; margin-top: 15rpx; }
+.item-container { display: flex; flex-wrap: wrap; }
+.thumb-box { width: 33.333333%; display: flex; align-items: center; justify-content: center; flex-direction: column; margin-top: 20rpx; }
+.item-menu-image { width: 120rpx; height: 120rpx; }
+
+.slot-wrap { display: flex; align-items: center; padding: 0 20rpx; }
+
+
+
+
+.u-row { margin: 40rpx 0; }
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue
index d9136fcb477feace3f47462b6b396094249c251c..9e43cf5104fe9fabbf25b99c508835eed9ea038c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue
@@ -7,7 +7,31 @@
             </view>
         </u-navbar>
 
-        <view class="u-menu-wrap">
+        <view class="u-padding-20" v-if="CateStyle==1">
+            <u-row gutter="16">
+                <u-col span="12" v-for="(item,index) in tabbar" :key="index" @click="goClass(item.id)">
+                    <u-image width="100%" height="300rpx" :src="item.imageUrl">
+                        <u-loading slot="loading"></u-loading>
+                    </u-image>
+                    <view class="u-text-center u-padding-top-30 u-padding-bottom-30">
+                        {{item.name}}
+                    </view>
+                </u-col>
+            </u-row>
+        </view>
+        <view class="u-padding-top-20 u-padding-bottom-20" v-if="CateStyle==2">
+            <u-row gutter="16">
+                <u-col span="4" v-for="(item,index) in tabbar" :key="index" @click="goClass(item.id)">
+                    <u-image width="100%" height="210rpx" :src="item.imageUrl">
+                        <u-loading slot="loading"></u-loading>
+                    </u-image>
+                    <view class="u-text-center u-padding-top-30 u-padding-bottom-30">
+                        {{item.name}}
+                    </view>
+                </u-col>
+            </u-row>
+        </view>
+        <view class="u-menu-wrap" v-if="CateStyle==3">
             <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop">
                 <view v-for="(item,index) in tabbar" :key="index" class="u-tab-item" :class="[current==index ? 'u-tab-item-active' : '']"
                       :data-current="index" @tap.stop="swichMenu(index)">
@@ -34,8 +58,9 @@
                 </scroll-view>
             </block>
         </view>
+
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 <script>
@@ -169,24 +194,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    page { background: #fff; }
-    .u-wrap { height: calc(100vh); /* #ifdef H5 */ height: calc(100vh - var(--window-top)); /* #endif */ display: flex; flex-direction: column; }
-    .u-search-box { padding: 18rpx 30rpx; background: #fff; }
-    .u-menu-wrap { flex: 1; display: flex; overflow: hidden; }
-    .u-search-inner { background-color: rgb(234, 234, 234); border-radius: 100rpx; display: flex; align-items: center; padding: 10rpx 16rpx; }
-    .u-search-text { font-size: 26rpx; color: $u-tips-color; margin-left: 10rpx; }
-    .u-tab-view { width: 250rpx; height: 100%; background: #f6f6f6; }
-    .u-tab-item { height: 110rpx; background: #f6f6f6; box-sizing: border-box; display: flex; align-items: center; justify-content: center; font-size: 26rpx; color: #444; font-weight: 400; line-height: 1; }
-    .u-tab-item-active { position: relative; color: #000; font-weight: 600; background: #fff; }
-        .u-tab-item-active::before { content: ""; position: absolute; border-left: 4px solid #e02e24; height: 32rpx; left: 0; top: 39rpx; }
-    .right-box { background-color: rgb(250, 250, 250); }
-    .page-view { padding: 16rpx; }
-    .class-item { margin-bottom: 30rpx; background-color: #fff; padding: 16rpx; border-radius: 8rpx; }
-    .item-title { font-size: 26rpx; color: $u-main-color; font-weight: bold; }
-    .item-menu-name { font-weight: normal; font-size: 24rpx; color: $u-main-color; margin-top: 15rpx; }
-    .item-container { display: flex; flex-wrap: wrap; }
-    .thumb-box { width: 33.333333%; display: flex; align-items: center; justify-content: center; flex-direction: column; margin-top: 20rpx; }
-    .item-menu-image { width: 120rpx; height: 120rpx; }
-
-    .slot-wrap { display: flex; align-items: center; padding: 0 20rpx; }
+    @import "index.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss
new file mode 100644
index 0000000000000000000000000000000000000000..82a4615ad3a41cd62e6af0300b729fc652dcd672
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss
@@ -0,0 +1,32 @@
+.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 */ }
+
+.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; }
+.good_title { font-size: 26rpx; margin-top: 5px; color: $core-main-color; }
+.good_title-xl { font-size: 28rpx; margin-top: 5px; color: $core-main-color; }
+.good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 15rpx; left: 15rpx; background-color: $core-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 4rpx 14rpx; border-radius: 50rpx; font-size: 20rpx; line-height: 1; }
+.good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 15rpx; right: 15rpx; background-color: $core-type-primary; color: #FFFFFF; margin-left: 10px; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
+.good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 15rpx; left: 15rpx; background-color: $core-type-primary; color: #FFFFFF; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
+.good-price { font-size: 30rpx; color: $core-type-error; margin-top: 5px; }
+.good-des { font-size: 22rpx; color: $core-tips-color; margin-top: 5px; }
+.contentBody { position: relative; }
+.btnCart { position: absolute; bottom: 5rpx; right: 10rpx; }
+
+.fliter-item-title { padding: 20upx 26upx 20upx 0; width: 724upx; margin-left: 26upx; border-bottom: 2upx solid #f3f3f3; position: relative; background-color: #fff; color: #333; display: flex; min-height: 90upx; align-items: center; justify-content: space-between; }
+.fliter-item-title-hd { display: flex; /* vertical-align: middle; */ align-items: center; font-size: 28upx; position: relative; }
+
+.fliter-item-title-hd-title { /* float: left; */ display: inline-block; position: relative; /* #ifdef MP-ALIPAY */ top: 4upx; /* #endif */ }
+
+
+.fliter-c { }
+.fliter-item { }
+    .fliter-item .fliter-item-title { border-bottom: none; }
+.fliter-i-c { padding: 0 26upx; overflow: hidden; }
+.fic-item { display: inline-block; float: left; width: 160upx; margin-right: 14upx; height: 70upx; background-color: #f1f1f1; text-align: center; font-size: 24upx; margin-bottom: 14upx; color: #333; padding: 0 10upx; }
+.fic-item-active { background-color: #ff7159; color: #fff; }
+.fic-item-text { position: relative; top: 50%; transform: translateY(-50%); }
+.fic-item:nth-child(4n) { margin-right: 0; }
+.fic-item-line { float: left; margin: 34upx 18upx 0 0; width: 50upx; height: 2upx; border-bottom: 2upx solid #ccc; }
+.fic-item-input { position: relative; top: 50%; transform: translateY(-50%); }
+
+.coreshop-bottomBox { text-align: center; height: 120rpx; }
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 fad3ab96219c18e459b99516e6c94906f6fca1a3..1efb791fd7ec1fff40d3608b6a7b03486f75cd4d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
@@ -4,14 +4,14 @@
         <u-navbar :title="title"></u-navbar>
 
         <!-- 条件筛选 -->
-        <view class="u-row-center bg-white">
+        <view class="u-row-center coreshop-bg-white">
             <u-dropdown ref="uDropdown">
                 <u-dropdown-item v-model="comprehensiveDataValue" title="综合" :options="comprehensiveData" @change="comprehensive"></u-dropdown-item>
                 <u-dropdown-item v-model="priceSortDataValue" title="价格" :options="priceSortData" @change="priceSort"></u-dropdown-item>
                 <u-dropdown-item v-model="salesVolumeDataValue" title="销量" :options="salesVolumeData" @change="salesVolume"></u-dropdown-item>
                 <u-dropdown-item v-model="current" title="显示" :options="currentData"></u-dropdown-item>
                 <u-dropdown-item title="其他">
-                    <view class="slot-content bg-white">
+                    <view class="slot-content coreshop-bg-white">
                         <view class="fliter-c u-padding-10 u-margin-bottom-80 u-padding-bottom-60">
                             <view class="fliter-item">
                                 <view class="fliter-item-title">
@@ -94,7 +94,7 @@
                                         {{item.name}}
                                     </view>
                                     <view class="good-price">
-                                        {{item.price}}元 <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{item.mktprice}}元</span>
+                                        {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
                                     </view>
                                     <view class="good-tag-recommend" v-if="item.isRecommend">
                                         推荐
@@ -109,7 +109,7 @@
                     </view>
                     <!-- 无数据时默认显示 -->
                     <view class="coreshop-emptybox" v-else>
-                        <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="当前列表为空" mode="list"></u-empty>
+                        <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="当前列表为空" mode="list"></u-empty>
                     </view>
                 </view>
 
@@ -135,7 +135,7 @@
                                                 {{item.name}}
                                             </view>
                                             <view class="good-price u-padding-10">
-                                                {{item.price}}元 <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{item.mktprice}}元</span>
+                                                {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
                                             </view>
                                             <view class="good-des u-padding-10" v-if="item.commentsCount > 0">
                                                 {{ item.commentsCount }}条评论
@@ -152,14 +152,14 @@
                         <u-loadmore :status="loadStatus" :icon-type="loadIconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
                     </view>
                     <view class="coreshop-emptybox" v-else>
-                        <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="当前列表为空" mode="list"></u-empty>
+                        <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="当前列表为空" mode="list"></u-empty>
                     </view>
                 </view>
             </scroll-view>
         </view>
         <u-back-top :scroll-top="scrollTop" :duration="300"></u-back-top>
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
@@ -655,36 +655,5 @@
 </script>
 
 <style scoped lang="scss">
-    .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 */ }
-
-    .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; }
-    .good_title { font-size: 26rpx; margin-top: 5px; color: $u-main-color; }
-    .good_title-xl { font-size: 28rpx; margin-top: 5px; color: $u-main-color; }
-    .good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 15rpx; left: 15rpx; background-color: $u-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 4rpx 14rpx; border-radius: 50rpx; font-size: 20rpx; line-height: 1; }
-    .good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 15rpx; right: 15rpx; background-color: $u-type-primary; color: #FFFFFF; margin-left: 10px; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
-    .good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 15rpx; left: 15rpx; background-color: $u-type-primary; color: #FFFFFF; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
-    .good-price { font-size: 30rpx; color: $u-type-error; margin-top: 5px; }
-    .good-des { font-size: 22rpx; color: $u-tips-color; margin-top: 5px; }
-    .contentBody { position: relative; }
-    .btnCart { position: absolute; bottom: 5rpx; right: 10rpx; }
-
-    .fliter-item-title { padding: 20upx 26upx 20upx 0; width: 724upx; margin-left: 26upx; border-bottom: 2upx solid #f3f3f3; position: relative; background-color: #fff; color: #333; display: flex; min-height: 90upx; align-items: center; justify-content: space-between; }
-    .fliter-item-title-hd { display: flex; /* vertical-align: middle; */ align-items: center; font-size: 28upx; position: relative; }
-
-    .fliter-item-title-hd-title { /* float: left; */ display: inline-block; position: relative; /* #ifdef MP-ALIPAY */ top: 4upx; /* #endif */ }
-
-
-    .fliter-c { }
-    .fliter-item { }
-        .fliter-item .fliter-item-title { border-bottom: none; }
-    .fliter-i-c { padding: 0 26upx; overflow: hidden; }
-    .fic-item { display: inline-block; float: left; width: 160upx; margin-right: 14upx; height: 70upx; background-color: #f1f1f1; text-align: center; font-size: 24upx; margin-bottom: 14upx; color: #333; padding: 0 10upx; }
-    .fic-item-active { background-color: #ff7159; color: #fff; }
-    .fic-item-text { position: relative; top: 50%; transform: translateY(-50%); }
-    .fic-item:nth-child(4n) { margin-right: 0; }
-    .fic-item-line { float: left; margin: 34upx 18upx 0 0; width: 50upx; height: 2upx; border-bottom: 2upx solid #ccc; }
-    .fic-item-input { position: relative; top: 50%; transform: translateY(-50%); }
-
-    .coreshop-bottomBox { text-align: center; height: 120rpx; }
+    @import "list.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/coupon/coupon.scss b/CoreCms.Net.Uni-App/CoreShop/pages/coupon/coupon.scss
new file mode 100644
index 0000000000000000000000000000000000000000..1367b2d40a801132f7928203b804014967868fd5
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/coupon/coupon.scss
@@ -0,0 +1,10 @@
+page { background: #fff; }
+.coreshop-coupon {
+    .coreshop-coupon-card-view { position: relative; position: relative; margin: 27.27rpx 27.27rpx 0;
+        .card-num-view { position: relative; background: #FFECED; border-radius: 0 0 14.54rpx 14.54rpx; border-top: 2rpx dashed #dedbdb; padding: 10.9rpx 27.27rpx; color: #999898;
+            .btnUnfold { position: absolute; right: 27.27rpx; top: 14.54rpx; }
+        }
+        .card-num-view::before { content: ''; position: absolute; width: 36.36rpx; height: 36.36rpx; background: #ffffff; border-radius: 50%; top: -18.18rpx; left: -18.18rpx; }
+        .card-num-view::after { content: ''; position: absolute; width: 36.36rpx; height: 36.36rpx; background: #ffffff; border-radius: 50%; top: -18.18rpx; right: -18.18rpx; }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/coupon/coupon.vue b/CoreCms.Net.Uni-App/CoreShop/pages/coupon/coupon.vue
index 7676b6ca85a4214733ead25e01f0d6bbdb2e38e9..fc3b6d37384f279d4888e97f37678fa26c9faebc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/coupon/coupon.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/coupon/coupon.vue
@@ -2,31 +2,31 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="优惠券"></u-navbar>
-        <view class="content">
+        <view class="coreshop-coupon">
             <view v-if="list.length">
                 <view v-for="(item, key) in list" :key="key">
-                    <view class="coreshop-sponsored-card-view" :class="item.maxRecevieNums > 0 && item.getNumber >= item.maxRecevieNums ?'coreshop-lower-shelf':''">
+                    <view class="coreshop-coupon-card-view" :class="item.maxRecevieNums > 0 && item.getNumber >= item.maxRecevieNums ?'coreshop-lower-shelf':''">
                         <view class="img-lower-box" v-if="item.maxRecevieNums > 0 && item.getNumber >= item.maxRecevieNums ">已领完</view>
                         <view class="card-price-view">
-                            <view class="text-red price-left-view">
+                            <view class="coreshop-text-red price-left-view">
                                 <image class="icon" src="/static/images/coupon/coupon-element.png" mode=""></image>
                             </view>
                             <view class="name-content-view">
-                                <view class="text-cut text-red"> {{item.name}}</view>
-                                <view class="text-xs">
+                                <view class="u-line-1 coreshop-text-red"> {{item.name}}</view>
+                                <view class="u-font-xs">
                                     优惠方式：<text v-for="(itemResult, index) in item.results" :key="index">{{itemResult}}</text>
                                 </view>
-                                <view class="text-xs">领取时间：{{$u.timeFormat(item.startTime, 'yyyy-mm-dd')}} - {{$u.timeFormat(item.endTime, 'yyyy-mm-dd')}}</view>
+                                <view class="u-font-xs">领取时间：{{$u.timeFormat(item.startTime, 'yyyy-mm-dd')}} - {{$u.timeFormat(item.endTime, 'yyyy-mm-dd')}}</view>
                             </view>
                             <view class="btn-right-view">
-                                <button class="cu-btn bg-red round sm" @click="receiveCoupon(item.id)">立即领取</button>
+                                <u-button type="success" shape="circle" size="mini" @click="receiveCoupon(item.id)">立即领取</u-button>
                             </view>
                         </view>
                         <view class="card-num-view">
-                            <view class="text-xs">
+                            <view class="u-font-xs">
                                 <text v-for="(itemCondition, index) in item.conditions" :key="index">【{{itemCondition}}】</text>
                             </view>
-                            <text class="cuIcon-unfold btnUnfold" />
+                            <u-icon name="arrow-down-fill" class="btnUnfold" size="28"></u-icon>
                         </view>
                     </view>
                 </view>
@@ -36,15 +36,15 @@
                 <view class="page-box">
                     <view>
                         <view class="coreshop-emptybox">
-                            <u-empty :src="$apiFilesUrl+'/static/images/empty/coupon.png'" icon-size="300" mode="order" text="暂无优惠券可领取"></u-empty>
-                            <navigator class="coreshop-btn" url="/pages/category/index/index" hover-class="btn-hover" open-type="switchTab">随便逛逛</navigator>
+                            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/coupon.png'" icon-size="300" mode="order" text="暂无优惠券可领取"></u-empty>
+                            <navigator class="coreshop-btn" url="/pages/category/index/index"  open-type="switchTab">随便逛逛</navigator>
                         </view>
                     </view>
                 </view>
             </view>
         </view>
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
@@ -106,10 +106,10 @@
             // 用户领取优惠券
             receiveCoupon(couponId) {
                 let _this = this;
-                let corecmsdata = {
+                let coreshopdata = {
                     id: couponId
                 }
-                this.$u.api.getCoupon(corecmsdata).then(res => {
+                this.$u.api.getCoupon(coreshopdata).then(res => {
                     if (res.status) {
                         _this.$refs.uToast.show({ title: res.msg, type: 'success' })
                     } else {
@@ -122,5 +122,5 @@
 </script>
 
 <style lang="scss">
-    @import '../../static/style/coupon.scss';
+    @import 'coupon.scss';
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.scss b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.scss
new file mode 100644
index 0000000000000000000000000000000000000000..ec57e7928ac61285b7af24261318e751bf796cb3
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.scss
@@ -0,0 +1,65 @@
+.swiper, .video { height: 350rpx; }
+.banner, .swiper, .video { width: 100%; background-color: #fff; }
+    .banner image, .swiper swiper, .swiper swiper image, .video video { width: 100%; height: 100%; }
+.plaintext { padding: 20rpx 30rpx; font-size: 30rpx; color: #333; background-color: #fff; }
+
+/*商品界面*/
+.goods-box-item { overflow: hidden; padding: 20rpx 20rpx 20rpx 20rpx; border-bottom: 2rpx solid #eeeeee;
+    .goods-img { width: 150rpx; height: 150rpx; display: inline-block; float: left; }
+    .goods-right { width: 520rpx; display: inline-block; float: left; margin-left: 20rpx;
+        .goods-name { font-size: 30rpx; color: #333; overflow: hidden; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; }
+        .goods-mid { font-size: 24rpx; color: #999; }
+        .goods-buttom { overflow: hidden; position: relative; height: 60rpx;
+            .choose-specs { width: 136rpx; height: 48rpx; line-height: 46rpx; border-radius: 50rpx; margin: 0 auto; text-align: center; display: inline-block; overflow: hidden; box-sizing: border-box; float: right; font-size: 24rpx; border: 2rpx solid #ccc; position: relative; top: 12rpx; }
+            .order-num { display: block; min-width: 16rpx; height: 28rpx; line-height: 28rpx; background-color: #ff3b44; color: #fff; font-size: 16rpx; border-radius: 50rpx; position: absolute; right: 0rpx; top: 0rpx; padding: 0 6rpx; text-align: center; }
+        }
+        .goods-price { font-size: 28rpx; color: #eb0000; display: inline-block; }
+    }
+}
+    .goods-box-item:nth-last-child(2) { border: none; }
+.goods-bottom { border-top: 2rpx solid #eeeeee; overflow: hidden; padding: 20rpx 30rpx; background-color: #fff; }
+
+.selected { border: 2upx solid #ff0000; background-color: #fff5f6; color: #ff0000; }
+.not-selected { border: 2upx solid #ccc; }
+.none { border: 2upx dashed #ccc; color: #888; display: none; }
+
+
+/*表单结构*/
+.form-input-box-item { padding: 20rpx; border-bottom: 2rpx solid #eeeeee;
+    .input-box-item-left { display: inline-block; font-size: 28rpx; color: #333; width: 100%; padding: 10rpx 0; }
+    .input-box-item-right { width: 100%; display: inline-block; color: #666; font-size: 28rpx; padding: 6rpx 0;
+        .ib-item-input { color: #666; font-size: 28rpx; }
+        .ib-item-mid { padding-top: 4rpx; margin: 0; display: flex; align-items: center; justify-content: space-between;
+            picker { height: 40rpx; }
+            .weui-select { border: none; height: 100%; line-height: 48rpx; min-height: 40rpx; }
+            .icon-img { width: 32rpx; height: 32rpx; }
+            .icon-img-right { width: 32rpx; height: 32rpx; right: 0; }
+        }
+        .checkout-list { overflow: hidden;
+            .checkout-item { display: inline-block; float: left; margin-right: 40rpx;
+                .checkout-item-c { margin-right: 10rpx; border-radius: 6rpx; color: #888; }
+            }
+        }
+    }
+    .ib-item-textarea { width: 100%; height: 200rpx; box-sizing: border-box; border: 2rpx solid #e2e2e2; background-color: #f7f7f7; border-radius: 6rpx; padding: 20rpx 30rpx; }
+}
+
+/*上传界面*/
+.upload-img-list { overflow: hidden;
+    .upload-img-hd { position: relative; width: 150rpx; height: 150rpx; border: 2rpx solid #e2e2e2; background-color: #f7f7f7; border-radius: 6rpx; box-sizing: border-box; float: left; margin-left: 30rpx;
+        input { position: absolute; width: 100%; height: 100%; opacity: 0; }
+        image { width: 48rpx; height: 48rpx; position: relative; top: 50%; left: 50%; transform: translate(-50%, -50%); }
+    }
+    .upload-img-bd { float: left; overflow: hidden;
+        .upload-img { width: 150rpx; height: 150rpx; position: relative; float: left; margin-right: 30rpx;
+            .upload-camera { width: 100%; height: 100%; }
+            .del-img { width: 36rpx !important; height: 36rpx !important; position: absolute; right: 0; top: 0; z-index: 99; }
+        }
+        .upload-img:last-child { margin-right: 0; }
+    }
+}
+
+/*底部按钮*/
+.bottom-btn { width: 100%; height: 70rpx; line-height: 70rpx; margin: 0 auto; background-color: #333; color: #fff; font-size: 28rpx; border-radius: 0; }
+
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue
index cd225fe2d81483b8138489b7ba73fd84bb4ac095..d558ed370cf5fd2f2eb8232de9c4e9767fd14d75 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue
@@ -3,7 +3,6 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar :custom-back="goHome" back-icon-name="home" :title="form.name"></u-navbar>
         <form @submit="formSubmit" bindreset="formReset">
-            <view class="formContent">
                 <view v-if="form.headType==1">
                     <view class="banner">
                         <image :src='slideImg[0]' mode='widthFix'></image>
@@ -32,271 +31,255 @@
                         <text>{{form.description}}</text>
                     </view>
                 </view>
-                <view class="input-box">
-                    <view v-for="(item,index) in form.items" :key="index">
-                        <view class='goods-box-item' v-if="item.type=='goods'">
-                            <view class='ib-item-left'>
-                                <text>{{item.name}}<text v-if="item.required" class="red">（必选）</text>：</text>
+            <view class="u-margin-bottom-20 u-margin-top-20 u-padding-10 coreshop-bg-white">
+                <view v-for="(item,index) in form.items" :key="index">
+                    <view class='goods-box-item' v-if="item.type=='goods'">
+                        <view class='input-box-item-left u-padding-bottom-20'>
+                            <text>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必选）</text>：</text>
+                        </view>
+                        <image class='goods-img' :src='item.good.image' mode='aspectFit'></image>
+                        <view class='goods-right'>
+                            <view class='goods-name'>{{item.good.name}}</view>
+                            <view class='goods-mid'>
+                                <text>已售{{item.good.buyCount}}</text>
                             </view>
-                            <image class='goods-img' :src='item.good.image' mode='aspectFit'></image>
-                            <view class='goods-right'>
-                                <view class='goods-name'>{{item.good.name}}</view>
-                                <view class='goods-mid'>
-                                    <text>已售{{item.good.buyCount}}</text>
-                                </view>
-                                <view class='goods-buttom'>
-                                    <view class="goods-price">￥{{item.good.price}}</view>
-                                    <view class='choose-specs' @click="specifications($event,item)" data-type='1' :data-goods="item.good.id" :data-id="item.id" data-statu="openspecs">
-                                        选规格
-                                    </view>
-                                    <text class='order-num' v-if="item.cartCount> 0">{{item.cartCount || 0}}</text>
+                            <view class='goods-buttom'>
+                                <view class="goods-price">￥{{item.good.price}}</view>
+                                <view class='choose-specs' @click="specifications($event,item)" data-type='1' :data-goods="item.good.id" :data-id="item.id" data-statu="openspecs">
+                                    选规格
                                 </view>
+                                <text class='order-num' v-if="item.cartCount> 0">{{item.cartCount || 0}}</text>
                             </view>
                         </view>
-                        <!-- 文本框 -->
-                        <view class='form-input-box-item' v-if="item.type=='text'">
-                            <view class='ib-item-left'>
-
-                                <text>{{item.name}}<text v-if="item.required" class="red">（必填）</text>：</text>
-                            </view>
-                            <view class='ib-item-right'>
-                                <input class='ib-item-input' type="text" :name="'objName'+item.id" :data-id="item.id" v-model="item.defaultValue" placeholder-class='ib-item-input-c' :placeholder="'请输入'+item.name"></input>
-                            </view>
+                    </view>
+                    <!-- 文本框 -->
+                    <view class='form-input-box-item' v-if="item.type=='text'">
+                        <view class='input-box-item-left'>
+                            <text>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必填）</text>：</text>
                         </view>
-                        <!-- 日期 -->
-                        <view class='form-input-box-item' v-if="item.type=='date'">
-                            <view class='ib-item-left'>
-
-                                <text>{{item.name}}<text v-if="item.required" class="red">（必选）</text>：</text>
-                            </view>
-                            <view class='ib-item-right'>
-                                <view class="ib-item-mid">
-                                    <picker mode="date" :name="'objName'+item.id" :value="item.defaultValue" @change="bindDateChange($event,item)" :data-id='item.id'>
-                                        <view>{{item.defaultValue}}</view>
-                                    </picker>
-                                    <image class='icon-img-right' :src="$apiFilesUrl+'/static/images/common/ic-unfold.png'"></image>
-                                </view>
-                            </view>
+                        <view class='input-box-item-right'>
+                            <input class='ib-item-input' type="text" :name="'objName'+item.id" :data-id="item.id" v-model="item.defaultValue" :placeholder="'请输入'+item.name"></input>
                         </view>
-                        <!-- 时间 -->
-                        <view class='form-input-box-item' v-if="item.type=='time'">
-                            <view class='ib-item-left'>
-                                <text>{{item.name}}<text v-if="item.required" class="red">（必选）</text>：</text>
-                            </view>
-                            <view class='ib-item-right'>
-                                <view class="ib-item-mid">
-                                    <picker class="weui-btn" :name="'objName'+item.id" mode="time" :value="item.defaultValue" @change="bindTimeChange($event,item)" :data-id='item.id'>
-                                        <view>{{item.defaultValue}}</view>
-                                    </picker>
-                                    <image class='icon-img-right' :src="$apiFilesUrl+'/static/images/common/ic-unfold.png'"></image>
-                                </view>
-                            </view>
+                    </view>
+                    <!-- 日期 -->
+                    <view class='form-input-box-item' v-if="item.type=='date'">
+                        <view class='input-box-item-left'>
+                            <text>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必选）</text>：</text>
                         </view>
-                        <!-- 范围选择 -->
-                        <!-- 多选 -->
-                        <view class='form-input-box-item' v-if="item.type=='checbox'">
-                            <view class='ib-item-left'>
-                                <text>{{item.name}}<text v-if="item.required" class="red">（必选）</text>：</text>
-                            </view>
-                            <view class='ib-item-right'>
-                                <view class='checkout-list'>
-                                    <checkbox-group @change="checkboxChange($event,item)" :data-value="item.id" :name="'objName'+item.id">
-                                        <label class="checkout-item" v-for="(checkboxItem,itemIndex) in item.checkboxValue" :key="itemIndex">
-                                            <view class="checkout-item-c" :class="checkboxItem.checked?'black':''">
-                                                <checkbox class="" :value="checkboxItem.value" :checked="checkboxItem.checked" /> {{checkboxItem.value}}
-                                            </view>
-                                        </label>
-                                    </checkbox-group>
-                                </view>
+                        <view class='input-box-item-right'>
+                            <view class="ib-item-mid">
+                                <picker mode="date" :name="'objName'+item.id" :value="item.defaultValue" @change="bindDateChange($event,item)" :data-id='item.id'>
+                                    <view>{{item.defaultValue}}</view>
+                                </picker>
+                                <image class='icon-img-right' :src="$globalConstVars.apiFilesUrl+'/static/images/common/ic-unfold.png'"></image>
                             </view>
                         </view>
-                        <!-- radio时处理 -->
-                        <view class='form-input-box-item' v-if="item.type=='radio'">
-                            <view class='ib-item-left'>
-                                <text>{{item.name}}<text v-if="item.required" class="red">（必选）</text>:</text>
+                    </view>
+                    <!-- 时间 -->
+                    <view class='form-input-box-item' v-if="item.type=='time'">
+                        <view class='input-box-item-left'>
+                            <text>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必选）</text>：</text>
+                        </view>
+                        <view class='input-box-item-right'>
+                            <view class="ib-item-mid">
+                                <picker class="weui-btn" :name="'objName'+item.id" mode="time" :value="item.defaultValue" @change="bindTimeChange($event,item)" :data-id='item.id'>
+                                    <view>{{item.defaultValue}}</view>
+                                </picker>
+                                <image class='icon-img-right' :src="$globalConstVars.apiFilesUrl+'/static/images/common/ic-unfold.png'"></image>
                             </view>
-                            <view class='ib-item-right'>
-                                <radio-group class="uni-list" @change="radioChange($event,item)" :data-value="item.id" :name="'objName'+item.id">
-                                    <label class=" uni-list-cell uni-list-cell-pd " v-for="(radioItem, itemIndex) in  item.radioValue" :key="itemIndex">
-                                        <view class="invoice-type-icon">
-                                            <radio class="a-radio" :id="radioItem" :value="radioItem" checked=true v-if="radioItem==item.defaultValue"></radio>
-                                            <radio class="a-radio" :id="radioItem" :value="radioItem" v-if="radioItem!=item.defaultValue"></radio>
-                                        </view>
-                                        <view class="invoice-type-c">
-                                            <label class="label-2-text" :for="radioItem">
-                                                <text>{{radioItem}}</text>
-                                            </label>
+                        </view>
+                    </view>
+                    <!-- 范围选择 -->
+                    <!-- 多选 -->
+                    <view class='form-input-box-item' v-if="item.type=='checbox'">
+                        <view class='input-box-item-left'>
+                            <text>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必选）</text>：</text>
+                        </view>
+                        <view class='input-box-item-right'>
+                            <view class='checkout-list'>
+                                <checkbox-group @change="checkboxChange($event,item)" :data-value="item.id" :name="'objName'+item.id">
+                                    <label class="checkout-item" v-for="(checkboxItem,itemIndex) in item.checkboxValue" :key="itemIndex">
+                                        <view class="checkout-item-c">
+                                            <checkbox class="" :value="checkboxItem.value" :checked="checkboxItem.checked" /> {{checkboxItem.value}}
                                         </view>
                                     </label>
-                                </radio-group>
+                                </checkbox-group>
                             </view>
                         </view>
-                        <!-- 省市区选择 -->
-                        <view class='form-input-box-item' v-if="item.type=='area'">
-                            <view class='ib-item-left'>
-                                <text>{{item.name}}<text v-if="item.required" class="red">（必选）</text>：</text>
-                            </view>
-                            <view class='ib-item-right'>
-                                <view class="ib-item-mid">
-                                    <input class="ib-item-input" :value="pickerValue" @focus="showThreePicker" :name="'objName'+item.id" style="width: 100%;" />
-                                    <u-select v-model="show" mode="mutil-column-auto" :list="pickerList" :default-value="pickerIndex" @confirm="onConfirm"></u-select>
-                                </view>
-                            </view>
+                    </view>
+                    <!-- radio时处理 -->
+                    <view class='form-input-box-item' v-if="item.type=='radio'">
+                        <view class='input-box-item-left'>
+                            <text>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必选）</text>:</text>
                         </view>
-                        <!-- 金额 -->
-                        <view class='form-input-box-item' v-if="item.type=='money'">
-                            <view class='ib-item-left'>
-                                <text>{{item.name}}<text v-if="item.required" class="red">（必填）</text>：</text>
-                            </view>
-                            <view class='ib-item-right'>
-                                <view class="ib-item-mid">
-                                    <input class='ib-item-input' type="digit" :name="'objName'+item.id" v-model="item.defaultValue" placeholder-class='ib-item-input-c'
-                                           :placeholder="'请输入'+item.name"></input>
-                                </view>
+                        <view class='input-box-item-right'>
+                            <radio-group class="uni-list" @change="radioChange($event,item)" :data-value="item.id" :name="'objName'+item.id">
+                                <label class="u-margin-right-40" v-for="(radioItem, itemIndex) in  item.radioValue" :key="itemIndex">
+                                    <view class="coreshop-display-inline-block">
+                                        <radio class="a-radio" :id="radioItem" :value="radioItem" checked=true v-if="radioItem==item.defaultValue"></radio>
+                                        <radio class="a-radio" :id="radioItem" :value="radioItem" v-if="radioItem!=item.defaultValue"></radio>
+                                    </view>
+                                    <view class="coreshop-display-inline-block">
+                                        <label class="label-2-text" :for="radioItem">
+                                            <text>{{radioItem}}</text>
+                                        </label>
+                                    </view>
+                                </label>
+                            </radio-group>
+                        </view>
+                    </view>
+                    <!-- 省市区选择 -->
+                    <view class='form-input-box-item' v-if="item.type=='area'">
+                        <view class='input-box-item-left'>
+                            <text>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必选）</text>：</text>
+                        </view>
+                        <view class='input-box-item-right'>
+                            <view class="ib-item-mid">
+                                <input class="ib-item-input" :value="pickerValue" @focus="showThreePicker" :name="'objName'+item.id" style="width: 100%;" />
+                                <u-select v-model="show" mode="mutil-column-auto" :list="pickerList" :default-value="pickerIndex" @confirm="onConfirm"></u-select>
                             </view>
                         </view>
-                        <!-- 密码 -->
-                        <view class='form-input-box-item' v-if="item.type=='password'">
-                            <view class='ib-item-left'>
-                                <text>{{item.name}}<text v-if="item.required" class="red">（必填）</text>：</text>
+                    </view>
+                    <!-- 金额 -->
+                    <view class='form-input-box-item' v-if="item.type=='money'">
+                        <view class='input-box-item-left'>
+                            <text>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必填）</text>：</text>
+                        </view>
+                        <view class='input-box-item-right'>
+                            <view class="ib-item-mid">
+                                <input class='ib-item-input' type="digit" :name="'objName'+item.id" v-model="item.defaultValue" 
+                                        :placeholder="'请输入'+item.name"></input>
                             </view>
-                            <view class='ib-item-right'>
-                                <view class="ib-item-mid">
-                                    <input class='ib-item-input' type='password' :name="'objName'+item.id" v-model="item.defaultValue" placeholder-class='ib-item-input-c'
-                                           :placeholder="'请输入'+item.name"></input>
-                                </view>
+                        </view>
+                    </view>
+                    <!-- 密码 -->
+                    <view class='form-input-box-item' v-if="item.type=='password'">
+                        <view class='input-box-item-left'>
+                            <text>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必填）</text>：</text>
+                        </view>
+                        <view class='input-box-item-right'>
+                            <view class="ib-item-mid">
+                                <input class='ib-item-input' type='password' :name="'objName'+item.id" v-model="item.defaultValue" 
+                                        :placeholder="'请输入'+item.name"></input>
                             </view>
                         </view>
-                        <!-- 图片 -->
-                        <view class='form-input-box-item' v-if="item.type=='image'">
-                            <view class='form-input-box-title'>上传{{item.name}}<text v-if="item.required" class="red">（必传）</text>（限制3张）</view>
-                            <view class='form-multiple-rows'>
-                                <view class='f-m-r-item'>
-                                    <view class='upload-img-list'>
-                                        <view class='upload-img-bd'>
-                                            <view class='upload-img' v-for="(picItem, i) in item.pics" :key="i">
-                                                <image @click='picDel(item,index,i)' :data-index="i" class='del-img' :src="$apiFilesUrl+'/static/images/common/del.png'"></image>
-                                                <image class='upload-camera' :src="picItem" mode='aspectFit'></image>
-                                                <input type='text' hidden='hidden' :name="'objName'+item.id" v-model="item.pics" />
-                                            </view>
-                                        </view>
-                                        <view class='upload-img-hd'>
-                                            <image class='upload-camera' :src="$apiFilesUrl+'/static/images/common/camera.png'" @click="picChoose($event,item,index)"
-                                                   :data-id="item.id"></image>
-                                        </view>
+                    </view>
+                    <!-- 图片 -->
+                    <view class='form-input-box-item' v-if="item.type=='image'">
+                        <view class='u-font-28'>上传{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必传）</text>（限制3张）</view>
+                        <view class='u-margin-top-15'>
+                            <view class='upload-img-list'>
+                                <view class='upload-img-bd'>
+                                    <view class='upload-img' v-for="(picItem, i) in item.pics" :key="i">
+                                        <image @click='picDel(item,index,i)' :data-index="i" class='del-img' :src="$globalConstVars.apiFilesUrl+'/static/images/common/del.png'"></image>
+                                        <image class='upload-camera' :src="picItem" mode='aspectFit'></image>
+                                        <input type='text' hidden='hidden' :name="'objName'+item.id" v-model="item.pics" />
                                     </view>
                                 </view>
-                            </view>
-                        </view>
-                        <!-- 文本域 -->
-                        <view class='form-input-box-item' v-if="item.type=='textarea'">
-                            <view class='form-input-box-title'>{{item.name}}<text v-if="item.required" class="red">（必填）</text>：</view>
-                            <view class='form-multiple-rows'>
-                                <view class='f-m-r-item form-input-box-item'>
-                                    <textarea :name="'objName'+item.id" class='ib-item-textarea' :placeholder="'请输入'+item.name" placeholder-class="ib-item-input-c"></textarea>
+                                <view class='upload-img-hd'>
+                                    <image class='upload-camera' :src="$globalConstVars.apiFilesUrl+'/static/images/common/camera.png'" @click="picChoose($event,item,index)"
+                                            :data-id="item.id"></image>
                                 </view>
                             </view>
                         </view>
-                        <!-- 定位 -->
-                        <view class='form-input-box-item' v-if="item.type=='coordinate'">
-                            <view class='ib-item-left'>
-
-                                <text>{{item.name}}<text v-if="item.required" class="red">（必选）</text>：</text>
-                            </view>
-                            <view class='ib-item-right'>
-                                <view class="ib-item-mid ib-item-start">
-                                    <image class='icon-img' :src="$apiFilesUrl+'/static/images/common/ic-location.png'"></image>
-                                    <input class='ib-item-input margin-r' placeholder-class='ib-item-input-c' :name="'objName'+item.id" :value="item.defaultValue"
-                                           disabled='disabled' placeholder="点击获取位置信息" @click="chooseLocation($event,item,index)" :data-id='item.id' />
-                                </view>
-                            </view>
+                    </view>
+                    <!-- 文本域 -->
+                    <view class='form-input-box-item' v-if="item.type=='textarea'">
+                        <view class='u-font-28'>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必填）</text>：</view>
+                        <view class='u-margin-top-15'>
+                            <textarea :name="'objName'+item.id" class='ib-item-textarea' :placeholder="'请输入'+item.name" ></textarea>
                         </view>
                     </view>
+                    <!-- 定位 -->
+                    <view class='form-input-box-item' v-if="item.type=='coordinate'">
+                        <view class='input-box-item-left'>
+                            <text>{{item.name}}<text v-if="item.required" class="coreshop-bg-red u-font-22">（必选）</text>：</text>
+                        </view>
+                        <view class='input-box-item-right'>
+                            <view class="ib-item-mid coreshop-justify-start">
+                                <image class='icon-img' :src="$globalConstVars.apiFilesUrl+'/static/images/common/ic-location.png'"></image>
+                                <input class='ib-item-input u-margin-right-40' :name="'objName'+item.id" :value="item.defaultValue"
+                                        disabled='disabled' placeholder="点击获取位置信息" @click="chooseLocation($event,item,index)" :data-id='item.id' />
+                            </view>
+                        </view> 
+                    </view>
                 </view>
-                <view class='goods-bottom' v-if="form.type==1">
-                    <text class='goods-total'>
-                        合计
-                        <text class='goods-total-r'>￥{{goodsTotalMoney}}</text>
-                    </text>
-                </view>
             </view>
+            <view class='goods-bottom' v-if="form.type==1">
+                <text class='coreshop-float-right u-font-28 coreshop-text-black'>
+                    合计
+                    <text class='coreshop-text-red u-font-30'>￥{{goodsTotalMoney}}</text>
+                </text>
+            </view>
+            <view class="coreshop-tabbar-height"></view>
             <!-- 底部按钮 -->
-            <view class='bottom-btn'>
-                <button :style='{backgroundColor:form.button_color}' data-statu="open" form-type="submit" :disabled='submitStatus' :loading='submitStatus'>
+            <view class='coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom'>
+                <view class="u-padding-10">
+                    <button :style='{backgroundColor:form.buttonColor}' class="bottom-btn" data-statu="open" form-type="submit" :disabled='submitStatus' :loading='submitStatus'>
                     {{buttonName}}
-                </button>
+                    </button>
+                </view>
             </view>
         </form>
 
-
         <!--弹出框-->
-        <view class="cu-modal bottom-modal coreshop-bottom-modal-box" :class="bottomModal?'show':''">
+        <u-popup class="coreshop-bottom-popup-box" v-model="bottomModal" mode="bottom"  border-radius="14" closeable="true">
             <!-- 多规格商品弹出 -->
             <block v-if="showSpecs">
-                <view class="cu-dialog bg-white">
+                <view class="coreshop-bg-white">
                     <!--标题-->
-                    <view class="text-black text-center margin-tb text-lg coreshop-title-bar">
+                    <view class="coreshop-text-black u-text-center u-margin-top-30 u-margin-bottom-30 u-font-lg coreshop-title-bar">
                         <text>选择商品</text>
-                        <text class="cuIcon-close close-icon" @tap="closeModal"></text>
                     </view>
                     <!--内容区域-->
                     <view class="coreshop-modal-content">
                         <!--选择规格-->
-                        <view class="coreshop-view-box select show">
+                        <view class="coreshop-common-view-box select">
                             <!--商品信息-->
-                            <view class="cu-list menu-avatar">
-                                <view class="cu-item">
-                                    <view class="cu-avatar radius lg" :style="[{backgroundImage:'url('+ goodsInfoImage +')'}] " />
+                            <view class="coreshop-list menu-avatar">
+                                <view class="coreshop-list-item">
+                                    <view class="coreshop-avatar radius lg" :style="[{backgroundImage:'url('+ goodsInfoImage +')'}] " />
                                     <view class="content">
-                                        <view class="text-price-view">
-                                            <text class="text-price text-red margin-right-xs">{{goodsInfoName}}</text>
-                                            <text class="text-sm text-gray">￥{{goodsInfoPrint}}</text>
+                                        <view class="coreshop-text-price-view">
+                                            <text class="coreshop-text-price coreshop-text-red u-margin-right-20">{{goodsInfoName}}</text>
+                                            <text class="u-font-sm coreshop-text-gray">￥{{goodsInfoPrint}}</text>
                                         </view>
-
-                                        <!--<view class="text-black text-sm flex">
-                                            <view class="text-cut">已选: {{ product.spesDesc || product.name}}  库存：{{product.stock > 0 ? product.stock :0 }}</view>
-                                        </view>-->
                                     </view>
                                 </view>
                             </view>
                             <!--规格数据-->
                             <view class="coreshop-select-btn-list-box">
-                                <view class="color" v-for="(value,key) in goodsSpesDesc" :key="key">
-                                    <text class='salespromotion-service-name'>{{key}}</text>
-                                    <view class='salespromotion-service-b'>
-                                        <block v-for="(i,itemIndex) in value" :key="itemIndex">
-                                            <view v-if="i.isDefault" class='pitch-on'>{{i.name}}</view>
-                                            <view v-else-if="i.productId != 0" :class='i.isDefault ? "pitch-on" : ""' :data-key="i.productId" :data-id="i.name"
-                                                  @click="selectSku">{{i.name}}</view>
-                                            <view v-else class='nothing'>{{i.name}}</view>
-                                        </block>
+                                <view class="select-item" v-for="(value,key) in goodsSpesDesc" :key="key">
+                                    <text class='coreshop-text-black u-margin-10  coreshop-solid-bottom u-padding-bottom-20'>{{key}}</text>
+                                    <view class='select-btn'>
+                                        <button class="sku-btn u-margin-10"  :class='i.isDefault ? "selected" : "not-selected"' v-for="(i,itemIndex) in value" :key="itemIndex"  :data-key="i.productId" :data-id="i.name"  @click="selectSku">
+                                            <u-avatar :src="i.image" size="50" class="u-margin-right-10 u-margin-top-10" style="margin-left: -20rpx;"></u-avatar>
+                                            {{ i.name }}
+                                        </button>
                                     </view>
                                 </view>
                                 <!-- 库存 -->
-                                <view class='number'>
-                                    <text class='salespromotion-service-name'>数量</text>
-                                    <view class="stepper">
-                                        <u-number-box v-model="goodsNums" :min="0" :max="goodsInfoNumber" @change="valChange"></u-number-box>
+                                <view class="select-item">
+                                    <view class="coreshop-text-black">数量</view>
+                                    <view class="select-btn">
+                                        <u-number-box v-model="goodsNums" :min="0"  :max="goodsInfoNumber" @change="valChange"></u-number-box>
                                     </view>
                                 </view>
                             </view>
                         </view>
-
                         <!--公共按钮-->
-                        <view class="coreshop-modal-footer-fixed">
-                            <view class="flex flex-direction">
-                                <u-button type="error" size="medium" @click='goodsAddCart' v-if="status">确定</u-button>
-                                <u-button type="default" size="medium" v-else>已售罄</u-button>
-                            </view>
+                        <view class="u-padding-30 u-text-center">
+                            <u-button type="error" size="medium" @click='goodsAddCart' v-if="status">确定</u-button>
+                            <u-button type="default" size="medium" v-else>已售罄</u-button>
                         </view>
                     </view>
                 </view>
             </block>
-        </view>
+        </u-popup>
 
 
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 <script>
@@ -474,10 +457,10 @@
                         if (res.data.type == '1' || res.data.type == '2') {
                             if (res.data.type == '1') {
                                 //订单
-                                that.paymentType = this.$config.paymentType.formPay
+                                that.paymentType = this.$globalConstVars.paymentType.formPay
                             } else if (res.data.type == '2') {
                                 //付款码
-                                that.paymentType = this.$config.paymentType.formOrder
+                                that.paymentType = this.$globalConstVars.paymentType.formOrder
                             }
                         }
 
@@ -891,6 +874,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    @import '../../../static/style/goodDetails.scss';
-    @import '../../../static/style/formDetails.scss';
+    @import 'details.scss';
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodComments/goodComments.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodComments/goodComments.vue
index 9837590fa1dd527071c8b2207d494d17f17bd7df..a9cf271fa382addf42b8f29a59f692644a2daad6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodComments/goodComments.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodComments/goodComments.vue
@@ -4,30 +4,30 @@
         <u-navbar title="评论列表"></u-navbar>
         <view class="u-padding-10">
             <!--评论-->
-            <view class="bg-white coreshop-comment-view-box">
+            <view class="coreshop-bg-white">
                 <view v-for="(item, index) in goodsComments" :key="index">
-                    <view class="coreshop-border-view" v-if="index > 0" />
-                    <view class="coreshop-view-box">
-                        <view class="flex flex-wrap text-sm">
-                            <view class="basis-1">
-                                <view class="cu-avatar sm round" :style="[{backgroundImage:'url('+ item.avatarImage +')'}]" />
+                    <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" v-if="index > 0" />
+                    <view class="coreshop-common-view-box">
+                        <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                            <view class="coreshop-basis-1">
+                                <view class="coreshop-avatar sm round" :style="[{backgroundImage:'url('+ item.avatarImage +')'}]" />
                             </view>
-                            <view class="basis-9 text-sm">
+                            <view class="coreshop-basis-9 u-font-sm">
                                 <view>{{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }}</view>
-                                <view class="margin-top-xs">{{ item.contentBody || ''}}</view>
-                                <view class="text-gray margin-top-sm">
+                                <view class="u-margin-top-20">{{ item.contentBody || ''}}</view>
+                                <view class="coreshop-text-gray u-margin-top-10">
                                     <u-rate :current="item.score" :disabled="true" size="26"></u-rate>
                                 </view>
-                                <view class="text-gray margin-top-sm">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
+                                <view class="coreshop-text-gray u-margin-top-10">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
                             </view>
                         </view>
                     </view>
                 </view>
-                <u-loadmore :status="loadStatus" class="margin-top" :icon-type="iconType" :load-text="loadText" />
+                <u-loadmore :status="loadStatus" class="u-margin-top-20" :icon-type="iconType" :load-text="loadText" />
             </view>
         </view>
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+		<coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
@@ -97,8 +97,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .coreshop-comment-view-box .coreshop-view-box { position: relative; padding: 18.18rpx 27.27rpx; }
-    .coreshop-comment-view-box .coreshop-border-view { position: relative; background: #efebeb; margin: 0 27.27rpx; height: 2rpx; }
-    .coreshop-comment-view-box .coreshop-view-box .flex .basis-1 { flex-basis: 10%; }
-    .coreshop-comment-view-box .coreshop-view-box .flex .basis-9 { flex-basis: 90%; }
+
 </style>
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 5e53a480109a227166a46980d3e74b565ad479ff..6ac3029d3d1e541ed5c50b12b20297aa8b1d7368 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
@@ -1,13 +1,13 @@
 <template>
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <view class="nav-back">
+        <view class="coreshop-full-screen-nav-back">
             <view class="back-btn" @click="toBackBtn()">
-                <image class="icon" src="/static/images/common/back-black.png" mode=""></image>
+                <u-icon name="arrow-left" size="40" top="12"></u-icon>
             </view>
         </view>
         <!--幻灯片-->
-        <view class="coreshop-banner-swiper-box">
+        <view class="coreshop-full-screen-banner-swiper-box">
             <swiper class="screen-swiper" circular autoplay @change="bannerSwiper">
                 <swiper-item v-for="(item,index) in goodsInfo.album" :key="index" @click="clickImg(item)">
                     <u-image width="100%" height="750rpx" :src="item">
@@ -16,176 +16,161 @@
                 </swiper-item>
             </swiper>
             <!--页码-->
-            <text class="tag bg-grey round sm coreshop-page">{{bannerCur + 1}} / {{goodsInfo.album.length}}</text>
+            <text class="coreshop-bg-grey tag round coreshop-page">{{bannerCur + 1}} / {{goodsInfo.album.length}}</text>
         </view>
 
         <!--限时秒杀-->
-        <view class="coreshop-limited-seckill-box bg-red">
-            <text class="text-price text-xxl">{{ product.price || '0.00' }}</text>
-            <view class="text-xs coreshop-cost-price-num price-4">
-                <view class="linethrough">原价￥{{ product.mktprice  || '0.00'}}</view>
+        <view class="coreshop-limited-seckill-box coreshop-bg-red">
+            <text class="coreshop-text-price u-font-40">{{ product.price || '0.00' }}</text>
+            <view class="u-font-xs coreshop-cost-price-num price-4">
+                <view class="coreshop-text-through">原价￥{{ product.mktprice  || '0.00'}}</view>
                 <view>{{ goodsInfo.buyCount || '0' }} 人已购买</view>
             </view>
-            <!--<view class="text-right coreshop-time-right">
-                <view>自营限时秒杀</view>
-                <view class="text-xs">距结束剩余10时07分50秒</view>
-            </view>-->
-            <view class="text-right coreshop-share-right">
+            <view class="u-text-right coreshop-share-right">
                 <u-icon name="share" @click="goShare()" label="分享" size="40" label-size="22" label-color="#fff" label-pos="bottom"></u-icon>
             </view>
         </view>
 
         <!--标题-->
-        <view class="bg-white coreshop-view-box coreshop-title-view-box">
+        <view class="coreshop-bg-white coreshop-common-view-box coreshop-good-title-view-box">
             <view class="title-view">
-                <text class="cu-tag bg-red radius sm" v-if="goodsInfo.brand">{{goodsInfo.brand.name}}</text>
-                <text class="text-black text-lg text-bold">{{ product.name || '' }}</text>
+                <u-tag :text="goodsInfo.brand.name" type="error"  mode="dark" v-if="goodsInfo.brand" size="mini"/>
+                <text class="coreshop-text-black u-font-lg coreshop-text-bold">{{ product.name || '' }}</text>
             </view>
-            <view class="light bg-red radius margin-top-sm coreshop-title-tip-box">
-                <view>
-                    <!--<text class="u-margin-right-20" v-if="goodsInfo.brand">{{ goodsInfo.brand.name}}</text>-->
-                    <text class="text-sm">{{ goodsInfo.brief || '' }}</text>
-                </view>
-                <!--<text class="cuIcon-right icon" />-->
+            <view class="light coreshop-bg-red radius u-margin-top-20 coreshop-title-tip-box">
+                <text class="u-font-sm">{{ goodsInfo.brief || '' }}</text>
             </view>
         </view>
 
         <!--促销-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-promotion-view-box" v-if="promotion.length > 0" @tap="promotionTap">
-            <view class="flex flex-wrap text-sm" @tap="promotionTap">
-                <view class="basis-1">
-                    <text class="text-gray">促销</text>
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box" v-if="promotion.length > 0" @tap="promotionTap">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">促销</text>
                 </view>
-                <view class="basis-7">
+                <view class="coreshop-basis-8">
                     <view v-for="(item, index) in promotion" :key="index" :class="index> 1 ? 'u-margin-top-10':''">
                         <text class="cu-tag line-orange sm radius">{{item.name}}</text>
                     </view>
                 </view>
-                <view class="basis-2">
-                    <view class="text-gray text-right icon-view">
-                        <text class="cuIcon-right icon" />
+                <view class="coreshop-basis-1">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right-double"></u-icon>
                     </view>
                 </view>
             </view>
         </view>
 
         <!--服务-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-service-view-box" @tap="serviceTap" v-if="serviceDescription.service.length>0">
-            <view class="flex flex-wrap text-sm">
-                <view class="basis-1">
-                    <text class="text-gray">服务</text>
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box" @tap="serviceTap" v-if="serviceDescription.service.length>0">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">服务</text>
                 </view>
-                <view class="basis-7">
+                <view class="coreshop-basis-7">
                     <view class="tag-view-box">
-                        <text class="cu-tag bg-white tag-view" v-for="(item, index) in serviceDescription.service" :key="index">
-                            <text class="cuIcon-roundcheck text-red" />
-                            <text class="margin-left-xs">{{item.title}}</text>
-                        </text>
+                        <u-icon name="checkmark-circle" size="20" label-size="24" color="#e54d42" :label="item.title"  v-for="(item, index) in serviceDescription.service" :key="index" class="u-margin-right-10"></u-icon>
                     </view>
                 </view>
-                <view class="basis-2">
-                    <view class="text-gray text-right icon-view">
-                        <text class="cuIcon-right icon" />
+                <view class="coreshop-basis-2">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right-double"></u-icon>
                     </view>
                 </view>
             </view>
         </view>
 
         <!--发货/规格-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-select-view-box">
-            <view class="flex flex-wrap text-sm" v-if="serviceDescription.delivery.length>0">
-                <view class="basis-1">
-                    <text class="text-gray">发货</text>
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box" v-if="serviceDescription.delivery.length>0">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">发货</text>
                 </view>
-                <view class="basis-9" v-for="(item, index) in serviceDescription.delivery" :key="index">
-                    <text class="text-sm">{{item.description}}</text>
+                <view class="coreshop-coreshop-basis-9" v-for="(item, index) in serviceDescription.delivery" :key="index">
+                    <text class="u-font-sm">{{item.description}}</text>
                 </view>
             </view>
-
-            <view class="coreshop-border-view" v-if="serviceDescription.delivery.length>0" />
-
-            <view class="flex flex-wrap text-sm" @tap="selectTap(0)" v-if="isSpes">
-                <view class="basis-1">
-                    <text class="text-gray">规格</text>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" v-if="serviceDescription.delivery.length>0" />
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-top-20" @tap="selectTap(0)" v-if="isSpes">
+                <view class="coreshop-basis-1">
+                    <text class="coreshop-text-gray">规格</text>
                 </view>
-                <view class="basis-8">
-                    <text class="text-sm">{{ product.spesDesc || ''}}</text>
+                <view class="coreshop-basis-8">
+                    <text class="u-font-sm">{{ product.spesDesc || ''}}</text>
                 </view>
-                <view class="basis-1">
-                    <view class="text-gray text-right">
-                        <text class="cuIcon-right icon" />
+                <view class="coreshop-basis-1">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right-double"></u-icon>
                     </view>
                 </view>
             </view>
         </view>
 
         <!--评论-->
-        <view class="margin-top bg-white coreshop-comment-view-box" v-if="goodsComments.length">
-            <view class="cu-bar bg-white">
-                <view class="action">
-                    <text class="text-black text-df">评价（{{goodsComments.length}}）</text>
-                </view>
-                <view class="action">
-                    <view class="text-sm">
-                        <text class="cuIcon-right icon margin-left-xs" @tap="goGoodComments(goodsInfo.id)" />
+        <view class="u-margin-top-20 coreshop-bg-white  u-padding-left-20 u-padding-right-20 u-padding-bottom-20" v-if="goodsComments.length">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-top-20">
+                <view class="coreshop-basis-2">
+                    <text class="coreshop-text-black u-font-md">评价（{{goodsComments.length}}）</text>
+                </view>
+                <view class="coreshop-basis-7"></view>
+                <view class="coreshop-basis-1">
+                    <view class="coreshop-text-gray u-text-right coreshop-justify-end">
+                        <u-icon name="arrow-right"  @tap="goGoodComments(goodsInfo.id)"></u-icon>
                     </view>
                 </view>
             </view>
             <view v-for="(item, index) in goodsComments" :key="index">
-                <view class="coreshop-border-view" />
-                <view class="coreshop-view-box">
-                    <view class="flex flex-wrap text-sm">
-                        <view class="basis-1">
-                            <view class="cu-avatar sm round" :style="[{backgroundImage:'url('+ item.avatarImage +')'}]" />
-                        </view>
-                        <view class="basis-9 text-sm">
-                            <view>{{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }}</view>
-                            <view class="margin-top-xs">{{ item.contentBody || ''}}</view>
-                            <view class="text-gray margin-top-sm">
-                                <u-rate :current="item.score" :disabled="true" size="26"></u-rate>
-                            </view>
-                            <view class="text-gray margin-top-sm">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
+                <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+                <view class="coreshop-flex coreshop-flex-wrap u-font-sm u-padding-20">
+                    <view class="coreshop-basis-1">
+                        <view class="coreshop-avatar sm round" :style="[{backgroundImage:'url('+ item.avatarImage +')'}]" />
+                    </view>
+                    <view class="coreshop-basis-9 u-font-sm">
+                        <view>{{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }}</view>
+                        <view class="u-margin-top-20">{{ item.contentBody || ''}}</view>
+                        <view class="coreshop-text-gray u-margin-top-10">
+                            <u-rate :current="item.score" :disabled="true" size="26"></u-rate>
                         </view>
+                        <view class="coreshop-text-gray u-margin-top-10">{{ item.createTime || ''}} {{ item.addon || ''}}</view>
                     </view>
                 </view>
             </view>
         </view>
 
         <!--商家及推荐-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-goods-info-view-box">
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box coreshop-goods-shop-info-view-box">
             <view class="coreshop-shop-view">
-                <view class="cu-avatar lg round" :style="[{backgroundImage:'url('+ shopLogo +')'}]" />
-                <view class="text-view">
-                    <view class="margin-bottom-xs">{{shopName}}</view>
-                    <view class="text-sm text-cut">{{shareTitle}}</view>
+                <view class="u-absolute">
+                     <u-avatar :src="shopLogo"></u-avatar>
+                </view>
+                <view class="u-margin-left-20 u-padding-left-80 u-padding-right-80">
+                    <view class="u-margin-bottom-10">{{shopName}}</view>
+                    <view class="u-font-sm u-line-1">{{shareTitle}}</view>
                 </view>
-                <button class="cu-btn radius sm line-red" @tap="doPhoneCall">联系商家</button>
+                <u-button type="error" size="mini" :plain="true" @click="doPhoneCall">联系商家</u-button>
             </view>
-            <view class="coreshop-border-view" />
-            <view class="live-tag-view">
+            <view class="coreshop-solid-bottom u-padding-top-10 u-padding-bottom-20" />
+            <view class="live-tag-view u-margin-top-20 u-margin-bottom-20">
                 <view class="text-view">
-                    <text class="cu-tag bg-red radius sm">
-                        <text class="cuIcon-title" />
-                        <text>已定位</text>
-                    </text>
-                    <text class="margin-left-xs text-cut">可直接获取商家地理位置信息</text>
+                    <u-tag text="已定位" mode="plain" size="mini" type="warning" />
+                    <text class="u-margin-left-10 u-line-1">可直接获取商家地理位置信息</text>
                 </view>
-                <view class="text-sm text-red text-right-view" @tap="goShopMap">
-                    <text class="margin-right-xs">去地图</text>
-                    <text class="cuIcon-right" />
+                <view class="u-font-sm coreshop-text-red go-map-box" @tap="goShopMap">
+                    <text class="u-margin-right-10">去地图</text>
+                    <u-icon name="arrow-right"></u-icon>
                 </view>
             </view>
-            <view class="coreshop-border-view" />
-            <view class="coreshop-recommend-list-box">
-                <view class="text-sm">本店推荐</view>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+            <view class="coreshop-good-shop-recommend-list-box">
+                <view class="u-font-sm u-padding-top-20 ">本店推荐</view>
                 <!--滑动列表-->
                 <view class="recommend-scroll-box">
                     <scroll-view class="recommend-scroll" scroll-x>
                         <block v-for="(items,indexs) in shopRecommendData" :key="indexs">
                             <view :id="['scroll' + (indexs + 1 )]" class="recommend-scroll-item" @tap="goGoodsDetail(items.id)">
-                                <view class="cu-avatar xl radius" :style="[{backgroundImage:'url('+ items.image +')'}]" />
-                                <view class="text-cut-2 text-sm text-black margin-tb-sm u-line-2" style="height:64rpx;">{{items.name}}</view>
-                                <view class="text-red text-price margin-tb-sm text-df">
+                                <view class="coreshop-avatar xl radius" :style="[{backgroundImage:'url('+ items.image +')'}]" />
+                                <view class="u-line-1-2 u-font-sm coreshop-text-black u-margin-top-20 u-margin-bottom-20 u-line-2" style="height: 64rpx;">{{items.name}}</view>
+                                <view class="coreshop-text-red coreshop-text-price u-margin-top-20 u-margin-bottom-20 u-font-md">
                                     {{items.price}}元
                                 </view>
                             </view>
@@ -196,34 +181,30 @@
         </view>
 
         <!--内容区-->
-        <view class="margin-top bg-white coreshop-details-view-box">
-            <view class="text-df title-view">
-                <text class="cuIcon-titles text-red" />
-                <text class="text-black">商品详情</text>
+        <view class="u-margin-top-20 u-padding-top-10 coreshop-bg-white">
+            <view class="u-font-md u-padding-top-10 u-padding-bottom-10 u-padding-left-20 u-padding-right-10">
+                <u-icon name="more-circle" color="#e54d42"></u-icon>
+                <text class="u-margin-left-10 coreshop-text-black">商品详情</text>
             </view>
             <!--参数-->
             <view class="grid col-2">
                 <view class="col-item" v-for="(item, index) in goodsParams" :key="index">
-                    <text class="text-gray">{{ item.name || ''}}：</text>
-                    <text class="text-black">{{ item.value || ''}}</text>
+                    <text class="coreshop-text-gray">{{ item.name || ''}}：</text>
+                    <text class="coreshop-text-black">{{ item.value || ''}}</text>
                 </view>
             </view>
-            <!--<view class="text-cut col-item">
-                <text class="text-gray">详细信息：</text>
-                <text class="text-black">有发票，有配件，有包装</text>
-            </view>-->
             <view class="u-padding-top-10">
                 <u-parse :html="goodsInfo.intro" :selectable="true" v-if="goodsInfo.intro"></u-parse>
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="详情为空" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="详情为空" mode="list"></u-empty>
                 </view>
             </view>
         </view>
 
         <!-- 分享弹窗 -->
         <view class="u-padding-10">
-            <lvv-popup position="bottom" ref="share">
+            <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 -->
@@ -239,165 +220,151 @@
                 <!-- #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 -->
-            </lvv-popup>
+            </u-popup>
             <div id="qrCode" ref="qrCodeDiv"></div>
         </view>
 
         <!--常见问题-->
-        <view class="margin-top bg-white margin-bottom coreshop-view-box coreshop-goods-help-view-box">
-            <view class="text-black text-lg margin-bottom-sm">常见说明</view>
+        <view class="u-margin-top-20 coreshop-bg-white u-margin-bottom-30 coreshop-common-view-box">
+            <view class="u-font-md u-padding-bottom-20">
+                <u-icon name="question-circle" color="#e54d42"></u-icon>
+                <text class="u-margin-left-10 coreshop-text-black">常见说明</text>
+            </view>
 
-            <view class="flex flex-wrap margin-bottom" v-for="(item, index) in serviceDescription.commonQuestion" :key="index">
-                <view class="basis-2">
-                    <text class="cu-tag bg-grey radius sm">{{item.title}}</text>
+            <view class="coreshop-flex coreshop-flex-wrap u-margin-bottom-20" v-for="(item, index) in serviceDescription.commonQuestion" :key="index">
+                <view class="coreshop-basis-2">
+                    <u-tag :text="item.title" type="info" size="mini" />
                 </view>
-                <view class="basis-8">
-                    <view class="text-sm">{{item.description}}</view>
+                <view class="coreshop-basis-8">
+                    <view class="u-font-sm">{{item.description}}</view>
                 </view>
             </view>
 
-            <view class="coreshop-border-view" />
-            <view class="text-center text-blue" @tap="goArticleList()">查看更多问题</view>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+            <view class="u-text-center coreshop-text-blue  u-padding-top-20" @tap="goArticleList()">查看更多问题</view>
         </view>
 
-        <!--其他推荐-->
-        <view class="margin-top coreshop-view-box coreshop-recommend-list-view-box">
-            <view class="flex flex-wrap">
-                <view class="basis-sm text-right">
-                    <image class="img-aau" src="/static/images/common/aau.png" lazy-load mode="widthFix" />
+
+        <!--为您推荐-->
+        <view class="coreshop-recommended-title-view">
+            <view class="u-flex u-flex-wrap">
+                <view class="u-flex-4 u-text-right">
+                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
-                <view class="basis-xs text-center">
-                    <text class="text-black text-lg">其他推荐</text>
+                <view class="u-flex-4 u-text-center">
+                    <text class="coreshop-text-black u-font-lg">为您推荐</text>
                 </view>
-                <view class="basis-sm text-left">
-                    <image class="img-aau" src="/static/images/common/aau.png" lazy-load mode="widthFix" />
+                <view class="u-flex-4 u-text-left">
+                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
             </view>
+        </view>
 
-            <view class="margin-bottom coreshop-goods-list-box">
-                <view class="grid col-2">
-                    <block v-for="(items,indexs) in otherRecommendData" :key="indexs">
-                        <view class="list-itme" @click="goGoodsDetail(items.id)">
-                            <view class="bg-white list-radius">
-                                <view class="goods-img">
-                                    <view class="cu-avatar" :style="[{backgroundImage:'url('+ items.image +')'}]" />
-                                    <view class="mold-view" v-if="items.mold">
-                                        <text class="cu-tag radius sm bg-red">自营</text>
-                                    </view>
-                                </view>
-                                <view class="view-goods-info">
-                                    <view class="text-cut text-black text-sm margin-bottom-sm">{{items.name}}</view>
-                                    <view class="text-price text-red text-lg">
-                                        {{items.price}}元  <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{items.mktprice}}元</span>
-                                    </view>
-                                </view>
-                            </view>
+         <!--推荐列表-->
+        <view class="coreshop-goods-group" v-if="otherRecommendData.length>0">
+            <u-grid col="2" :border="false" :align="center">
+                <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in otherRecommendData" :key="index" @click="goGoodsDetail(item.id)">
+                    <view class="good_box">
+                        <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
+                        <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
+                        <view class="good_title u-line-2">
+                            {{item.name}}
                         </view>
-                    </block>
-                </view>
-            </view>
+                        <view class="good-price">
+                            {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
+                        </view>
+                        <view class="good-tag-recommend" v-if="item.isRecommend">
+                            推荐
+                        </view>
+                        <view class="good-tag-hot" v-if="item.isHot">
+                            热门
+                        </view>
+                    </view>
+                </u-grid-item>
+            </u-grid>
         </view>
 
         <!--占位底部距离-->
-        <view class="cu-tabbar-height" />
+        <view class="coreshop-tabbar-height" />
 
         <!--底部操作-->
-        <view class="coreshop-footer-fixed">
-            <view class="cu-bar bg-white tabbar border shop">
+        <view class="coreshop-good-footer-fixed">
+            <view class="tabbar">
                 <!-- 客服按钮 -->
                 <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-                <view class="action" @click="showChat()">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
+                <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 -->
-                <button class="action" hover-class="none" open-type="contact" bindcontact="showChat" :session-from="kefupara">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
-                </button>
-                <!-- #endif -->
-                <!-- #ifdef MP-ALIPAY -->
-                <view class="action">
-                    <contact-button class="goods-bottom-ic icon" icon="/static/images/customerservice.png" size="80rpx*80rpx" tnt-inst-id="WKPKUZXG"
-                                    scene="SCE00040186" hover-class="none" />
+                <view class="action" >
+                    <u-icon name="server-fill" :size="40" label="客服" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
                 </view>
                 <!-- #endif -->
-                <!-- #ifdef MP-TOUTIAO -->
-                <view class="action" @click="showChat()">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
+                <view class="action"  @click="collection">
+                    <u-icon :name="[isfav?'star-fill':'star']" :size="40" :label="isfav?'已收藏':'收藏'" :label-size="22" label-pos="bottom" open-type="contact" bindcontact="showChat"></u-icon>
                 </view>
-                <!-- #endif -->
-                <button class="action" @click="collection">
-                    <view :class="isfav ? 'cuIcon-favorfill':'cuIcon-favor'" />
-                    <view v-if="!isfav">收藏</view>
-                    <view v-if="isfav">已收藏</view>
-                </button>
+
                 <view class="action" @click="redirectCart">
-                    <view class="cuIcon-cart">
-                        <view class="cu-tag badge" v-if="cartNums">{{cartNums}}</view>
-                    </view>
-                    <text>购物车</text>
+                    <u-badge class="car-num" :count="cartNums?cartNums:0" type="error" :offset="[-3, -6]"></u-badge>
+				    <u-icon name="shopping-cart" :size="40"  label="购物车" :label-size="22" label-pos="bottom"></u-icon>
                 </view>
                 <view class="btn-group">
-                    <button class="cu-btn bg-orange radius shadow-blur" @tap="selectTap(1)">加入购物车</button>
-                    <button class="cu-btn bg-red radius shadow-blur" @tap="selectTap(2)">立即购买</button>
+                    <u-button  type="primary" size="medium" shape="circle" @click="selectTap(1)">加购物车</u-button>
+                    <u-button  type="success" size="medium" shape="circle" @click="selectTap(2)">立即购买</u-button>
                 </view>
             </view>
         </view>
 
 
         <!--弹出框-->
-        <view class="cu-modal bottom-modal coreshop-bottom-modal-box" :class="bottomModal?'show':''">
-            <view class="cu-dialog bg-white">
+        <u-popup class="coreshop-bottom-popup-box"  v-model="bottomModal" mode="bottom">
+            <view class="radius coreshop-bg-white">
                 <!--标题-->
-                <view class="text-black text-center margin-tb text-lg coreshop-title-bar">
+                <view class="coreshop-text-black u-text-center u-margin-top-30 u-margin-bottom-30 u-font-lg coreshop-title-bar">
                     <text>{{modalTitle}}</text>
-                    <text class="cuIcon-close close-icon" @tap="hideModal"></text>
+                    <u-icon name="close"  @tap="hideModal" class="close-icon"></u-icon>
                 </view>
-
                 <!--内容区域-->
                 <view class="coreshop-modal-content">
-
                     <!--服务区域-->
-                    <view class="coreshop-view-box service" v-if="modalType=='service'">
+                    <view class="coreshop-common-view-box service" v-if="modalType=='service'">
                         <view v-for="(item, index) in serviceDescription.service" :key="index">
                             <view class="text-view">
-                                <text class="cuIcon-title text-red" />
-                                <text class="text-cut text-black">{{item.title}}</text>
+                                <text class="cuIcon-title coreshop-text-red" />
+                                <text class="u-line-1 coreshop-text-black">{{item.title}}</text>
                             </view>
-                            <view class="text-sm text-list-view">
-                                <view class="margin-left text-cut text-gray">{{item.description}}</view>
+                            <view class="u-font-sm text-list-view">
+                                <view class="margin-left u-line-1 coreshop-text-gray">{{item.description}}</view>
                             </view>
                         </view>
                     </view>
 
                     <!--促销区域-->
-                    <view class="coreshop-view-box promotion" v-if="modalType=='promotion'">
+                    <view class="coreshop-common-view-box promotion" v-if="modalType=='promotion'">
                         <view class="text-view" v-for="(item, index) in promotion" :key="index">
                             <text class="cu-tag line-orange radius sm">{{item.name}}</text>
-                            <text class="margin-left-xs text-cut text-black">{{item.name}}</text>
+                            <text class="u-margin-left-20 u-line-5 coreshop-text-black">{{item.name}}</text>
                         </view>
                     </view>
 
                     <!--选择规格-->
-                    <view class="coreshop-view-box select hide" :class="modalType=='select' ?'show':''">
+                    <view class="coreshop-common-view-box select hide" :class="modalType=='select' ?'show':''">
                         <!--商品信息-->
-                        <view class="cu-list menu-avatar">
-                            <view class="cu-item">
-                                <view class="cu-avatar radius lg" :style="[{backgroundImage:'url('+ product.images +')'}] " />
+                        <view class="coreshop-list menu-avatar">
+                            <view class="coreshop-list-item">
+                                <view class="coreshop-avatar radius lg" :style="[{backgroundImage:'url('+ product.images +')'}] " />
                                 <view class="content">
-                                    <view class="text-price-view">
-                                        <text class="text-price text-red margin-right-xs">{{ product.price || ''}}</text>
-                                        <text class="text-sm text-gray text-through">￥{{ product.mktprice || ''}}</text>
+                                    <view class="coreshop-text-price-view">
+                                        <text class="coreshop-text-price coreshop-text-red u-margin-right-20">{{ product.price || ''}}</text>
+                                        <text class="u-font-sm coreshop-text-gray coreshop-text-through">￥{{ product.mktprice || ''}}</text>
                                         <!--<text class="cu-tag bg-gradual-red radius sm">
                                             <text class="cuIcon-hotfill"/>
                                             <text>秒杀中</text>
                                         </text>-->
                                     </view>
-                                    <view class="text-black text-sm flex">
-                                        <view class="text-cut">已选: {{ product.spesDesc || product.name}}  库存：{{product.stock > 0 ? product.stock :0 }}</view>
+                                    <view class="coreshop-text-black u-font-sm flex">
+                                        <view class="u-line-1">已选: {{ product.spesDesc || product.name}}  库存：{{product.stock > 0 ? product.stock :0 }}</view>
                                     </view>
                                 </view>
                             </view>
@@ -406,7 +373,7 @@
                         <view class="coreshop-select-btn-list-box">
                             <spec :spesData="defaultSpesDesc" ref="spec" @changeSpes="changeSpes"></spec>
                             <view class="select-item">
-                                <view class="text-black">数量</view>
+                                <view class="coreshop-text-black">数量</view>
                                 <view class="select-btn">
                                     <u-number-box v-model="buyNum" :min="minNums" :max="product.stock"></u-number-box>
                                 </view>
@@ -415,50 +382,44 @@
                     </view>
 
                     <!--公共按钮-->
-                    <view class="coreshop-modal-footer-fixed" v-if="modalType=='select'">
-                        <view class="flex flex-direction">
-                            <u-button type="error" size="medium" hover-class="btn-hover2" @click="clickHandle()" :disabled='submitStatus' :loading='submitStatus' v-if="product.stock > 0">确定</u-button>
-                            <u-button type="default" size="medium" v-else>已售罄</u-button>
-                        </view>
+                    <view class="u-padding-30 u-text-center" v-if="modalType=='select'">
+                        <u-button type="error" size="default"  @click="clickHandle()" :disabled='submitStatus' :loading='submitStatus' v-if="product.stock > 0"  shape="circle">确定</u-button>
+                        <u-button type="default" size="medium" v-else>已售罄</u-button>
                     </view>
                 </view>
             </view>
-        </view>
+        </u-popup>
         <!-- 右边浮动球 -->
-        <corecms-fab horizontal="right" vertical="bottom" direction="vertical"></corecms-fab>
+        <coreshop-fab horizontal="right" vertical="bottom" direction="vertical"></coreshop-fab>
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 
 </template>
 <script>
     import { mapMutations, mapActions, mapState } from 'vuex';
-    import lvvPopup from '@/components/corecms-lvv-popup/corecms-lvv-popup.vue';
-    import corecmsFab from '@/components/corecms-fab/corecms-fab.vue';
-    import { get } from '@/common/utils/dbHelper.js';
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js'
+    import coreshopFab from '@/components/coreshop-fab/coreshop-fab.vue';
     import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js'
-    import spec from '@/components/corecms-spec/corecms-spec.vue'
+    import spec from '@/components/coreshop-spec/coreshop-spec.vue'
     // #ifdef H5
-    import shareByH5 from '@/components/corecms-share/shareByh5.vue'
+    import shareByH5 from '@/components/coreshop-share/shareByh5.vue'
     // #endif
     // #ifdef MP-WEIXIN
-    import shareByWx from '@/components/corecms-share/shareByWx.vue'
+    import shareByWx from '@/components/coreshop-share/shareByWx.vue'
     // #endif
     // #ifdef MP-TOUTIAO
-    import shareByTt from '@/components/corecms-share/shareByTt.vue'
+    import shareByTt from '@/components/coreshop-share/shareByTt.vue'
     // #endif
     // #ifdef MP-ALIPAY
-    import shareByAli from '@/components/corecms-share/shareByAli.vue'
+    import shareByAli from '@/components/coreshop-share/shareByAli.vue'
     // #endif
     // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import shareByApp from '@/components/corecms-share/shareByApp.vue'
+    import shareByApp from '@/components/coreshop-share/shareByApp.vue'
     // #endif
     export default {
         mixins: [goods, articles, commonUse, tools],
         components: {
-            lvvPopup,
-            corecmsFab,
+            coreshopFab,
             spec,
             // #ifdef H5
             shareByH5,
@@ -499,6 +460,7 @@
                 modalType: 'promotion',
                 selectType: '',
                 shareUrl: '/pages/share/jump/jump',
+                shareBox: false,
                 serviceDescription: {
                     commonQuestion: [],
                     delivery: [],
@@ -607,10 +569,10 @@
                 let pages = getCurrentPages()
                 let page = pages[pages.length - 1]
                 // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
-                return apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId;
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId;
                 // #endif
                 // #ifdef MP-ALIPAY
-                return apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId;
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId;
                 // #endif
             },
             defaultSpesDesc() {
@@ -894,10 +856,10 @@
             },
             // 跳转到h5分享页面
             goShare() {
-                this.$refs.share.show();
+                this.shareBox = true;
             },
             closeShare() {
-                this.$refs.share.close();
+                this.shareBox = false;
             },
             // 图片点击放大
             clickImg(imgs) {
@@ -986,6 +948,7 @@
             },
             showModal() {
                 this.bottomModal = true;
+                console.log("打开弹窗");
             },
             hideModal(e) {
                 this.bottomModal = false;
@@ -1019,5 +982,4 @@
     }
 </script>
 <style lang="scss">
-    @import '../../../static/style/goodDetails.scss';
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.scss b/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.scss
new file mode 100644
index 0000000000000000000000000000000000000000..712ea7c4f406df77e457fa6a75e390da255ff2d0
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.scss
@@ -0,0 +1,34 @@
+.wrap { display: flex; flex-direction: column; height: calc(100vh - var(--window-top)); width: 100%; }
+.nobox { height: 130rpx; width: 100%; line-height: 130rpx; font-size: 28rpx; text-align: center; -webkit-flex-shrink: 0; flex-shrink: 0; }
+
+
+.cart-shoppingcard { background: #FFFFFF; border-radius: 8rpx; margin: 0 20rpx; margin-top: 20rpx; border-radius: 16rpx; padding: 20rpx 20rpx; background: #FFFFFF !important; }
+    .cart-shoppingcard:last-child { margin-bottom: 150rpx }
+
+.cart-shopp-name { width: calc(100% - 120rpx); }
+.cart-shopp-go { width: 120rpx; }
+.cart-shoppingcard-goods { margin: 0rpx; display: flex; flex-wrap: nowrap; }
+.cart-shoppingcard-goods-checkbtn { width: 60rpx; flex-shrink: 0; }
+.cart-shoppingcard-goods-image { width: 120rpx; height: 120rpx; border-radius: 10rpx; margin-right: 20rpx; flex-shrink: 0; }
+.cart-shoppingcard-goods-body { width: 100%; }
+.cart-shoppingcard-goods-title { line-height: 1.4em; }
+.cart-shoppingcard-goods-price { color: #e54d42; font-size: 32rpx; display: flex; flex-wrap: nowrap; justify-content: space-between; }
+.cart-shoppingcard-goods-number { padding: 2px 0; }
+.cart-shoppingcard-remove { display: block; text-align: right; line-height: 50rpx; margin-top: 30rpx; color: #CCCCCC; font-size: 24rpx; }
+.cart-shoppingcard-checkbtn { width: 200rpx; margin-left: 50rpx; flex-shrink: 0; }
+.cart-shoppingcard-checkout { width: 180rpx; height: 100rpx; line-height: 100rpx; font-size: 28rpx; text-align: center; flex-shrink: 0; }
+.cart-bg-gray { background: #A5A7B2 !important; color: #FFFFFF !important; }
+.cart-badge { border-radius: 38rpx; height: 38rpx; line-height: 38rpx; padding: 0 13rpx; font-size: 22rpx; }
+
+.cart-space-between { display: flex; flex-direction: row; justify-content: space-between; }
+.cart-h5 { font-size: 30rpx; }
+.cart-bold { font-weight: bold; }
+.cart-nowrap { display: flex; flex-direction: row; flex-wrap: nowrap; justify-content: space-between; }
+.cart-flex-end { display: flex; flex-direction: row; justify-content: flex-end; }
+.cart-text { font-size: 22rpx; line-height: 40rpx; }
+
+.cart-flex-vcenter { align-items: center; }
+.cart-border-t { border-top: 1px solid #E9E9E9; }
+.cart-coreshop-bg-red { background: #e54d42 !important; color: #FFFFFF !important; }
+
+.slot-wrap { display: flex; align-items: center; padding: 0 20rpx; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.vue
index eeb3021bfa0b6c053f1140f21231eed022d4ee79..2285de86c25454a0ad2639a649b58536641755ae 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.vue
@@ -9,18 +9,18 @@
         <!-- 购物车为空 -->
         <view v-if="!shoppingCard.list || shoppingCard.list.length < 1">
             <view class="coreshop-emptybox">
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/cart.png'" icon-size="300" text="您的购物车空空如也" mode="list"></u-empty>
-                <navigator class="coreshop-btn" url="/pages/category/index/index" hover-class="btn-hover" open-type="switchTab">随便逛逛</navigator>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/cart.png'" icon-size="300" text="您的购物车空空如也" mode="list"></u-empty>
+                <navigator class="coreshop-btn" url="/pages/category/index/index"  open-type="switchTab">随便逛逛</navigator>
             </view>
         </view>
         <!-- 购物车主结构  -->
         <view v-else class="cart-shoppingcard" v-for="(item, index) in shoppingCard.list" :key="index">
             <view class="cart-space-between cart-flex-vcenter" @click="goGoodsDetail(item.products.goodsId)">
                 <view class="cart-shopp-name">
-                    <text class="cart-h5 cart-bold">{{item.products.name}}{{item.id}}</text>
+                    <text class="cart-h5 cart-bold">{{item.products.name}}</text>
                 </view>
                 <view class="cart-shopp-go cart-nowrap cart-flex-end">
-                    <u-button class="cart-text-small" :plain="true" size="mini" @click="goGoodsDetail(item.products.goodsId)">浏览</u-button>
+                    <u-button class="cart-text" :plain="true" size="mini" @click="goGoodsDetail(item.products.goodsId)">浏览</u-button>
                 </view>
             </view>
             <view style="height:25rpx;"></view>
@@ -63,23 +63,19 @@
             </view>
             <view class="cart-shoppingcard-count cart-nowrap cart-flex-vcenter">
                 <text class="cart-text">合计 :</text>
-                <text class="u-font-26 text-red">￥{{totalprice}}</text>
+                <text class="u-font-26 coreshop-text-red">￥{{totalprice}}</text>
             </view>
-            <view class="cart-shoppingcard-checkout cart-bg-red" @tap="checkout">立即结算</view>
+            <view class="cart-shoppingcard-checkout cart-coreshop-bg-red" @tap="checkout">立即结算</view>
         </view>
 
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 
 </template>
 <script>
-    import checkBtn from '@/components/checkBtn/checkBtn.vue';
     import { goods } from '@/common/mixins/mixinsHelper.js';
     export default {
-        components: {
-            checkBtn
-        },
         mixins: [goods],
         data() {
             return {
@@ -374,41 +370,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    page { background: #fff }
-    .wrap { display: flex; flex-direction: column; height: calc(100vh - var(--window-top)); width: 100%; }
-    .nobox { height: 130rpx; width: 100%; line-height: 130rpx; font-size: 28rpx; text-align: center; -webkit-flex-shrink: 0; flex-shrink: 0; }
-
-    .empty-view { width: 280rpx; height: 280rpx; border-radius: 280rpx; background-color: #F6F7F8; margin-top: 30rpx; }
-    .empty-img { width: 220rpx; height: 200rpx; margin: 40rpx; border-radius: 200rpx; }
-
-    .cart-shoppingcard { background: #FFFFFF; border-radius: 8rpx; margin: 0 20rpx; margin-top: 20rpx; border-radius: 16rpx; padding: 20rpx 20rpx; background: #FFFFFF !important; }
-        .cart-shoppingcard:last-child { margin-bottom: 150rpx }
-
-    .cart-shopp-name { width: calc(100% - 120rpx); }
-    .cart-shopp-go { width: 120rpx; }
-    .cart-shoppingcard-goods { margin: 0rpx; display: flex; flex-wrap: nowrap; }
-    .cart-shoppingcard-goods-checkbtn { width: 60rpx; flex-shrink: 0; }
-    .cart-shoppingcard-goods-image { width: 120rpx; height: 120rpx; border-radius: 10rpx; margin-right: 20rpx; flex-shrink: 0; }
-    .cart-shoppingcard-goods-body { width: 100%; }
-    .cart-shoppingcard-goods-title { line-height: 1.4em; }
-    .cart-shoppingcard-goods-price { color: #e54d42; font-size: 32rpx; display: flex; flex-wrap: nowrap; justify-content: space-between; }
-    .cart-shoppingcard-goods-number { padding: 2px 0; }
-    .cart-shoppingcard-remove { display: block; text-align: right; line-height: 50rpx; margin-top: 30rpx; color: #CCCCCC; font-size: 24rpx; }
-    .cart-shoppingcard-checkbtn { width: 200rpx; margin-left: 50rpx; flex-shrink: 0; }
-    .cart-shoppingcard-checkout { width: 180rpx; height: 100rpx; line-height: 100rpx; font-size: 28rpx; text-align: center; flex-shrink: 0; }
-    .cart-bg-gray { background: #A5A7B2 !important; color: #FFFFFF !important; }
-    .cart-badge { border-radius: 38rpx; height: 38rpx; line-height: 38rpx; padding: 0 13rpx; font-size: 22rpx; }
-
-    .cart-space-between { display: flex; flex-direction: row; justify-content: space-between; }
-    .cart-h5 { font-size: 30rpx; }
-    .cart-bold { font-weight: bold; }
-    .cart-nowrap { display: flex; flex-direction: row; flex-wrap: nowrap; justify-content: space-between; }
-    .cart-flex-end { display: flex; flex-direction: row; justify-content: flex-end; }
-    .cart-text-small { font-size: 22rpx; line-height: 40rpx; }
-
-    .cart-flex-vcenter { align-items: center; }
-    .cart-border-t { border-top: 1px solid #E9E9E9; }
-    .cart-bg-red { background: #e54d42 !important; color: #FFFFFF !important; }
-
-    .slot-wrap { display: flex; align-items: center; padding: 0 20rpx; }
+    @import "cart.scss";
 </style>
\ No newline at end of file
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 b42d0967e8bcca3a3af77bafb32c848936bbd460..452c63ff99f637403b8eae6678997707569840a8 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue
@@ -1,37 +1,105 @@
 <template>
-    <view class="content" style="padding-top: 0upx;">
-        <corecmsPage :corecmsdata="pageData"></corecmsPage>
-        <copyright></copyright>
+    <!-- 页面主体 -->
+    <view>
+        <!--提示框组件-->
+        <u-toast ref="uToast" />
+        <!--无网络组件-->
+        <u-no-network></u-no-network>
+        <!--头部组件-->
+        <u-navbar :is-back="false" :title="appTitle" :background="background" :title-color="titleColor" :custom-back="about"></u-navbar>
+
+        <!--首页模块化组合组件-->
+        <coreshopPage :coreshopdata="pageData"></coreshopPage>
+        <!--版权组件-->
+        <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>
+
+        <!--弹出框-->
+        <!--<coreshop-modal-img :show="modalShow"  :src="$globalConstVars.apiFilesUrl+'/static/images/empty/reward.png'" @imgTap="imgTap" @closeTap="closeTap" />-->
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 <script>
-    import corecmsPage from '@/components/corecms-page/corecms.vue';
-    import copyright from '@/components/corecms-copyright/corecms-copyright.vue';
+    import { mapMutations, mapActions, mapState } from 'vuex';
+    import coreshopPage from '@/components/coreshop-page/coreshop.vue';
+    import copyright from '@/components/coreshop-copyright/coreshop-copyright.vue';
+    import modalImg from '@/components/coreshop-modal-img/coreshop-modal-img.vue';
     import { goods } from '@/common/mixins/mixinsHelper.js';
     export default {
         mixins: [goods],
         components: {
             copyright,
-            corecmsPage
+            coreshopPage,
+            modalImg
         },
         data() {
             return {
+                background: this.$coreTheme.mainNabBar.background,
+                titleColor: this.$coreTheme.mainNabBar.titleColor,
+
+                swiperItems: [],
+                currentIndex: 0,
+                opacity: 0,
+                scrollTop: 0,
                 imageUrl: '/static/images/ShareImage.png', //店铺分享图片
                 pageData: [],
                 pageCode: 'mobile_home', //页面布局编码
-                statusBarHeight: '0',
-                customBarOpacity: false,
-                scrollTop: 0,
-                showLoad: false, //是否显示loading
-                shareName: '',
-                shareUrl: '/pages/share/jump/jump'
+                //userInfo: {}, // 用户信息
+                kefupara: '', //客服传递资料
+                copy: false,
+                shareUrl: '/pages/share/jump/jump',
+                modalShow: true,
             };
         },
+        updated() {
+            this.copy = true;
+        },
         computed: {
+            ...mapState({
+                hasLogin: state => state.hasLogin,
+                userInfo: state => state.userInfo,
+            }),
+            hasLogin: {
+                get() {
+                    return this.$store.state.hasLogin;
+                },
+                set(val) {
+                    this.$store.commit('hasLogin', val);
+                }
+            },
+            userInfo: {
+                get() {
+                    return this.$store.state.userInfo;
+                },
+                set(val) {
+                    this.$store.commit('userInfo', val);
+                }
+            },
             appTitle() {
                 return this.$store.state.config.shopName;
+            },
+            // 获取店铺联系人手机号
+            shopMobile() {
+                return this.$store.state.config.shopMobile || 0;
             }
         },
         onLoad(e) {
@@ -40,25 +108,20 @@
                 this.pageCode = e.pageCode;
             }
             this.initData();
-        },
-        // 小程序沉浸式状态栏变色
-        onPageScroll(e) {
-            // console.log(e);
-            e.scrollTop > 50 ? (this.customBarOpacity = true) : (this.customBarOpacity = false);
-        },
-        mounted() {
-            // #ifdef H5
-            window.addEventListener('scroll', this.handleScroll);
-            // #endif
+            console.log("数据：" + this.$globalConstVars.apiFilesUrl);
         },
         methods: {
-            // 搜索框滑动变色
-            handleScroll() {
-                var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
-                scrollTop > 50 ? (this.searchBarOpacity = true) : (this.searchBarOpacity = false);
+            about() {
+
+            },
+            imgTap() {
+                this.modalShow = false;
+                uni.navigateTo({
+                    url: "/pages/reward/reward"
+                });
             },
-            destroyed() {
-                window.removeEventListener('scroll', this.handleScroll);
+            closeTap() {
+                this.modalShow = false;
             },
             goSearch() {
                 uni.navigateTo({
@@ -67,25 +130,104 @@
             },
             // 首页初始化获取数据
             initData() {
-                this.showLoad = true;
+                uni.showLoading({
+                    title: '加载中'
+                });
                 //获取首页配置
-                this.$u.api.getPageConfig(
-                    {
-                        code: this.pageCode
-                    }).then(res => {
-                        if (res.status == true) {
-                            this.pageData = res.data.items;
-                            this.shareName = res.data.name;
-                            uni.setNavigationBarTitle({
-                                title: res.data.name
-                            });
-                            //隐藏loading
-                            setTimeout(() => {
-                                this.showLoad = false;
-                            }, 600);
+                this.$u.api.getPageConfig({ code: this.pageCode }).then(res => {
+                    if (res.status == true) {
+                        this.pageData = res.data.items;
+
+                        if (res.data.items.length > 0) {
+                            for (var i = 0; i < res.data.items.length; i++) {
+                                if (res.data.items[i].widgetCode == 'topImgSlide') {
+                                    var data = res.data.items[i].parameters.list;
+                                    for (var i = 0; i < data.length; i++) {
+                                        let moder = {
+                                            image: data[i].image == '/images/empty-banner.png' ? '/static/images/common/empty-banner.png' : data[i].image,
+                                            bg: data[i].bg == '/images/empty-banner.png' ? '/static/images/common/empty-banner.png' : data[i].bg,
+                                            opentype: 'click',
+                                            url: '',
+                                            title: data[i].linkType,
+                                            linkType: data[i].linkType,
+                                            linkValue: data[i].linkValue,
+                                        }
+                                        this.swiperItems.push(moder);
+                                    }
+                                }
+                            }
                         }
                     }
-                    );
+                    setTimeout(function () {
+                        uni.hideLoading();
+                    }, 1000);
+                });
+
+                var _this = this;
+                if (this.$db.get('userToken')) {
+                    this.$u.api.userInfo().then(res => {
+                        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);
+                            //console.log(_this.kefupara);
+                            // #endif
+                        }
+                    });
+                }
+                this.getShareUrl();
+            },
+            swiperChange(e) {
+                this.currentIndex = e;
+            },
+            //在线客服,只有手机号的，请自己替换为手机号
+            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() {
@@ -93,10 +235,7 @@
                     client: 2,
                     url: "/pages/share/jump/jump",
                     type: 1,
-                    page: 7,
-                    params: {
-                        pageCode: this.pageCode
-                    }
+                    page: 1,
                 };
                 let userToken = this.$db.get('userToken');
                 if (userToken && userToken != '') {
@@ -105,17 +244,68 @@
                 this.$u.api.share(data).then(res => {
                     this.shareUrl = res.data
                 });
-            }
-        },
-        watch: {
-            pageCode: {
-                handler() {
-                    this.getShareUrl();
-                },
-                deep: true
-            }
+            },
+            taped: function (e) {
+                this.showSliderInfo(this.swiperItems[e].linkType, this.swiperItems[e].linkValue);
+            },
+            // 广告点击查看详情
+            showSliderInfo(type, val) {
+                if (!val) {
+                    return;
+                }
+                if (type == 1) {
+                    if (val.indexOf('http') != -1) {
+                        // #ifdef H5
+                        window.location.href = val
+                        // #endif
+                    } else {
+                        // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+                        if (val == '/pages/index/default/default' || val == '/pages/category/index/index' || val == '/pages/index/cart/cart' || val == '/pages/index/member/member') {
+                            this.$u.route({
+                                type: 'switchTab',
+                                url: val
+                            });
+                            return;
+                        } else if (val.indexOf('/pages/coupon/coupon') > -1) {
+                            var id = val.replace('/pages/coupon/coupon?id=', "");
+                            this.receiveCoupon(id)
+                        } else {
+                            this.$u.route(val);
+                            return;
+                        }
+                        // #endif
+                    }
+                } else if (type == 2) {
+                    // 商品详情
+                    this.goGoodsDetail(val)
+                } else if (type == 3) {
+                    // 文章详情
+                    this.$u.route('/pages/article/details/details?id=' + val + '&idType=1')
+                } else if (type == 4) {
+                    // 文章列表
+                    this.$u.route('/pages/article/list/list?cid=' + val)
+                } else if (type == 5) {
+                    //智能表单
+                    this.$u.route('/pages/form/details/details?id=' + val)
+                }
+            },
+            // 用户领取优惠券
+            receiveCoupon(couponId) {
+                let data = {
+                    promotion_id: couponId
+                }
+                this.$u.api.getCoupon(data).then(res => {
+                    if (res.status) {
+                        this.$refs.uToast.show({ title: res.msg, type: 'success', back: false })
+                    } else {
+                        this.$u.toast(res.msg)
+                    }
+                })
+            },
+
         },
         onPullDownRefresh() {
+            this.swiperItems = [];
             this.initData();
             uni.stopPullDownRefresh();
         },
@@ -134,25 +324,16 @@
                 path: this.shareUrl
             }
         },
-        // #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
-        onPageScroll() {
-            var _this = this;
-            const query = uni.createSelectorQuery();
-            query
-                .select('.content >>> .search')
-                .boundingClientRect(function (res) {
-                    if (res) {
-                        if (res.top < 0) {
-                            _this.$store.commit('searchFixed', true);
-                        } else {
-                            _this.$store.commit('searchFixed', false);
-                        }
-                    }
-                })
-                .exec();
-        }
-        //#endif
+        onPageScroll: function (e) {
+            this.scrollTop = e.scrollTop;
+            if (e.scrollTop <= 100) {
+                this.opacity = e.scrollTop / 100;
+            } else if (this.scrollTop > 100) {
+                this.opacity = 1;
+            }
+        },
     };
 </script>
-<style lang="scss" scoped>
+
+<style lang="scss">
 </style>
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 418ef613c8872330ffde1d319e406096d3492217..eb728582177c05efb8bee8305c62cbe21015d477 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue
@@ -1,25 +1,18 @@
 <template>
     <!-- 页面主体 -->
     <view>
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-         <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS ||  MP-ALIPAY || MP-TOUTIAO -->
-        <u-navbar :is-back="true" back-icon-name="scan" back-icon-color="#fff" :title="appTitle" :background="background" title-color="#fff" :custom-back="about"></u-navbar>
-        <!-- #endif -->
-        <!-- #ifdef MP-WEIXIN -->
-        <view class="swiper-background-box">
-            <view class="swiper-background"></view>
-        </view>
-        <view class="head-bg-box" :style="[{backgroundColor:'rgba(229, 77, 66,'+ opacity +')'}]">
-            <view class="indexHeaderLogoBox">
-                <u-image src="/static/images/logo/logo2.png" width="65%" mode="widthFix" :lazy-load="false" :show-loading="false"></u-image>
-            </view>
-        </view>
-        <view class="view-content"></view>
-        <!-- #endif -->
+        <!--提示框组件-->
+        <u-toast ref="uToast" />
+        <!--无网络组件-->
+        <u-no-network></u-no-network>
+        <!--头部组件-->
+        <u-navbar :is-back="false" :title="appTitle" :background="background" :title-color="titleColor" :custom-back="about"></u-navbar>
 
-        <!--调用组件-->
-        <corecmsPage :corecmsdata="pageData"></corecmsPage>
+        <!--首页模块化组合组件-->
+        <coreshopPage :coreshopdata="pageData"></coreshopPage>
+        <!--版权组件-->
         <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>
@@ -36,32 +29,33 @@
         <!-- #ifdef MP-TOUTIAO -->
         <!-- 头条客服 -->
         <!-- #endif -->
+        <!--返回顶部组件-->
         <u-back-top :scroll-top="scrollTop" :duration="500"></u-back-top>
 
         <!--弹出框-->
-        <!--<corecms-modal-img :show="modalShow"  :src="$apiFilesUrl+'/static/images/empty/reward.png'" @imgTap="imgTap" @closeTap="closeTap" />-->
+        <!--<coreshop-modal-img :show="modalShow"  :src="$globalConstVars.apiFilesUrl+'/static/images/empty/reward.png'" @imgTap="imgTap" @closeTap="closeTap" />-->
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 <script>
     import { mapMutations, mapActions, mapState } from 'vuex';
-    import corecmsPage from '@/components/corecms-page/corecms.vue';
-    import copyright from '@/components/corecms-copyright/corecms-copyright.vue';
-    import modalImg from '@/components/corecms-modal-img/corecms-modal-img.vue';
+    import coreshopPage from '@/components/coreshop-page/coreshop.vue';
+    import copyright from '@/components/coreshop-copyright/coreshop-copyright.vue';
+    import modalImg from '@/components/coreshop-modal-img/coreshop-modal-img.vue';
     import { goods } from '@/common/mixins/mixinsHelper.js';
     export default {
         mixins: [goods],
         components: {
             copyright,
-            corecmsPage,
+            coreshopPage,
             modalImg
         },
         data() {
             return {
-                background: {
-                    backgroundColor: '#e54d42',
-                },
+                background: this.$coreTheme.mainNabBar.background,
+                titleColor: this.$coreTheme.mainNabBar.titleColor,
+
                 swiperItems: [],
                 currentIndex: 0,
                 opacity: 0,
@@ -110,6 +104,7 @@
         },
         onLoad(e) {
             this.initData();
+            console.log("数据：" + this.$globalConstVars.apiFilesUrl);
         },
         methods: {
             about() {
@@ -337,13 +332,4 @@
 </script>
 
 <style lang="scss">
-    .indexHeaderLogoBox { width: 100%; height: 120rpx; }
-    .swiper-background-box { position: absolute; height: 348rpx; width: 100%; top: 0; display: block; transition: 0s; z-index: -1 }
-        .swiper-background-box .swiper-background { position: absolute; height: 100%; width: 100%; top: 0; background-size: cover; opacity: 1; transition: opacity 0.25s; background-image: url($apiFilesUrl+'/static/images/default/swiper-background-2.png'); }
-        .swiper-background-box.welcome { top: calc(var(--status-bar-height) + 101rpx); transition: top 0.25s; }
-
-    .head-bg-box { position: fixed; width: 100%; top: 0; z-index: 9999; background-color: rgba(229, 77, 66,0); padding-top: calc(var(--status-bar-height) + 15rpx); transition: top .25s; }
-
-    /*占位*/
-    .view-content { width: 100%; /* #ifdef APP-PLUS */ margin-top: calc(var(--status-bar-height) + 70rpx); /* #endif */ /* #ifdef H5 */ margin-top: calc(var(--status-bar-height) + 110rpx); /* #endif */ /* #ifdef MP */ margin-top: calc(var(--status-bar-height) + 135rpx); /* #endif */ }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.scss b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.scss
new file mode 100644
index 0000000000000000000000000000000000000000..5f5fa561383a28eedd16ac69699796eb798ec362
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.scss
@@ -0,0 +1,61 @@
+.memberBox {
+    .headBox { padding-top: 0; padding-bottom: 72.72rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center;
+        .user-info-box { padding-top: 30rpx;
+            .login-user-view { position: relative; text-align: center;
+                .login-user-avatar-view { position: relative; margin-bottom: 18.18rpx; }
+            }
+        }
+        .user-info-tip-box { position: relative; margin: 18.18rpx 27.27rpx; border-radius: 9.09rpx; padding: 18.18rpx 27.27rpx;
+            .u-line-1 { padding-right: 45.45rpx; }
+            .icon { position: absolute; right: 27.27rpx; top: 23.63rpx; }
+        }
+    }
+}
+.coreshop-view-content { padding: 0 27.27rpx 54.54rpx; margin-top: -63.63rpx;
+    .coreshop-user-info-order-box { border-radius: 18.18rpx;
+        .coreshop-list {
+            &.grid {
+                &.no-border { padding: 0;
+                    & > .coreshop-list-item { padding-bottom: 9.09rpx; }
+                }
+            }
+        }
+        .transactionNumber { font-size: 40rpx; margin-bottom: 4rpx; color: $core-main-color; }
+    }
+    .coreshop-list {
+        &.grid {
+            & > .coreshop-list-item {
+                text { color: inherit; }
+            }
+        }
+    }
+    .coreshop-user-info-money-box { border-radius: 18.18rpx;
+        .money-col {
+            .money-item { position: relative;
+                .money-item-view { border: 1.81rpx solid #f3f2f3; border-radius: 18.18rpx; position: relative; padding: 9.09rpx;
+                    .money-avatar { position: absolute; left: 9.09rpx; }
+                    .money-content { position: relative; margin-left: 109.09rpx; margin-bottom: 27.27rpx; top: 12.72rpx; }
+                }
+            }
+        }
+    }
+    .coreshop-user-info-tools-box { border-radius: 18.18rpx;
+        .tools-view { position: relative;
+            .tools-title { padding-right: 81.81rpx; }
+            .tools-right { position: absolute; right: 9.09rpx; bottom: 23.63rpx; }
+        }
+    }
+}
+
+.text-border-x { margin-right: 25.45rpx; position: relative;
+    &:after { position: absolute; background: #dddddd; top: 10.45rpx; width: 1.81rpx; right: -12.72rpx; height: 16.36rpx; content: " "; }
+}
+.u-tips-color { color: #909399; }
+.userItem { padding: 16rpx 10rpx 0rpx 10rpx; height: 140rpx; -webkit-box-pack: end; -webkit-justify-content: flex-end; justify-content: flex-end; -webkit-box-align: center; -webkit-align-items: center; align-items: center; }
+
+.account-face { height: 60px; width: 60px; flex: 0 0 60px; background-color: transparent; border-radius: 500px; display: -webkit-inline-box; display: -webkit-inline-flex; display: inline-flex; -webkit-box-align: center; -webkit-align-items: center; align-items: center; -webkit-box-pack: center; -webkit-justify-content: center; justify-content: center; font-size: 28rpx; color: #606266; -webkit-border-radius: 10px; border-radius: 10px; position: relative; }
+.yqhy { background-image: url(/static/images/my/1.png); }
+.yqhy2 { background-image: url(/static/images/my/2.png); }
+
+
+.grid-text { font-size: 28rpx; margin-top: 14rpx; color: $core-type-info; }
\ No newline at end of file
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 5cee99af53217400e14e2ed7c8e4ec7db07301e8..f1c5c579da1514506fd6da8704fcf59391b5b028 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
@@ -1,9 +1,9 @@
 <template>
-    <view class="my-box">
+    <view class="memberBox">
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar :is-back="true" back-icon-name="scan" back-icon-color="#000" title="会员中心"></u-navbar>
 
-        <view class="head-box bg-red">
+        <view class="headBox coreshop-bg-red">
             <!--标题栏-->
             <!--小程序端不显示-->
             <!--用户信息-->
@@ -79,11 +79,6 @@
 
             <view class="user-info-num-box">
                 <u-grid :col="4" :border="false" :bg-color="transparent">
-                    <!--<u-grid-item bg-color="transparent" @tap="orderNavigateHandle('/pages/member/order/orderlist', 0)" :custom-style="{padding: '5rpx 0'}">
-                        <view class="u-font-36" v-if="!hasLogin">-</view>
-                        <view class="u-font-36" v-else>{{ userInfo.orderCount }}</view>
-                        <text class="u-font-22">总订单</text>
-                    </u-grid-item>-->
                     <u-grid-item bg-color="transparent" @tap="navigateToHandle('/pages/member/history/index')" :custom-style="{padding: '5rpx 0'}">
                         <view class="u-font-36" v-if="!hasLogin">-</view>
                         <view class="u-font-36" v-else>{{ userInfo.footPrintCount }}</view>
@@ -99,7 +94,7 @@
                         <view class="u-font-36" v-else>{{ userInfo.collectionCount }}</view>
                         <text class="u-font-22">收藏</text>
                     </u-grid-item>
-                    <u-grid-item bg-color="transparent" @tap="navigateToHandle('/pages/member/afterSales/list')" :custom-style="{padding: '5rpx 0'}">
+                    <u-grid-item bg-color="transparent" @tap="navigateToHandle('/pages/member/afterSales/list/list')" :custom-style="{padding: '5rpx 0'}">
                         <view class="u-font-36" v-if="!hasLogin">-</view>
                         <view class="u-font-36" v-else>{{afterSaleNums || 0}}</view>
                         <text class="u-font-22">售后</text>
@@ -110,115 +105,111 @@
 
         <view class="coreshop-view-content">
             <!--用户数据-->
-            <view class="padding-xs bg-white coreshop-user-info-order-box">
-                <view class="text-black text-lg text-bold padding-sm">我的交易</view>
-                <view class="cu-list grid col-5 no-border">
-                    <view class="cu-item" v-for="(item, index) in orderItems" :key="index" @click="orderNavigateHandle('/pages/member/order/orderlist', index)">
-                        <view class="text-xxl text-red" v-if="!hasLogin">
-                            <text :class="['cuIcon-' + item.icon]"></text>
-                        </view>
-                        <view class="text-xxl text-black" v-else>{{item.nums}}</view>
-                        <text class="text-sm">{{ item.name }}</text>
-                    </view>
-                </view>
+            <view class="u-padding-10 coreshop-bg-white coreshop-user-info-order-box">
+                <view class="coreshop-text-black u-font-lg coreshop-text-bold u-padding-20">我的交易</view>
+                <u-grid :col="5" :border="false">
+                    <u-grid-item v-for="(item, index) in orderItems" :key="index" @click="orderNavigateHandle('/pages/member/order/index/index', index)">
+                        <view class="transactionNumber" v-if="hasLogin">{{ item.nums }}</view>
+                        <u-icon :name="item.icon" :size="50" v-else></u-icon>
+                        <view class="grid-text">{{ item.name }}</view>
+                    </u-grid-item>
+                </u-grid>
             </view>
 
             <!--天天有钱-->
-            <view class="padding-xs bg-white margin-top coreshop-user-info-money-box" v-if="order.invite.showItem">
-                <view class="text-black text-lg text-bold padding-sm">天天有钱</view>
-                <view class="grid col-2 money-col">
-                    <view class="money-item">
-                        <view class="money-item-view" @click="navigateToHandle('/pages/member/invite/index')">
-                            <view class="cu-avatar lg yqhy" />
-                            <view class="money-content">
-                                <view class="text-black text-cut">边逛边赚钱</view>
-                                <view class="text-gray text-sm text-cut">最高提现20元</view>
+            <view class="u-padding-10 coreshop-bg-white u-margin-top-30 coreshop-user-info-money-box" v-if="other.invite.showItem">
+                <view class="coreshop-text-black u-font-lg coreshop-text-bold u-padding-20">天天有钱</view>
+                <u-row gutter="16" class="money-col">
+                    <u-col span="6">
+                        <view class="money-item">
+                            <view class="money-item-view" @click="navigateToHandle('/pages/member/invite/index')">
+                                <view class="money-avatar coreshop-avatar lg yqhy" />
+                                <view class="money-content">
+                                    <view class="coreshop-text-black u-line-1">边逛边赚钱</view>
+                                    <view class="coreshop-text-gray u-font-sm u-line-1">最高提现20元</view>
+                                </view>
                             </view>
                         </view>
-                    </view>
-                    <view class="money-item">
-                        <view class="money-item-view" @click="navigateToHandle('/pages/member/invite/index')">
-                            <view class="cu-avatar lg yqhy2" />
-                            <view class="money-content">
-                                <view class="text-black text-cut">邀请好友</view>
-                                <view class="text-gray text-sm text-cut">最高分红50000</view>
+                    </u-col>
+                    <u-col span="6">
+                        <view class="money-item">
+                            <view class="money-item-view" @click="navigateToHandle('/pages/member/invite/index')">
+                                <view class="money-avatar coreshop-avatar lg yqhy2" />
+                                <view class="money-content">
+                                    <view class="coreshop-text-black u-line-1">邀请好友</view>
+                                    <view class="coreshop-text-gray u-font-sm u-line-1">最高分红50000</view>
+                                </view>
                             </view>
                         </view>
-                    </view>
-                </view>
+                    </u-col>
+                </u-row>
             </view>
 
             <!--我的服务-->
-            <view class="padding-xs bg-white margin-top coreshop-user-info-tools-box">
-                <view class="padding-sm tools-view">
-                    <view class="text-black text-bold text-lg tools-title">我的服务</view>
+            <view class="u-padding-10 coreshop-bg-white u-margin-top-30 coreshop-user-info-tools-box">
+                <view class="u-padding-20 tools-view">
+                    <view class="coreshop-text-black coreshop-text-bold u-font-lg tools-title">我的服务</view>
                 </view>
                 <view class="coreshop-tools-list-box">
-                    <view class="cu-list grid col-4 no-border">
-
-                        <view class="cu-item" @click="navigateToHandle('/pages/member/merchant/index/index')" v-if="isClerk">
-                            <view class="text-black cuIcon-shop" />
-                            <text>商家管理</text>
-                        </view>
-
-                        <view class="cu-item" @tap="$u.throttle(goDistributionPanel, 500)" v-if="isDistribution">
-                            <view class="text-black cuIcon-all" />
-                            <text>分销中心</text>
-                        </view>
-
-                        <view class="cu-item" @tap="$u.throttle(goAgentPanel, 500)" v-if="isAgent">
-                            <view class="text-black cuIcon-link" />
-                            <text>代理中心</text>
-                        </view>
+                    <u-grid :col="4" :border="false">
+                        <u-grid-item @click="navigateToHandle('/pages/member/merchant/index/index')" v-if="isClerk">
+                            <u-icon name="calendar" :size="50" color="#666"></u-icon>
+                            <view class="grid-text">商家管理</view>
+                        </u-grid-item>
+                        <u-grid-item @tap="$u.throttle(goDistributionPanel, 500)" v-if="isDistribution">
+                            <u-icon name="wifi" :size="50" color="#666"></u-icon>
+                            <view class="grid-text">分销中心</view>
+                        </u-grid-item>
+                        <u-grid-item @tap="$u.throttle(goAgentPanel, 500)" v-if="isAgent">
+                            <u-icon name="zhuanfa" :size="50" color="#666"></u-icon>
+                            <view class="grid-text">代理中心</view>
+                        </u-grid-item>
+                        <u-grid-item v-for="(item,i) in utilityMenus" :key="i" v-if="(item.showItem && i != 'invoice') || (item.showItem && i == 'invoice' && InvoiceSwitch == 1)" @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>
+                    </u-grid>
 
-
-                        <block v-for="(item,i) in utilityMenus" :key="i" v-if="(item.showItem && i != 'invoice') || (item.showItem && i == 'invoice' && InvoiceSwitch == 1)">
-                            <view class="cu-item" @click="navigateToHandle(item.router)">
-                                <view class="text-black" :class="['cuIcon-' + item.icon]" />
-                                <text>{{item.name}}</text>
-                            </view>
-                        </block>
-                    </view>
                 </view>
             </view>
 
             <!--增值业务-->
-            <view class="padding-xs bg-white margin-top coreshop-user-info-tools-box">
-                <view class="padding-sm tools-view">
-                    <view class="text-black text-bold text-lg tools-title">增值业务</view>
+            <view class="u-padding-10 coreshop-bg-white u-margin-top-30 coreshop-user-info-tools-box">
+                <view class="u-padding-20 tools-view">
+                    <view class="coreshop-text-black coreshop-text-bold u-font-lg tools-title">增值业务</view>
                 </view>
                 <view class="coreshop-tools-list-box">
-                    <view class="cu-list grid col-4 no-border">
-                        <block v v-for="(item,i) in vas" :key="i" v-if="item.showItem">
-                            <view class="cu-item" @click="goRoute(item.router)">
-                                <view class="text-black" :class="['cuIcon-' + item.icon]" />
-                                <text>{{item.name}}</text>
-                            </view>
-                        </block>
-                    </view>
+                    <u-grid :col="4" :border="false">
+                        <u-grid-item v-for="(item,i) in vas" :key="i" v-if="item.showItem" @click="goRoute(item.router)">
+                            <u-icon :name="item.icon" :size="50" color="#666"></u-icon>
+                            <view class="grid-text">{{ item.name }}</view>
+                        </u-grid-item>
+                    </u-grid>
                 </view>
             </view>
 
             <!--其他-->
-            <view class="padding-xs bg-white margin-top coreshop-user-info-tools-box">
-                <view class="padding-sm tools-view">
-                    <view class="text-black text-bold text-lg tools-title">其他</view>
+            <view class="u-padding-10 coreshop-bg-white u-margin-top-30 coreshop-user-info-tools-box">
+                <view class="u-padding-20 tools-view">
+                    <view class="coreshop-text-black coreshop-text-bold u-font-lg tools-title">其他</view>
                 </view>
                 <view class="coreshop-tools-list-box">
-                    <view class="cu-list grid col-4 no-border">
-                        <view class="cu-item" @click="goArticleList()">
-                            <view class="text-black cuIcon-question" />
-                            <text>帮助中心</text>
-                        </view>
-                        <view class="cu-item" v-for="(item,i) in order" :key="i" v-if="item.showItem" @click="navigateToHandle(item.router)">
-                            <view class="text-black" :class="['cuIcon-' + item.icon]" />
-                            <text>{{item.name}}</text>
-                        </view>
+
+                    <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 -->
-                        <view class="cu-item" @click="showChat">
-                            <view class="text-black cuIcon-service" />
-                            <text>联系客服</text>
-                        </view>
+                        <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:: 微信客服 -->
@@ -229,14 +220,15 @@
                         <!-- #ifdef MP-ALIPAY -->
                         <!-- todo:: 支付宝客服 -->
                         <!-- #endif -->
-                    </view>
+
+                    </u-grid>
                 </view>
             </view>
 
         </view>
 
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
@@ -257,75 +249,75 @@
                 orderItems: [
                     {
                         name: '全部',
-                        icon: 'timefill',
+                        icon: 'order',
                         nums: 0
                     }, {
                         name: '待付款',
-                        icon: 'timefill',
+                        icon: 'order',
                         nums: 0
                     },
                     {
                         name: '待发货',
-                        icon: 'deliver_fill',
+                        icon: 'order',
                         nums: 0
                     },
                     {
                         name: '待收货',
-                        icon: 'cartfill',
+                        icon: 'order',
                         nums: 0
                     },
                     {
                         name: '待评价',
-                        icon: 'commentfill',
+                        icon: 'order',
                         nums: 0
                     }
                 ],
                 utilityMenus: {
                     myCoupon: {
                         name: '我的优惠券',
-                        icon: 'ticket',
+                        icon: 'coupon',
                         router: '/pages/member/coupon/index',
                         showItem: true
                     },
                     myBalance: {
                         name: '我的余额',
-                        icon: 'recharge',
-                        router: '/pages/member/balance/index',
+                        icon: 'rmb-circle',
+                        router: '/pages/member/balance/index/index',
                         showItem: true
                     },
                     myInvoice: {
                         name: '我的发票',
-                        icon: 'news',
+                        icon: 'calendar',
                         router: '/pages/member/invoice/index',
                         showItem: true
                     },
                     myServices: {
                         name: '我的服务卡',
-                        icon: 'vipcard',
-                        router: '/pages/member/serviceOrder/index',
+                        icon: 'bell',
+                        router: '/pages/member/serviceOrder/index/index',
                         showItem: true
                     },
                     myIntegral: {
                         name: '我的积分',
-                        icon: 'medal',
+                        icon: 'integral',
                         router: '/pages/member/integral/index',
                         showItem: true
                     },
                     myAddress: {
                         name: '地址管理',
-                        icon: 'location',
-                        router: '/pages/member/address/list',
+                        icon: 'map',
+                        router: '/pages/member/address/list/list',
                         showItem: true
                     },
                     myCollection: {
                         name: '我的收藏',
-                        icon: 'favor',
+                        icon: 'bookmark',
                         router: '/pages/member/collection/index',
                         showItem: true
                     },
                     myHistory: {
                         name: '我的足迹',
-                        icon: 'footprint',
+                        icon: 'bag',
                         router: '/pages/member/history/index',
                         showItem: true
                     },
@@ -333,51 +325,57 @@
                 vas: {
                     storeMap: {
                         name: '门店列表',
-                        icon: 'shop',
+                        icon: 'home',
                         router: '/pages/storeMap/storeMap',
                         showItem: false
                     },
                     servicePackage: {
-                        name: '服务包',
-                        icon: 'send',
+                        name: '服务商品',
+                        icon: 'list-dot',
                         router: '/pages/serviceGoods/index/index',
                         showItem: true
                     },
                     coupons: {
                         name: '优惠券',
-                        icon: 'ticket',
+                        icon: 'red-packet',
                         router: '/pages/coupon/coupon',
                         showItem: true
                     },
                     pinTuan: {
                         name: '拼团',
-                        icon: 'cascades',
+                        icon: 'grid',
                         router: '/pages/activity/pinTuan/list/list',
                         showItem: true
                     },
                     seckill: {
                         name: '秒杀',
-                        icon: 'remind',
+                        icon: 'clock',
                         router: '/pages/activity/seckill/list/list',
                         showItem: true
                     },
                     groupBuying: {
                         name: '团购',
-                        icon: 'goods',
+                        icon: 'trash',
                         router: '/pages/activity/groupBuying/list/list',
                         showItem: true
                     },
                 },
-                order: {
+                other: {
                     invite: {
                         name: '邀请好友',
-                        icon: 'friendadd',
+                        icon: 'man-add',
                         router: '/pages/member/invite/index',
                         showItem: false
                     },
+                    search: {
+                        name: '商品检索',
+                        icon: 'search',
+                        router: '/pages/search/search',
+                        showItem: true
+                    },
                     setting: {
                         name: '系统设置',
-                        icon: 'repair',
+                        icon: 'setting',
                         router: '/pages/member/setting/index/index',
                         showItem: true
                     }
@@ -431,11 +429,11 @@
                     if (res.status) {
                         _this.condition = res.data;
                         if (_this.condition.verifyStatus == 1 || (!_this.condition.needApply && _this.conditionStatus)) {
-                            _this.$u.route({ url: '/pages/member/agent/panel' });
+                            _this.$u.route({ url: '/pages/member/agent/panel/panel' });
                         } else if (_this.condition.verifyStatus > 1) {
-                            _this.$u.route({ url: '/pages/member/agent/applyState' });
+                            _this.$u.route({ url: '/pages/member/agent/applyState/applyState' });
                         } else {
-                            _this.$u.route({ url: '/pages/member/agent/index' });
+                            _this.$u.route({ url: '/pages/member/agent/index/index' });
                         }
                     } else {
                         //报错了
@@ -454,11 +452,11 @@
                         _this.condition = res.data;
                         if (_this.condition.hasOwnProperty('verifyStatus')) {
                             if (_this.condition.verifyStatus == 1 || (!_this.condition.needApply && _this.conditionStatus)) {
-                                _this.$u.route({ url: '/pages/member/distribution/panel' });
+                                _this.$u.route({ url: '/pages/member/distribution/panel/panel' });
                             } else if (_this.condition.verifyStatus > 1) {
-                                _this.$u.route({ url: '/pages/member/distribution/applyState' });
+                                _this.$u.route({ url: '/pages/member/distribution/applyState/applyState' });
                             } else {
-                                _this.$u.route({ url: '/pages/member/distribution/index' });
+                                _this.$u.route({ url: '/pages/member/distribution/index/index' });
                             }
                         }
                     } else {
@@ -492,10 +490,10 @@
                 }
                 if (this.config.showInviter == 1) {
                     //不显示-邀请好友
-                    _this.order.invite.showItem = true;
+                    _this.other.invite.showItem = true;
                 } else if (this.config.showInviter == 2) {
                     //显示-邀请好友
-                    _this.order.invite.showItem = false;
+                    _this.other.invite.showItem = false;
                 }
                 if (this.config.showStoresSwitch == 1) {
                     //不显示-门店展示列表
@@ -587,15 +585,6 @@
                     success: e => {
                         console.log(e)
                         if (e.errMsg == 'getUserProfile:ok') {
-                            //var data = {
-                            //    avatarUrl: e.avatarUrl,
-                            //    city: e.city,
-                            //    country: e.country,
-                            //    gender: e.gender,
-                            //    language: e.language,
-                            //    nickName: e.nickName,
-                            //    province: e.province
-                            //}
                             _this.$u.api.syncWeChatInfo(e.userInfo).then(res => {
                                 console.log(res);
                                 if (res.status) {
@@ -641,5 +630,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    @import '../../../static/style/member.scss';
+    @import 'member.scss';
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/author/author.vue b/CoreCms.Net.Uni-App/CoreShop/pages/login/author/author.vue
deleted file mode 100644
index 5013a57edf6c24feacb7a69119dfeadce353828e..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/login/author/author.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar title="授权"></u-navbar>
-        <view class="content">
-            <view class="content-c">
-                <image class="load-img" src="/static/images/common/loading.gif" mode=""></image>
-                <view class="load-text color-9">信息加载中.....</view>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                code: '',
-                type: '',
-                state: ''
-            };
-        },
-        onLoad(options) {
-            // 获取url上的参数
-            this.code = this.getUrlParam('code');
-            this.state = this.getUrlParam('state');
-            this.type = options.type;
-            var _this = this;
-            setTimeout(function () {
-                _this.userTrustLogin();
-            }, 100);
-        },
-        methods: {
-            // 获取url地址参数
-            getUrlParam(paraName) {
-                let url = window.location.toString();
-                let arrObj = url.split('?');
-                if (arrObj.length > 1) {
-                    let arrPara = arrObj[1].split('&');
-                    let arr;
-                    for (let i = 0; i < arrPara.length; i++) {
-                        arr = arrPara[i].split('=');
-                        if (arr != null && arr[0] == paraName) {
-                            if (arr[1].indexOf('#')) {
-                                let str;
-                                str = arr[1].split('#');
-                                return str[0];
-                            }
-                            return arr[1];
-                        }
-                    }
-                    return '';
-                } else {
-                    return '';
-                }
-            },
-            // 第三方登录
-            userTrustLogin() {
-                let data = {
-                    scope: 1,
-                    code: this.code,
-                    state: this.state,
-                    invitecode: this.$db.get('invitecode') || ''
-                };
-                this.$u.api.getOpenId(data).then(res => {
-                    if (res.status) {
-                        if (res.data.token) {
-                            this.$db.set('userToken', res.data.token);
-                            this.redirectHandler();
-                        } else if (res.data.sessionAuthId) {
-                            this.$u.route({ type: 'redirectTo',  url: '/pages/login/loginBySMS/loginBySMS?sessionAuthId=' + res.data.sessionAuthId });
-                        }
-                    } else {
-                        this.$u.toast(res.msg);
-                    }
-                });
-            },
-            redirectHandler() {
-                this.$db.del('invitecode');
-                let redirectPage = this.$db.get('redirectPage');
-                if (redirectPage) {
-                    this.$db.del('redirectPage');
-                    this.$u.route({ type: 'redirectTo', url: redirectPage });
-                } else {
-                    uni.reLaunch({
-                        url: '/pages/index/default/default'
-                    });
-                }
-            }
-        }
-    };
-</script>
-
-<style lang="scss" scoped>
-    view { box-sizing: border-box; }
-    .content { position: relative; height: 80vh; }
-    .content-c { position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center; }
-    .load-img { width: 100upx; height: 100upx; }
-    .load-text { font-size: 26upx; }
-</style>
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/loginByGetPhoneNumber/loginByGetPhoneNumber.vue b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginByGetPhoneNumber/loginByGetPhoneNumber.vue
deleted file mode 100644
index 4bb6c75f816ba1a4980c3755e1ac9f07e29dff0b..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginByGetPhoneNumber/loginByGetPhoneNumber.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar back-text="返回" :is-back="true" title="授权登录"></u-navbar>
-
-        <!--登录图标-->
-        <view class="coreshop-user-login-avatar-view">
-            <view class="cu-avatar round lg">
-                <!-- #ifndef MP-TOUTIAO -->
-                <open-data type="userAvatarUrl"></open-data>
-                <!-- #endif -->
-                <!-- #ifdef MP-TOUTIAO -->
-                <image class="toutiao-logo" :src="logoImage"></image>
-                <!-- #endif -->
-            </view>
-        </view>
-
-        <!--按钮-->
-        <view class="flex flex-direction coreshop-btn-view">
-            <!-- #ifdef MP-WEIXIN -->
-            <button class="cu-btn bg-red" shape="circle" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" hover-class="coreshop-btn-hover">
-                <text class="cuIcon-mobilefill icon" />
-                <text>微信手机号授权绑定</text>
-            </button>
-            <!-- #endif -->
-        </view>
-
-        <!--协议-->
-        <view class="coreshop-agreement-checked-view">
-            <!--<u-checkbox v-model="checked" shape="circle" style="position:absolute;" disabled="true" active-color="error"></u-checkbox>-->
-            <view class="text-sm text-black-view">
-                <view class="text-gray">申请获取以下权限</view>
-                <view class="text-red"> 获得你的手机号码 <br />用于下单预留联系人收货信息，接收订单状态</view>
-            </view>
-        </view>
-
-        <!--底部说明-->
-        <view class="text-sm text-gray coreshop-foot-ad-view">{{appTitle}}</view>
-
-        <view class="otherLogin" @click="goSmsLogin">
-            <u-icon name="phone" color="#e54d42" size="45" label="手机短信验证绑定" label-pos="bottom" margin-top="20"></u-icon>
-        </view>
-    </view>
-</template>
-
-<script>
-    import { off } from "process";
-
-    export default {
-        data() {
-            return {
-                sessionAuthId: '',
-                checked: true
-            }
-        },
-        computed: {
-            logoImage() {
-                return this.$store.state.config.shopLogo
-            },
-            appTitle() {
-                return this.$store.state.config.shopName;
-            },
-        },
-        onLoad(option) {
-            const _this = this
-            if (option.sessionAuthId) {
-                this.sessionAuthId = option.sessionAuthId;
-            }
-            console.log(option.sessionAuthId);
-        },
-        methods: {
-            handleRefuse() {
-                uni.showToast({
-                    title: '未登录',
-                    icon: 'none',
-                    duration: 1000,
-                })
-                setTimeout(() => {
-                    uni.hideToast();
-                    uni.navigateBack(-1);
-                }, 1000);
-            },
-            getPhoneNumber: function (e) {
-                let _this = this;
-                if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
-                    //var sessionAuthId = _this.$db.get('sessionAuthId')
-                    var data = {
-                        sessionAuthId: _this.sessionAuthId,
-                        iv: e.mp.detail.iv,
-                        encryptedData: e.mp.detail.encryptedData,
-                    }
-                    //有推荐码的话，带上
-                    var invitecode = _this.$db.get('invitecode')
-                    if (invitecode) {
-                        data.invitecode = invitecode
-                    }
-                    _this.toGetPhoneNumber(data);
-
-
-
-                } else {
-                    _this.$u.toast('如未授权，您可尝试使用手机号+短信验证码登录');
-                }
-            },
-            //实际的去登陆
-            toGetPhoneNumber: function (data) {
-                let _this = this
-                _this.$u.api.loginByGetPhoneNumber(data).then(res => {
-                    if (res.status) {
-                        //判断是否返回了token，如果没有，就说明没有绑定账号，跳转到绑定页面
-                        if (res.data.token) {
-                            //登陆成功，设置token，并返回上一页
-                            _this.$db.set('userToken', res.data.token)
-                            uni.navigateBack({
-                                delta: 1
-                            })
-                            return false
-                        }
-                    } else {
-                        _this.$u.toast('登录失败，请重试')
-                    }
-                })
-            },
-            goSmsLogin: function () {
-                this.$u.route({ type: 'redirectTo', url: '/pages/login/loginBySMS/loginBySMS?sessionAuthId=' + this.sessionAuthId });
-            }
-        }
-    }
-</script>
-
-<style lang="scss" scoped>
-    .coreshop-user-login-avatar-view { position: relative; display: flex; align-items: center; justify-content: center; margin-top: 218.18rpx; }
-        .coreshop-user-login-avatar-view .cu-avatar { width: 181.81rpx; height: 181.81rpx; }
-    .coreshop-btn-view { position: relative; margin-top: 72.72rpx; padding: 0 60rpx; }
-        .coreshop-btn-view .cu-btn .icon { position: relative; font-size: 47.27rpx; right: 9.09rpx; top: -3.63rpx; }
-    .coreshop-agreement-checked-view { position: relative; padding: 27.27rpx 60rpx; }
-        .coreshop-agreement-checked-view .coreshop-checked { position: absolute; transform: scale(0.7); }
-        .coreshop-agreement-checked-view .text-black-view { /* padding-left: 54.54rpx; */ line-height: 47.27rpx; }
-    .coreshop-foot-ad-view { position: fixed; text-align: center; bottom: 72.72rpx; width: 100%; }
-    .otherLogin { margin-top: 200upx; text-align: center; width: 100%; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/loginBySMS.scss b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.scss
similarity index 100%
rename from CoreCms.Net.Uni-App/CoreShop/static/style/loginBySMS.scss
rename to CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.scss
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue
index 3fb7329d51b927921515e37e60913a85833d6ffd..9fd9b0cf14134b2a502c5ae9dca03bc5ba4f5a54 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue
@@ -25,9 +25,9 @@
                 </view>
                 <view class="hint">
                     登录即代表你同意
-                    <text @click="goUserAgreementPage()" class="color-o link">用户协议</text>
+                    <text @click="goUserAgreementPage()">用户协议</text>
                     和
-                    <text @click="goUserPrivacyPolicy()" class="color-o link">隐私政策</text>，
+                    <text @click="goUserPrivacyPolicy()">隐私政策</text>，
                     并授权使用您的{{appTitle}}账号信息（如昵称、头像、收获地址）以便您统一管理
                 </view>
             </view>
@@ -280,10 +280,10 @@
                     _this.$u.toast('请输入验证码');
                     return false;
                 }
-                if (_this.sessionAuthId == 0) {
-                    this.$refs.uToast.show({ title: '登录失败，请稍后再试', type: 'error', back: true });
-                    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
@@ -361,5 +361,5 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../../static/style/loginBySMS.scss';
+    @import 'loginBySMS.scss';
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/map/map.vue b/CoreCms.Net.Uni-App/CoreShop/pages/map/map.vue
index 2a7bc45428f1a5cf8fd56cf6e14048566fd4f89e..dc955b5b7611293769425a546b22c7291d7959dc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/map/map.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/map/map.vue
@@ -2,7 +2,6 @@
     <view>
         <u-navbar :is-back="true" back-text="返回" title="地图展示"></u-navbar>
         <view class="content">
-
             <map :style="[{height:height+'px'},{width:'100%'}]" id="map" :latitude="lat"
                  :longitude="lng"
                  :scale="15"
@@ -12,10 +11,9 @@
                  :enable-traffic="true"
                  :markers="covers">
             </map>
-
         </view>
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+		<coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/index/index.vue
similarity index 44%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/address/index.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/address/index/index.vue
index 548e53813181d995525faa9d9222d0cedf7138ef..afc3a30920b745a7ef9b537f1a077bf8bbfc969c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/index/index.vue
@@ -2,42 +2,34 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="编辑地址"></u-navbar>
-        <view class="content">
-            <view class="content-top">
 
-                <view class="cu-form-group">
-                    <view class="title">收货人</view>
-                    <input placeholder="请填写收货人姓名" v-model="name" />
-                </view>
-                <view class="cu-form-group">
-                    <view class="title">手机号</view>
-                    <input placeholder="请填写收货人手机号" v-model="mobile" />
-                </view>
+        <view class="u-padding-20">
+            <u-form :model="form" :rules="rules" ref="uForm" :errorType="errorType">
+                <u-form-item label="收货人" label-width="180" prop="name">
+                    <u-input v-model="form.name" placeholder="请填写收货人姓名" />
+                </u-form-item>
+                <u-form-item label="手机号" label-width="180" prop="mobile">
+                    <u-input v-model="form.mobile" placeholder="请填写收货人手机号" />
+                </u-form-item>
 
-                <view class="cu-form-group">
-                    <view class="title">省市区</view>
-                    <input :value="pickerValue" @focus="showThreePicker" />
+                <u-form-item label="省市区" label-width="180">
+                    <u-input :value="pickerValue" @click="showThreePicker" type="select" placeholder="请选择省市区区域"></u-input>
                     <u-select v-model="show" mode="mutil-column-auto" :list="pickerList" :default-value="pickerIndex" @confirm="onConfirm"></u-select>
-                <text class='cuIcon-locationfill text-orange' @click="showThreePicker"></text>
-                </view>
+                </u-form-item>
 
-                <view class="cu-form-group align-start">
-                    <view class="title">详细地址</view>
-                    <textarea maxlength="-1" v-model="address" placeholder="请填写收货详细地址"></textarea>
-                </view>
+                <u-form-item label="详细地址" label-width="180" prop="address">
+                    <u-input v-model="form.address" placeholder="请填写收货详细地址" type="textarea" />
+                </u-form-item>
 
-                <radio-group class="block" @click="defaultChange">
-                    <view class="cu-form-group margin-top">
-                        <view class="title">设为默认</view>
-                        <radio value="1" :checked="checked" color="#FF7159" />
-                    </view>
-                </radio-group>
+                <u-form-item label="设为默认" label-width="180">
+                    <u-switch slot="right" v-model="checked"></u-switch>
+                </u-form-item>
+            </u-form>
+        </view>
 
-            </view>
-            <view class="coreshop-bottomBox">
-                <button class="coreshop-btn coreshop-btn-square coreshop-btn-w" @click="delShip" v-if="id && id != 0" hover-class="btn-hover2" :disabled='submitStatus' :loading='submitStatus'>删除</button>
-                <button class="coreshop-btn coreshop-btn-square coreshop-btn-b" @click="saveShip" hover-class="btn-hover2" :disabled='submitStatus' :loading='submitStatus'>保存</button>
-            </view>
+        <view class="coreshop-bottomBox">
+            <button class="coreshop-btn coreshop-btn-square coreshop-btn-w" @click="delShip" v-if="id && id != 0" :disabled='submitStatus' :loading='submitStatus'>删除</button>
+            <button class="coreshop-btn coreshop-btn-square coreshop-btn-b" @click="saveShip" :disabled='submitStatus' :loading='submitStatus'>保存</button>
         </view>
     </view>
 </template>
@@ -46,13 +38,16 @@
     export default {
         data() {
             return {
+                errorType: ['message'],
                 id: 0,
-                name: '',
-                mobile: '',
+                form: {
+                    name: '',
+                    mobile: '',
+                    address: '',
+                    isDefault: 2,
+                },
                 region: ['湖南省', '怀化市', '鹤城区'],
-                areaId: 431202,
-                address: '',
-                isDefault: 2,
+                areaId: 0,
                 checked: false,
                 pickerValue: '',
                 submitStatus: false,
@@ -63,9 +58,61 @@
                 provinceKey: -1,//省份id
                 cityKey: -1,//市id
                 areaKey: -1,//区域id
+                rules: {
+                    name: [
+                        {
+                            required: true,
+                            message: '请输入姓名',
+                            trigger: 'blur',
+                        },
+                        {
+                            min: 2,
+                            max: 4,
+                            message: '姓名长度在2到4个字符',
+                            trigger: ['change', 'blur'],
+                        },
+                        {
+                            validator: (rule, value, callback) => {
+                                return this.$u.test.chinese(value);
+                            },
+                            message: '必须为中文',
+                            trigger: ['change', 'blur'],
+                        }
+                    ],
+                    address: [
+                        {
+                            required: true,
+                            message: '请输入地址',
+                            trigger: 'blur',
+                        },
+                        {
+                            min: 5,
+                            max: 30,
+                            message: '地址长度在5到30个字符',
+                            trigger: ['change', 'blur'],
+                        }
+                    ],
+                    mobile: [
+                        {
+                            required: true,
+                            message: '请输入手机号',
+                            trigger: ['change', 'blur'],
+                        },
+                        {
+                            validator: (rule, value, callback) => {
+                                return this.$u.test.mobile(value);
+                            },
+                            message: '手机号码不正确',
+                            trigger: ['change', 'blur'],
+                        }
+                    ]
+                },
             }
         },
         computed: {},
+        onReady() {
+            this.$refs.uForm.setRules(this.rules);
+        },
         methods: {
             // 省市区联动初始化
             showThreePicker() {
@@ -82,7 +129,7 @@
                     cityName: cityName,
                     countyName: countyName
                 }
-                let regionName = [provinceName, cityName, countyName];
+                //let regionName = [provinceName, cityName, countyName];
                 this.$u.api.getAreaId(data).then(res => {
                     if (res.status) {
                         this.areaId = res.data;
@@ -96,38 +143,6 @@
                     }
                 });
             },
-            // 信息验证
-            checkData(data) {
-                this.submitStatus = false;
-                if (!data.name) {
-                    this.$u.toast('请输入收货人姓名')
-                    return false
-                } else if (!data.mobile) {
-                    this.$u.toast('请输入收货人手机号')
-                    return false
-                } else if (data.mobile.length !== 11) {
-                    this.$u.toast('收货人手机号格式不正确')
-                    return false
-                } else if (!data.areaId) {
-                    this.$u.toast('请选择地区信息')
-                    return false
-                } else if (!data.address) {
-                    this.$u.toast('请输入收货地址详细信息')
-                    return false
-                } else {
-                    return true
-                }
-            },
-            //默认
-            defaultChange() {
-                if (this.checked) {
-                    this.checked = false;
-                    this.isDefault = 2;
-                } else {
-                    this.checked = true;
-                    this.isDefault = 1;
-                }
-            },
             //编辑获取收货地址信息
             getShipInfo() {
                 let data = {
@@ -136,14 +151,14 @@
                 this.$u.api.shipDetail(data).then(res => {
                     if (res.status) {
                         let region = res.data.areaName.split(" ");
-                        this.name = res.data.name;
-                        this.mobile = res.data.mobile;
+                        this.form.name = res.data.name;
+                        this.form.mobile = res.data.mobile;
                         this.region = region;
                         this.areaId = res.data.areaId;
                         this.init();
                         this.pickerValue = this.region[0] + " " + this.region[1] + " " + this.region[2]
-                        this.address = res.data.address;
-                        this.isDefault = res.data.isDefault;
+                        this.form.address = res.data.address;
+                        this.form.isDefault = res.data.isDefault;
                         if (res.data.isDefault) {
                             this.checked = true;
                             this.isDefault = 1;
@@ -173,44 +188,73 @@
             },
             //存储收货地址
             saveShip() {
-                this.submitStatus = true;
-                let data = {
-                    name: this.name,
-                    address: this.address,
-                    mobile: this.mobile,
-                    isDefault: this.isDefault,
-                    areaId: this.areaId
-                }
 
-                if (this.id && this.id != 0) {
-                    //编辑存储
-                    data.id = this.id
+                this.$refs.uForm.validate(valid => {
+                    if (valid) {
+                        console.log('验证通过');
 
-                    if (this.checkData(data)) {
-                        this.$u.api.editShip(data).then(res => {
-                            this.submitStatus = false;
-                            if (res.status) {
-                                this.$refs.uToast.show({ title: res.msg, type: 'success', back: true })
-                            } else {
-                                this.$u.toast(res.msg);
-                                // this.submitStatus = false;
-                            }
-                        });
-                    }
-                } else {
-                    //添加
-                    if (this.checkData(data)) {
-                        this.$u.api.saveUserShip(data).then(res => {
-                            this.submitStatus = false;
-                            if (res.status) {
-                                this.$refs.uToast.show({ title: res.msg, type: 'success', back: true })
-                            } else {
-                                this.$u.toast(res.msg);
-                                // this.submitStatus = false;
-                            }
-                        });
+                        if (this.checked) {
+                            this.form.isDefault = 1;
+                        } else {
+                            this.form.isDefault = 2;
+                        }
+
+                        this.submitStatus = false;
+                        if (!this.form.name) {
+                            this.$u.toast('请输入收货人姓名')
+                            return false
+                        } else if (!this.form.mobile) {
+                            this.$u.toast('请输入收货人手机号')
+                            return false
+                        } else if (this.form.mobile.length !== 11) {
+                            this.$u.toast('收货人手机号格式不正确')
+                            return false
+                        } else if (this.areaId <= 0) {
+                            this.$u.toast('请选择地区信息')
+                            return false
+                        } else if (!this.form.address) {
+                            this.$u.toast('请输入收货地址详细信息')
+                            return false
+                        }
+
+                        let data = {
+                            name: this.form.name,
+                            address: this.form.address,
+                            mobile: this.form.mobile,
+                            isDefault: this.form.isDefault,
+                            areaId: this.areaId
+                        }
+                        if (this.id && this.id != 0) {
+                            //编辑存储
+                            data.id = this.id
+                            this.$u.api.editShip(data).then(res => {
+                                this.submitStatus = false;
+                                if (res.status) {
+                                    this.$refs.uToast.show({ title: res.msg, type: 'success', back: true })
+                                } else {
+                                    this.$u.toast(res.msg);
+                                    // this.submitStatus = false;
+                                }
+                            });
+                        } else {
+                            //添加
+                            this.$u.api.saveUserShip(data).then(res => {
+                                this.submitStatus = false;
+                                if (res.status) {
+                                    this.$refs.uToast.show({ title: res.msg, type: 'success', back: true })
+                                } else {
+                                    this.$u.toast(res.msg);
+                                    // this.submitStatus = false;
+                                }
+                            });
+                        }
+
+                    } else {
+                        console.log('验证失败');
                     }
-                }
+                });
+
+
             },
             //倒查城市信息
             getFullPath(id, data) {
@@ -259,11 +303,14 @@
                 this.id = e.shipId;
                 this.getShipInfo();
             } else {
-                //添加
-                this.pickerValue = this.region[0] + " " + this.region[1] + " " + this.region[2];
-                this.init();
+                //添加（取消初始化）
+                //this.pickerValue = this.region[0] + " " + this.region[1] + " " + this.region[2];
+                //this.init();
             }
 
         }
     }
 </script>
+<style lang="scss">
+    page { background: #fff; }
+</style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.scss
new file mode 100644
index 0000000000000000000000000000000000000000..b5e716d4cae4b586e2007d56a2955660f254b7a9
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.scss
@@ -0,0 +1,10 @@
+.item { padding: 40rpx 20rpx; background: #fff; margin-bottom: 10rpx;
+    .top { display: flex; font-weight: bold; font-size: 34rpx;
+        .phone { margin-left: 60rpx; }
+        .tag { display: flex; font-weight: normal; align-items: center;
+            text { display: block; width: 60rpx; height: 34rpx; line-height: 34rpx; color: #ffffff; font-size: 20rpx; border-radius: 6rpx; text-align: center; margin-left: 30rpx; background-color: #3191fd; }
+            .red { background-color: red; }
+        }
+    }
+    .bottom { display: flex; margin-top: 20rpx; font-size: 28rpx; justify-content: space-between; color: #999999; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
similarity index 83%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/address/list.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
index a304ebd58af6a2a6bff2e301e4e148bb15264d68..a4d588957285fe524edb0a8b6f05726aadde1abf 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
@@ -20,13 +20,13 @@
             </view>
             <!-- 无数据时默认显示 -->
             <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/address.png'" icon-size="300" text="暂无地址信息" mode="list"></u-empty>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/address.png'" icon-size="300" text="暂无地址信息" mode="list"></u-empty>
             </view>
             <view class="coreshop-bottomBox">
                 <!-- #ifdef MP-WEIXIN -->
-                <button class="coreshop-btn coreshop-btn-square coreshop-btn-b" @click="wechatAddress" hover-class="btn-hover2">从微信获取</button>
+                <button class="coreshop-btn coreshop-btn-square coreshop-btn-b" @click="wechatAddress">从微信获取</button>
                 <!-- #endif -->
-                <button class="coreshop-btn coreshop-btn-square coreshop-btn-w" @click="toAdd()" hover-class="btn-hover2">新增收货地址</button>
+                <button class="coreshop-btn coreshop-btn-square coreshop-btn-w" @click="toAdd()">新增收货地址</button>
             </view>
 
         </view>
@@ -60,11 +60,11 @@
             },
             //编辑
             toEdit(id) {
-                this.$u.route('/pages/member/address/index?shipId=' + id);
+                this.$u.route('/pages/member/address/index/index?shipId=' + id);
             },
             //添加
             toAdd() {
-                this.$u.route('/pages/member/address/index');
+                this.$u.route('/pages/member/address/index/index');
             },
             //选择
             isSelect(data) {
@@ -144,11 +144,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .item { padding: 40rpx 20rpx; background: #fff; margin-bottom: 10rpx; }
-        .item .top { display: flex; font-weight: bold; font-size: 34rpx; }
-            .item .top .phone { margin-left: 60rpx; }
-            .item .top .tag { display: flex; font-weight: normal; align-items: center; }
-                .item .top .tag text { display: block; width: 60rpx; height: 34rpx; line-height: 34rpx; color: #ffffff; font-size: 20rpx; border-radius: 6rpx; text-align: center; margin-left: 30rpx; background-color: #3191fd; }
-                .item .top .tag .red { background-color: red; }
-        .item .bottom { display: flex; margin-top: 20rpx; font-size: 28rpx; justify-content: space-between; color: #999999; }
+    @import "list.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.scss
new file mode 100644
index 0000000000000000000000000000000000000000..5a34d3794f8bb05082f059af4ddb7ee991665411
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.scss
@@ -0,0 +1,3 @@
+.goods-img-item { width: 174rpx; height: 174rpx; padding: 14rpx; position: relative; }
+    .goods-img-item:nth-child(4n) { margin-right: 0; }
+    .goods-img-item image { width: 100%; height: 100%; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.vue
similarity index 59%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.vue
index d888ded95070a8b9cff1af664b29fc45ed8cdd5e..a2e4392b4db51ebc3bc5f4f14eea06b3edc00196 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.vue
@@ -2,78 +2,79 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="售后详情"></u-navbar>
-        <view class="u-padding-bottom-20 bg-white">
+        <view class="u-padding-bottom-20 coreshop-bg-white">
 
             <!--状态图标-->
-            <view class="bg-white padding solid-top text-center coreshop-status-img-view " v-if="status==2 && refundStatus==2">
+            <view class="coreshop-bg-white u-padding-20 coreshop-solid-top u-text-center coreshop-status-img-view" v-if="status==2 && refundStatus==2">
                 <view class="are-img-view">
                     <image class="are-img" src="/static/images/common/are.png" mode="widthFix" />
                 </view>
-                <view class="text-sm text-black">退款成功</view>
+                <view class="u-font-sm coreshop-text-black">退款成功</view>
             </view>
 
 
             <!--状态图标-->
-            <view class="bg-white padding solid-top text-center coreshop-status-img-view" v-if="status==3">
+            <view class="coreshop-bg-white  u-padding-20 coreshop-solid-top u-text-center coreshop-status-img-view" v-if="status==3">
                 <view class="are-img-view">
                     <image class="are-img" src="/static/images/common/arg.png" mode="widthFix" />
                 </view>
-                <view class="text-sm text-black">申请驳回</view>
-                <view class="text-sm text-black">驳回原因：{{mark}}</view>
+                <view class="u-font-sm coreshop-text-black">申请驳回</view>
+                <view class="u-font-sm coreshop-text-black">驳回原因：{{mark}}</view>
             </view>
 
             <!--退款单状态-->
-            <view class="bg-white coreshop-card-box">
+            <view class="coreshop-bg-white coreshop-card-box">
                 <view class="coreshop-card-view coreshop-price-view">
-                    <view class="text-lg text-bold text-black">售后单进度</view>
-                    <view class="solid-line"></view>
-                    <view class="text-center text-black">
-                        <view class="cu-btn round bg-yellow u-margin-left-20 u-margin-right-20" v-if="statusName">{{statusName}}</view>
-                        <view class="cu-btn round bg-yellow u-margin-left-20 u-margin-right-20" v-if="reshipName">{{reshipName}}</view>
-                        <view class="cu-btn round bg-yellow u-margin-left-20 u-margin-right-20" v-if="refundName">{{refundName}}</view>
+                    <view class="u-font-lg coreshop-text-bold coreshop-text-black">售后单进度</view>
+                    <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                    <view class="u-text-center coreshop-text-black">
+                        <u-button  type="warning" shape="square"  size="mini" v-if="statusName" class="u-margin-left-20 u-margin-right-20">{{statusName}}</u-button>
+                        <u-button  type="warning" shape="square"  size="mini" v-if="reshipName" class="u-margin-left-20 u-margin-right-20">{{reshipName}}</u-button>
+                        <u-button  type="warning" shape="square"  size="mini" v-if="refundName" class="u-margin-left-20 u-margin-right-20">{{refundName}}</u-button>
                     </view>
                 </view>
             </view>
 
             <!--物流信息-->
-            <view class="bg-white coreshop-card-box" v-if="status == 2 && reshipStatus == 1 && refundStatus!=2">
+            <view class="coreshop-bg-white coreshop-card-box" v-if="status == 2 && reshipStatus == 1 && refundStatus!=2">
                 <view class="coreshop-card-view coreshop-address-view">
-                    <view class="text-lg text-bold text-black">退货邮寄信息</view>
-                    <view class="solid-line"></view>
-                    <view class="cu-list menu-avatar">
-                        <view class="cu-item">
-                            <view class="bg-grey icon-view">
-                                <text class="cuIcon-locationfill" />
-                            </view>
-                            <view class="content">
-                                <view class="text-black">
+                    <view class="u-font-lg coreshop-text-bold coreshop-text-black">退货邮寄信息</view>
+                    <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                    <view class="wrap">
+		                <u-row gutter="16">
+			                <u-col span="1">
+                                <u-icon name="map-fill" size="38"></u-icon>
+			                </u-col>
+			                <u-col span="11">
+				                <view class="coreshop-text-black">
                                     <text>收货人：</text>
                                     <text>{{ reshipInfo.reshipName }}</text>
-                                    <text class="margin-left">{{ reshipInfo.reshipMobile }}</text>
+                                    <text class="u-margin-left-10">{{ reshipInfo.reshipMobile }}</text>
                                 </view>
-                                <view class="text-gray text-sm flex">
-                                    <view class="text-cut">{{ reshipInfo.reshipArea + reshipInfo.reshipAddress }}</view>
+                                <view class="coreshop-text-gray u-font-sm flex">
+                                    <view class="u-line-1">{{ reshipInfo.reshipArea + reshipInfo.reshipAddress }}</view>
                                 </view>
-                            </view>
-                        </view>
-                    </view>
+			                </u-col>
+		                </u-row>
+	                </view>     
+
                 </view>
             </view>
 
             <!--商品信息-->
-            <view class="bg-white coreshop-card-box" v-if="goodsInfo.length>0">
+            <view class="coreshop-bg-white coreshop-card-box" v-if="goodsInfo.length>0">
                 <view class="coreshop-card-view coreshop-shop-view">
-                    <view class="text-black text-bold text-lg title-view">商品信息</view>
-                    <view class="solid-line"></view>
+                    <view class="coreshop-text-black coreshop-text-bold u-font-lg title-view">商品信息</view>
+                    <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
                     <view class="goods-list-view" v-for="(item, key) in goodsInfo" :key="key">
-                        <view class="cu-avatar radius" :style="[{backgroundImage:'url('+ item.imageUrl +')'}]" />
+                        <image class="coreshop-avatar radius" :src="item.imageUrl" mode="aspectFill"></image>
                         <view class="goods-info-view">
-                            <view class="text-black text-cut name">{{item.name}} </view>
-                            <view class="text-gray text-sm text-cut introduce">售后单号：{{item.aftersalesId}}</view>
-                            <view class="text-cut tag-view" v-if="item.addon">
-                                <text class="cu-tag sm line-blue radius">{{item.addon}}</text>
+                            <view class="coreshop-text-black u-line-2 name">{{item.name}} </view>
+                            <view class="coreshop-text-gray u-font-sm u-line-1 introduce u-margin-top-15">售后单号：{{item.aftersalesId}}</view>
+                            <view class="u-line-1  u-margin-top-15" v-if="item.addon">
+                                <u-tag :text="item.addon" type="success"  shape="circle" />
                             </view>
-                            <view class="text-red text-df">退货数量:{{item.nums}}</view>
+                            <view class="coreshop-text-red u-font-md u-margin-top-15">退货数量:{{item.nums}}</view>
                         </view>
                     </view>
 
@@ -81,32 +82,32 @@
             </view>
 
             <!--商品状态-->
-            <view class="bg-white coreshop-card-box">
+            <view class="coreshop-bg-white coreshop-card-box">
                 <view class="coreshop-card-view coreshop-price-view">
-                    <view class="text-lg text-bold text-black">状态</view>
-                    <view class="solid-line"></view>
-                    <view class="text-black title-view">
+                    <view class="u-font-lg coreshop-text-bold coreshop-text-black">状态</view>
+                    <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                    <view class="coreshop-text-black title-view">
                         <view class="title">商品状态</view>
-                        <view class="text-right">
+                        <view class="u-text-right">
                             <text>{{typeName}}</text>
                         </view>
                     </view>
-                    <view class="text-black title-view">
+                    <view class="coreshop-text-black title-view">
                         <view class="title">退款金额</view>
-                        <view class="text-right">
+                        <view class="u-text-right">
                             <text>{{refund}}元</text>
                         </view>
                     </view>
-                    <view class="solid-line"></view>
-                    <view class="text-center text-black">联系客服</view>
+                    <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                    <view class="u-text-center coreshop-text-black">联系客服</view>
                 </view>
             </view>
             <!--图片凭证-->
-            <view class="bg-white coreshop-card-box" v-if="images.length > 0">
+            <view class="coreshop-bg-white coreshop-card-box" v-if="images.length > 0">
                 <view class="coreshop-card-view coreshop-order-view">
-                    <view class="text-lg text-bold text-black">图片凭证</view>
-                    <view class="solid-line"></view>
-                    <view class="text-black title-view">
+                    <view class="u-font-lg coreshop-text-bold coreshop-text-black">图片凭证</view>
+                    <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                    <view class="coreshop-text-black title-view">
                         <view class="goods-img-item" v-for="(item, key) in images" :key="key">
                             <image :src="item.imageUrl" mode="aspectFit" @click="clickImg(item.imageUrl)"></image>
                         </view>
@@ -115,11 +116,11 @@
             </view>
 
             <!--订单信息-->
-            <view class="bg-white coreshop-card-box">
+            <view class="coreshop-bg-white coreshop-card-box">
                 <view class="coreshop-card-view coreshop-order-view">
-                    <view class="text-lg text-bold text-black">问题描述</view>
-                    <view class="solid-line"></view>
-                    <view class="text-black title-view">
+                    <view class="u-font-lg coreshop-text-bold coreshop-text-black">问题描述</view>
+                    <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                    <view class="coreshop-text-black title-view">
                         <text v-if="reason">{{reason}}</text>
                         <text v-else>暂无描述</text>
                     </view>
@@ -127,26 +128,26 @@
             </view>
 
             <!--请填写回邮商品物流信息-->
-            <view class="bg-white coreshop-card-box" v-if="status == 2 && reshipStatus == 1">
+            <view class="coreshop-bg-white coreshop-card-box" v-if="status == 2 && reshipStatus == 1">
                 <view class="coreshop-card-view coreshop-order-view">
-                    <view class="text-lg text-bold text-black">请填写回邮商品物流信息</view>
-                    <view class="solid-line"></view>
+                    <view class="u-font-lg coreshop-text-bold coreshop-text-black">请填写回邮商品物流信息</view>
+                    <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
 
-                    <view class='cell-group margin-cell-group'>
-                        <view class='cell-item'>
-                            <view class='cell-item-hd'>
-                                <view class='cell-hd-title fsz26'>快递公司</view>
+                    <view class='coreshop-cell-group u-margin-top-20 u-margin-bottom-20'>
+                        <view class='coreshop-cell-item'>
+                            <view class='coreshop-cell-item-hd'>
+                                <view class='coreshop-cell-hd-title fsz26'>快递公司</view>
                             </view>
-                            <view class='cell-item-bd'>
-                                <input class='cell-bd-input fsz26' type="text" v-model="logiCode" placeholder="请填写快递公司名称" />
+                            <view class='coreshop-cell-item-bd'>
+                                <input class='coreshop-cell-bd-input fsz26' type="text" v-model="logiCode" placeholder="请填写快递公司名称" />
                             </view>
                         </view>
-                        <view class='cell-item'>
-                            <view class='cell-item-hd'>
-                                <view class='cell-hd-title fsz26'>物流单号</view>
+                        <view class='coreshop-cell-item'>
+                            <view class='coreshop-cell-item-hd'>
+                                <view class='coreshop-cell-hd-title fsz26'>物流单号</view>
                             </view>
-                            <view class='cell-item-bd'>
-                                <input class='cell-bd-input fsz26' type="text" v-model="logiNo" placeholder="请填写物流单号" />
+                            <view class='coreshop-cell-item-bd'>
+                                <input class='coreshop-cell-bd-input fsz26' type="text" v-model="logiNo" placeholder="请填写物流单号" />
                             </view>
                         </view>
                     </view>
@@ -155,32 +156,30 @@
             </view>
 
             <!--快递公司-->
-            <view class="bg-white coreshop-card-box" v-if="status == 2 && reshipStatus > 1">
+            <view class="coreshop-bg-white coreshop-card-box" v-if="status == 2 && reshipStatus > 1">
                 <view class="coreshop-card-view coreshop-order-view">
-                    <view class="text-lg text-bold text-black">快递公司</view>
-                    <view class="solid-line"></view>
-                    <view class="text-black title-view">
+                    <view class="u-font-lg coreshop-text-bold coreshop-text-black">快递公司</view>
+                    <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                    <view class="coreshop-text-black title-view">
                         <view class="title">快递公司</view>
-                        <view class="text-right">
+                        <view class="u-text-right">
                             <text>{{logiCode}}</text>
                         </view>
                     </view>
-                    <view class="text-black title-view">
+                    <view class="coreshop-text-black title-view">
                         <view class="title">物流单号</view>
-                        <view class="text-right">
-                            <text class="margin-right-xs">{{logiNo}}</text>
-                            <button class="cu-btn sm line-black">复制</button>
+                        <view class="u-text-right">
+                            <text class="u-margin-right-20">{{logiNo}}</text>
+                            <u-tag text="复制" type="success" mode="dark"   @click="doCopyData(logiNo)"/>
                         </view>
                     </view>
                 </view>
             </view>
 
-
         </view>
 
         <!--底部-->
-        <view class="foot-hight-view" />
-
+        <view class="coreshop-foot-hight-view" />
 
         <view class="coreshop-bottomBox" v-show="status == 2 && reshipStatus == 1">
             <button class="coreshop-btn coreshop-btn-b" @click="submitBtn" :disabled='submitStatus' :loading='submitStatus'>提交</button>
@@ -193,7 +192,9 @@
 </template>
 
 <script>
+    import { orders, goods, tools } from '@/common/mixins/mixinsHelper.js';
     export default {
+        mixins: [orders, goods, tools],
         data() {
             return {
                 typeName: '',     //售后类型显示
@@ -255,7 +256,7 @@
                 });
             },
             repeat() {
-                this.$u.route('/pages/member/afterSales/index?orderId=' + this.orderId);
+                this.$u.route('/pages/member/afterSales/submit/submit?orderId=' + this.orderId);
             },
             // 图片点击放大
             clickImg(img) {
@@ -339,8 +340,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .goods-img-item { width: 174rpx; height: 174rpx; padding: 14rpx; position: relative; }
-        .goods-img-item:nth-child(4n) { margin-right: 0; }
-        .goods-img-item image { width: 100%; height: 100%; }
-    @import "../../../static/style/orderDetails.scss";
+    @import "detail.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue
similarity index 60%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue
index 817f9e049aa5aed52a2a2ee7c4c16c1398179e05..ea9a2dcc418b5ef4130498ca37ef9d3994251b04 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/list/list.vue
@@ -1,9 +1,9 @@
 <template>
-    <view class="wrap">
+    <view class="orderWrap">
         <u-navbar title="售后列表"></u-navbar>
 
         <view v-if="order.length>0">
-            <view class="order" v-for="(item, key) in order" :key="key">
+            <view class="orderList" v-for="(item, key) in order" :key="key">
                 <view class="top">
                     <view class="left" @click="doCopyData(item.aftersalesId)">
                         <u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
@@ -27,7 +27,7 @@
                 <!-- 订单底部 -->
                 <view class="bottom">
                     <view class="more">退款金额：￥{{item.refundAmount}}</view>
-                    <view class='logistics coreshop-btn' hover-class="btn-hover" @click="showOrder(item.aftersalesId)">查看详情</view>
+                    <view class='logistics coreshop-btn'  @click="showOrder(item.aftersalesId)">查看详情</view>
                 </view>
             </view>
             <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
@@ -35,7 +35,7 @@
 
         <!-- 无数据时默认显示 -->
         <view class="coreshop-emptybox" v-else>
-            <u-empty :src="$apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="暂无提现明细" mode="list"></u-empty>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="暂无提现明细" mode="list"></u-empty>
         </view>
 
     </view>
@@ -111,37 +111,12 @@
 
             //查看详情
             showOrder(aftersalesId) {
-                this.$u.route('/pages/member/afterSales/detail?aftersalesId=' + aftersalesId);
+                this.$u.route('/pages/member/afterSales/detail/detail?aftersalesId=' + aftersalesId);
             }
         },
     }
 </script>
 
 <style lang="scss" scoped>
-    .order { width: 710rpx; background-color: #ffffff; margin: 20rpx auto; border-radius: 20rpx; box-sizing: border-box; padding: 20rpx; font-size: 28rpx; }
-        .order .top { display: flex; justify-content: space-between; }
-            .order .top .left { display: flex; align-items: center; }
-                .order .top .left .store { margin: 0 10rpx; font-size: 32rpx; font-weight: bold; }
-            .order .top .right { color: $u-type-warning-dark; }
-        .order .item { display: flex; margin: 20rpx 0 0; }
-            .order .item .left { margin-right: 20rpx; }
-                .order .item .left image { width: 200rpx; height: 200rpx; border-radius: 10rpx; }
-            .order .item .content { }
-                .order .item .content .title { font-size: 28rpx; line-height: 50rpx; }
-                .order .item .content .type { margin: 10rpx 0; font-size: 24rpx; color: $u-tips-color; }
-                .order .item .content .delivery-time { color: #e5d001; font-size: 24rpx; }
-            .order .item .right { margin-left: 10rpx; padding-top: 20rpx; text-align: right; }
-                .order .item .right .decimal { font-size: 24rpx; margin-top: 4rpx; }
-                .order .item .right .number { color: $u-tips-color; font-size: 24rpx; }
-        .order .total { margin-top: 20rpx; text-align: right; font-size: 24rpx; }
-            .order .total .total-price { font-size: 32rpx; }
-        .order .bottom { display: flex; margin-top: 40rpx; padding: 0 10rpx; justify-content: space-between; align-items: center; }
-            .order .bottom .coreshop-btn { line-height: 52rpx; width: 160rpx; border-radius: 26rpx; border: 2rpx solid $u-border-color; font-size: 26rpx; text-align: center; color: $u-type-info-dark; }
-            .order .bottom .evaluate { color: $u-type-warning-dark; border-color: $u-type-warning-dark; }
 
-    .centre { text-align: center; margin: 200rpx auto; font-size: 32rpx; }
-        .centre image { width: 164rpx; height: 164rpx; border-radius: 50%; margin-bottom: 20rpx; }
-        .centre .tips { font-size: 24rpx; color: #999999; margin-top: 20rpx; }
-        .centre .coreshop-btn { margin: 80rpx auto; width: 200rpx; border-radius: 32rpx; line-height: 64rpx; color: #ffffff; font-size: 26rpx; background: linear-gradient(270deg, rgba(249, 116, 90, 1) 0%, rgba(255, 158, 1, 1) 100%); }
-    .wrap { display: flex; flex-direction: column; height: calc(100vh - var(--window-top)); width: 100%; }
 </style>
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
new file mode 100644
index 0000000000000000000000000000000000000000..4f15d1756dad3aaea633687d211dfc528d741869
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss
@@ -0,0 +1,45 @@
+.cart-checkbox-item { position: relative; }
+.invoice-type .uni-list-cell { display: inline-block; font-size: 26rpx; color: #333; position: relative; margin-left: 50rpx; }
+    .invoice-type .uni-list-cell > view { display: inline-block; }
+.invoice-type-icon { position: absolute; top: 50%; transform: translateY(-50%); }
+.invoice-type-c { margin-left: 60rpx; line-height: 2; }
+.coreshop-cell-item-ft .coreshop-cell-bd-input { text-align: right; width: 500rpx; font-size: 28rpx; }
+.right-img { border-bottom: 0; }
+.cell-textarea { padding: 0 26rpx 20rpx; }
+    .cell-textarea textarea { width: 100%; height: 200rpx; font-size: 26rpx; color: #333; }
+.evaluate-c-b { overflow: hidden; padding: 0 20rpx; }
+.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%; }
+.del { width: 30rpx !important; height: 30rpx !important; position: absolute; right: 0; top: 0; z-index: 999; }
+.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; }
+
+
+.img-list-item { padding: 10rpx 15rpx; background-color: #fff; overflow: hidden; padding-left: 90rpx; }
+.img-list-item-l { display: inline-block; float: left; }
+.img-list-item-r { width: calc(100% - 190rpx); display: inline-block; margin-left: 26rpx; float: left; position: relative; }
+.list-goods-name { font-size: 28rpx; width: 100% !important; }
+.img-list-item .goods-item-c { width: 100%; margin-top: 0; }
+
+
+.cart-checkbox { position: relative; height: 100%; }
+.cart-checkbox-c { display: inline-block; position: absolute; top: 50%; left: 26rpx; transform: translateY(-50%); z-index: 99; }
+
+
+.goods-salesvolume { min-width: 100rpx; height: 30rpx; font-size: 24rpx; color: #999; display: inline-block; }
+
+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 */ }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
similarity index 81%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/index.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
index 2b0698a78a0878fb079535ddd7247b7dd4f59a7d..f62b8731a890f98fda7b30b297171bc38e62a2eb 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue
@@ -3,14 +3,14 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="提交售后"></u-navbar>
         <view class="content">
-            <view class="solid-bottom text-lg padding">
-                <uni-text class="text-black">
+            <view class="coreshop-solid-bottom u-font-lg u-padding-30">
+                <uni-text class="coreshop-text-black">
                     <span>请选择退货商品和数量</span>
                 </uni-text>
             </view>
 
             <form @submit="submit">
-                <view class="content-top">
+                <view class="coreshop-content-top">
                     <view class="img-list">
                         <checkbox-group class="cart-checkbox" v-for="(item, key) in items" :key="key" @change="checkboxChange">
                             <view class="cart-checkbox-item">
@@ -57,12 +57,12 @@
                             </view>
                         </checkbox-group>
                     </view>
-                    <view class='cell-group margin-cell-group'>
-                        <view class='cell-item'>
-                            <view class='cell-item-hd'>
-                                <view class='cell-hd-title'>是否发货</view>
+                    <view class='coreshop-cell-group u-margin-top-20 u-margin-bottom-20'>
+                        <view class='coreshop-cell-item'>
+                            <view class='coreshop-cell-item-hd'>
+                                <view class='coreshop-cell-hd-title'>是否发货</view>
                             </view>
-                            <view class='cell-item-ft'>
+                            <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">
@@ -97,23 +97,23 @@
                                 </view>
                             </view>
                         </view>
-                        <view class='cell-item refund-price'>
-                            <view class='cell-item-hd'>
-                                <view class='cell-hd-title'>退款金额</view>
+                        <view class='coreshop-cell-item refund-price'>
+                            <view class='coreshop-cell-item-hd'>
+                                <view class='coreshop-cell-hd-title'>退款金额</view>
                             </view>
-                            <view class='cell-item-ft'>
-                                <input type="digit" class='cell-bd-input red-price' v-model="refund" @focus="refundFocus" ref="refund"></input>
+                            <view class='coreshop-cell-item-ft'>
+                                <input type="digit" class='coreshop-cell-bd-input red-price' v-model="refund" @focus="refundFocus" ref="refund"></input>
                             </view>
 
                         </view>
-                        <view class="color-9 fsz24 refund-tip">
+                        <view class=" u-font-24 refund-tip">
                             可修改，最多￥{{maxRefund}}，含发货邮费￥{{costFreight}}
                         </view>
                     </view>
-                    <view class='cell-group margin-cell-group'>
-                        <view class='cell-item right-img'>
-                            <view class='cell-item-hd'>
-                                <view class='cell-hd-title'>上传凭证</view>
+                    <view class='coreshop-cell-group u-margin-top-20 u-margin-bottom-20'>
+                        <view class='coreshop-cell-item right-img'>
+                            <view class='coreshop-cell-item-hd'>
+                                <view class='coreshop-cell-hd-title'>上传凭证</view>
                             </view>
                         </view>
                         <view class="">
@@ -129,13 +129,13 @@
                             </view>
                         </view>
                     </view>
-                    <view class='cell-group margin-cell-group'>
-                        <view class='cell-item right-img'>
-                            <view class='cell-item-hd'>
-                                <view class='cell-hd-title'>问题描述</view>
+                    <view class='coreshop-cell-group u-margin-top-20 u-margin-bottom-20'>
+                        <view class='coreshop-cell-item right-img'>
+                            <view class='coreshop-cell-item-hd'>
+                                <view class='coreshop-cell-hd-title'>问题描述</view>
                             </view>
                         </view>
-                        <view class="cell-textarea ">
+                        <view class="cell-textarea">
                             <input v-model="reason" placeholder="请您在此描述问题(最多200字)" maxlength="200" />
                         </view>
                     </view>
@@ -158,9 +158,9 @@
                     { value: '2', name: '已发货', checked: false, disabled: false },
                 ],
                 typeListByAli: [
-					{ value: '1', name: '仅退款', checked: true, disabled: false },
-					{ value: '2', name: '退货退款', checked: false, disabled:false },
-				],
+                    { value: '1', name: '仅退款', checked: true, disabled: false },
+                    { value: '2', name: '退货退款', checked: false, disabled: false },
+                ],
                 orderId: '',
                 items: [],   //退货明细
                 itemIds: [],  //选择的退货
@@ -383,7 +383,7 @@
                     if (res.status) {
                         _that.$refs.uToast.show({
                             title: '提交成功', type: 'success', callback: function () {
-                                _that.$u.route("/pages/member/order/orderdetail?orderId=" + _that.orderId)
+                                _that.$u.route("/pages/member/order/detail/detail?orderId=" + _that.orderId)
                             }
                         })
                     } else {
@@ -433,50 +433,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .content-top { /* #ifdef MP-WEIXIN */ padding-bottom: 116rpx; /* #endif */ }
-    .cart-checkbox-item { position: relative; }
-    .invoice-type .uni-list-cell { display: inline-block; font-size: 26rpx; color: #333; position: relative; margin-left: 50rpx; }
-        .invoice-type .uni-list-cell > view { display: inline-block; }
-    .invoice-type-icon { position: absolute; top: 50%; transform: translateY(-50%); }
-    .invoice-type-c { margin-left: 60rpx; line-height: 2; }
-    .cell-item-ft .cell-bd-input { text-align: right; width: 500rpx; font-size: 28rpx; }
-    .right-img { border-bottom: 0; }
-    .cell-textarea { padding: 0 26rpx 20rpx; }
-        .cell-textarea textarea { width: 100%; height: 200rpx; font-size: 26rpx; color: #333; }
-    .evaluate-c-b { overflow: hidden; padding: 0 20rpx; }
-    .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%; }
-    .del { width: 30rpx !important; height: 30rpx !important; position: absolute; right: 0; top: 0; z-index: 999; }
-    .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; }
-
-
-    .img-list-item { padding: 10rpx 15rpx; background-color: #fff; overflow: hidden; padding-left: 90rpx; }
-    .img-list-item-l { display: inline-block; float: left; }
-    .img-list-item-r { width: calc(100% - 190rpx); display: inline-block; margin-left: 26rpx; float: left; position: relative; }
-    .list-goods-name { font-size: 28rpx; width: 100% !important; }
-    .img-list-item .goods-item-c { width: 100%; margin-top: 0; }
-
-
-    .cart-checkbox { position: relative; height: 100%; }
-    .cart-checkbox-c { display: inline-block; position: absolute; top: 50%; left: 26rpx; transform: translateY(-50%); z-index: 99; }
-
-
-    .goods-salesvolume { min-width: 100rpx; height: 30rpx; font-size: 24rpx; color: #999; display: inline-block; }
-
-    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 */ }
+    @import "submit.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/agreement/agreement.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/agreement/agreement.scss
new file mode 100644
index 0000000000000000000000000000000000000000..c6448db1855b773cd29442b46a1ee319977f6ff5
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/agreement/agreement.scss
@@ -0,0 +1,3 @@
+.page-body { background: #FFFFFF; border-top-left-radius: 38rpx; border-top-right-radius: 38rpx; margin: 25rpx; padding: 25rpx; }
+.u-content { margin-top: 20rpx; color: $u-content-color; font-size: 28rpx; line-height: 1.8; }
+    .u-content p { color: $u-tips-color; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/agreement.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/agreement/agreement.vue
similarity index 67%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/agent/agreement.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/agreement/agreement.vue
index 9c688904c560bb93cb226fc70ec17c625786c891..34581b0997792940210c0cfef184f14092bce657 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/agreement.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/agreement/agreement.vue
@@ -25,7 +25,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    .page-body { background: #FFFFFF; border-top-left-radius: 38rpx; border-top-right-radius: 38rpx; margin: 25rpx; padding: 25rpx; }
-    .u-content { margin-top: 20rpx; color: $u-content-color; font-size: 28rpx; line-height: 1.8; }
-        .u-content p { color: $u-tips-color; }
+    @import "agreement.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply.vue
deleted file mode 100644
index 1b434aade47eab0099550f3392902efec36d6a8a..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <!--<u-navbar title="提交申请"></u-navbar>-->
-        <!-- 标题栏 -->
-        <view class="head-box">
-            <view class="nav-box"><cu-custom isBack></cu-custom></view>
-            <view class="head-img-wrap"><image class="head-img" :src="$apiFilesUrl + '/static/images/agent/applyBg.jpg'" mode="widthFix"></image></view>
-        </view>
-
-        <!-- 表单 -->
-        <view class="apply-form">
-            <u-form :model="model" :rules="rules" ref="uForm" :errorType="errorType">
-
-                <u-form-item label="姓名" type="text" label-width="150"><u-input placeholder='请填您的姓名' v-model="form.name" /></u-form-item>
-                <u-form-item label="微信" type="text" label-width="150"><u-input placeholder='请填您的微信' v-model="form.weixin" /></u-form-item>
-                <u-form-item label="QQ" type="number" label-width="150"><u-input placeholder='请填您的QQ' v-model="form.qq" /></u-form-item>
-                <u-form-item label="手机" type="number" label-width="150"><u-input placeholder='请填写您的手机号码' v-model="form.mobile" /></u-form-item>
-
-
-                <view class="apply-tip">
-                    <label class="radio u-padding-left-20  u-padding-right-20" @click="agreeAgreement"><radio value="1" :checked="checked" color="#FF7159" /> &nbsp;</label> 我已经阅读并接受 <text class="agreement u-padding-left-20  u-padding-right-20" @click="goAgreement()">"代理商协议"</text>
-                </view>
-
-                <button class="cu-btn save-btn" @tap="goApplyState" :disabled="isFormEnd">
-                    <text v-if="isFormEnd" class="cuIcon-loading2 cuIconfont-spin"></text>
-                    申请成为代理商
-                </button>
-            </u-form>
-        </view>
-
-        <!--<view class="contentBody bg-blue">
-            <view class="apply-content">
-                <view class="apply-form">
-
-
-                </view>
-            </view>
-        </view>-->
-    </view>
-</template>
-<script>
-    export default {
-        data() {
-            return {
-                name: '',
-                weixin: '',
-                qq: '',
-                mobile: '',
-                checked: false,
-                isFormEnd: false, //提交成功
-                form: {
-                    name: '',
-                    weixin: '',
-                    qq: '',
-                    mobile: '',
-                    agreement: 'off'
-                },
-            }
-        },
-        methods: {
-            // 是否同意协议
-            agreeAgreement() {
-                if (this.checked) {
-                    this.checked = false;
-                    this.form.agreement = 'off';
-                } else {
-                    this.checked = true;
-                    this.form.agreement = 'on';
-                }
-            },
-            // 信息验证
-            checkData(data) {
-                console.log(data);
-                if (!data.name) {
-                    this.$u.toast('请输入您的姓名')
-                    return false
-                } else if (!data.weixin) {
-                    this.$u.toast('请输入您的微信')
-                    return false
-                } else if (!data.qq) {
-                    this.$u.toast('请输入您的QQ')
-                    return false
-                } else if (!data.mobile) {
-                    this.$u.toast('请输入您的手机号')
-                    return false
-                } else if (data.mobile.length !== 11) {
-                    this.$u.toast('手机号格式不正确')
-                    return false
-                } else if (data.agreement != 'on') {
-                    //console.log(data)
-                    this.$u.toast('请勾选分销协议')
-                    return false
-                } else {
-                    return true
-                }
-            },
-            // 提交审核
-            goApplyState() {
-                let that = this;
-                that.isFormEnd = true;
-                let data = {
-                    name: that.form.name,
-                    weixin: that.form.weixin,
-                    qq: that.form.qq,
-                    mobile: that.form.mobile,
-                    agreement: that.form.agreement,
-                }
-                if (this.checkData(data)) {
-                    this.$u.api.applyAgent(data).then(res => {
-                        that.isFormEnd = false;
-                        if (res.status) {
-                            this.$refs.uToast.show({ title: res.msg, type: 'success', url: '/pages/member/agent/applyState' })
-                        } else {
-                            this.$u.toast(res.msg);
-                        }
-                    });
-                } else {
-                    that.isFormEnd = false;
-                }
-            },
-            goAgreement() {
-                uni.navigateTo({
-                    url: '/pages/member/agent/agreement'
-                })
-            }
-        }
-    }
-</script>
-<style lang="scss" scoped>
-    @import '../../../static/style/agent.scss';
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/agent.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply/apply.scss
similarity index 93%
rename from CoreCms.Net.Uni-App/CoreShop/static/style/agent.scss
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply/apply.scss
index 31ab3cf420ad0e603a662db87ef956c63b5b0b8b..ee0665efe4b2ba0cb7982195252be58543534b0e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/agent.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply/apply.scss
@@ -1,6 +1,5 @@
 page { background: #fff; }
 .head-box { width: 100%; position: relative;
-    .nav-box { position: absolute; color: #fff; }
     .head-img-wrap { width: 750rpx; height: 400rpx; overflow: hidden;
         .head-img { width: 100%; }
     }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply/apply.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply/apply.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7f6e15287fea8cb29f272384f0663b9259cf3408
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply/apply.vue
@@ -0,0 +1,148 @@
+<template>
+    <view>
+        <u-toast ref="uToast" /><u-no-network></u-no-network>
+        <u-navbar title="提交申请"></u-navbar>
+        <!-- 标题栏 -->
+        <view class="head-box">
+            <view class="head-img-wrap"><image class="head-img" :src="$globalConstVars.apiFilesUrl + '/static/images/agent/applyBg.jpg'" mode="widthFix"></image></view>
+        </view>
+        <!-- 表单 -->
+        <view class="apply-form">
+            <u-form :model="form" :rules="rules" ref="uForm" :errorType="errorType">
+                <u-form-item label="姓名" label-width="150" prop="name">
+                    <u-input type="text" placeholder='请填您的姓名' v-model="form.name" />
+                </u-form-item>
+                <u-form-item label="微信" label-width="150" prop="weixin">
+                    <u-input type="text" placeholder='请填您的微信' v-model="form.weixin" />
+                </u-form-item>
+                <u-form-item label="QQ" label-width="150" prop="qq">
+                    <u-input type="number" placeholder='请填您的QQ' v-model="form.qq" />
+                </u-form-item>
+                <u-form-item label="手机" label-width="150" prop="mobile">
+                    <u-input type="number" placeholder='请填写您的手机号码' v-model="form.mobile" />
+                </u-form-item>
+
+                <view class="u-padding-30 flex u-flex-nowrap">
+                    <u-checkbox-group>
+                        <u-checkbox v-model="form.checked">我已经阅读并接受</u-checkbox>
+                        <text class="coreshop-text-orange u-padding-left-20  u-padding-right-20 u-padding-top-8 u-font-30 coreshop-vertical-align-sub" @click="goAgreement()">"代理协议"</text>
+                    </u-checkbox-group>
+                </view>
+            </u-form>
+            <view class="u-padding-30">
+                <u-button :custom-style="customStyle" class="save-btn" type="primary" size="medium" @click="submit()">申请成为代理商</u-button>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                customStyle: {
+                    width: '100%',
+                },
+                form: {
+                    name: '',
+                    weixin: '',
+                    qq: '',
+                    mobile: '',
+                    checked: false,
+                    isAgreement: 'off'
+                },
+                errorType: ['message'],
+                rules: {
+                    name: [
+                        {
+                            required: true,
+                            message: '请输入姓名',
+                            trigger: ['blur', 'change']
+                        },
+                        {
+                            min: 2,
+                            max: 4,
+                            message: '长度在2-4个字符之间'
+                        }
+                    ],
+                    weixin: [
+                        {
+                            required: true,
+                            message: '请输入微信',
+                            trigger: ['blur', 'change']
+                        }
+                    ],
+                    qq: [
+                        {
+                            required: true,
+                            message: '请输入QQ',
+                            trigger: ['blur', 'change']
+                        },
+                        {
+                            type: "number",
+                            message: 'QQ必须为数字',
+                            trigger: ['change', 'blur']
+                        },
+                    ],
+                    mobile: [
+                        {
+                            required: true,
+                            message: '请输入手机号码',
+                            trigger: ['blur', 'change']
+                        },
+                        {
+                            validator: (rule, value, callback) => {
+                                return this.$u.test.mobile(value);
+                            },
+                            message: '手机号码不正确',
+                            trigger: ['change', 'blur'],
+                        }
+                    ]
+                }
+            }
+        },
+        onReady() {
+            this.$refs.uForm.setRules(this.rules);
+        },
+        methods: {
+            submit() {
+                this.$refs.uForm.validate(valid => {
+                    if (valid) {
+                        console.log('验证通过');
+                        if (this.form.checked == false) {
+                            this.$u.toast('请勾选代理协议')
+                            return false;
+                        }
+                        this.form.isAgreement = "on";
+
+                        // 提交审核
+                        let data = {
+                            name: this.form.name,
+                            weixin: this.form.weixin,
+                            qq: this.form.qq,
+                            mobile: this.form.mobile,
+                            agreement: this.form.isAgreement,
+                        }
+                        this.$u.api.applyAgent(data).then(res => {
+                            if (res.status) {
+                                this.$refs.uToast.show({ title: res.msg, type: 'success', url: '/pages/member/agent/applyState/applyState' })
+                            } else {
+                                this.$u.toast(res.msg);
+                            }
+                        });
+
+                    } else {
+                        console.log('验证失败');
+                    }
+                });
+            },
+            goAgreement() {
+                uni.navigateTo({
+                    url: '/pages/member/agent/agreement/agreement'
+                })
+            }
+        }
+    }
+</script>
+<style lang="scss" scoped>
+    @import 'apply.scss';
+</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/applyState/applyState.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/applyState/applyState.scss
new file mode 100644
index 0000000000000000000000000000000000000000..d755bb4bd71d8a47f573877f95c27427717ad720
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/applyState/applyState.scss
@@ -0,0 +1,5 @@
+page { background: #FFFFFF; }
+
+.coreshop-status-image-view { position: relative; text-align: center; margin-top: 90.9rpx; margin-bottom: 18.18rpx; background: #FFFFFF;
+    image { width: 472.72rpx; }
+}
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/applyState.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/applyState/applyState.vue
similarity index 56%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/agent/applyState.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/applyState/applyState.vue
index 9c25faf24b0f7242796ddb1fb93f25daa40539ea..ca6721b1d1252710ef4325a71aa94fc754c9b689 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/applyState.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/applyState/applyState.vue
@@ -4,29 +4,29 @@
         <u-navbar title="申请状态"></u-navbar>
 
         <!--状态图标-->
-        <view class="zaiui-status-image-view">
-            <image :src="$apiFilesUrl+'/static/images/common/non_real_name.png'" mode="widthFix" v-if="info.verifyStatus==3" />
-            <image :src="$apiFilesUrl+'/static/images/common/real_name.png'" mode="widthFix" v-if="info.verifyStatus==2 || info.verifyStatus==1" />
+        <view class="coreshop-status-image-view">
+            <image :src="$globalConstVars.apiFilesUrl+'/static/images/common/non_real_name.png'" mode="widthFix" v-if="info.verifyStatus==3" />
+            <image :src="$globalConstVars.apiFilesUrl+'/static/images/common/real_name.png'" mode="widthFix" v-if="info.verifyStatus==2 || info.verifyStatus==1" />
         </view>
 
 
-        <view class="text-black text-lg text-center margin-bottom-sm" v-if="status">
-            <text class="margin-right">{{info.name}}</text>
+        <view class="coreshop-text-black u-font-lg u-text-center u-margin-bottom-20" v-if="status">
+            <text class="u-margin-right-20">{{info.name}}</text>
             <text>{{info.mobile}}</text>
         </view>
 
         <!--状态信息-->
-        <view class="text-black text-xl text-center margin-bottom-sm" v-if="info.verifyStatus==2">
+        <view class="coreshop-text-black u-font-xl u-text-center u-margin-bottom-20" v-if="info.verifyStatus==2">
             恭喜，您的申请已提交！
         </view>
-        <view class="text-black text-xl text-center margin-bottom-sm" v-if="info.verifyStatus==3">
+        <view class="coreshop-text-black u-font-xl u-text-center u-margin-bottom-20" v-if="info.verifyStatus==3">
             抱歉，您的申请被驳回！
         </view>
-        <view class="text-black text-xl text-center margin-bottom-sm" v-if="info.verifyStatus==1">
+        <view class="coreshop-text-black u-font-xl u-text-center u-margin-bottom-20" v-if="info.verifyStatus==1">
             恭喜，您的申请已通过！
         </view>
 
-        <view class="text-gray text-center zaiui-content-view" v-if="info.verifyStatus==2">
+        <view class="coreshop-text-gray u-text-center  u-padding-70" v-if="info.verifyStatus==2">
             您于{{info.createTime}}提交的申请已经提交成功，当前状态：<text v-if="info.verifyStatus==2">等待审核</text><text v-if="info.verifyStatus==3">审核驳回</text><text v-if="info.verifyStatus==1">审核通过</text>
         </view>
 
@@ -45,10 +45,10 @@
             _this.$u.api.getAgentInfo({ check_condition: true }).then(res => {
                 if (res.status) {
                     if (res.data.needApply && res.data.conditionStatus == false) {
-                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/index' });
+                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/index/index' });
                     }
                     if (res.data.verifyStatus == 1) {//审核通过
-                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/index' });
+                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/index/index' });
                     }
                     _this.info = res.data;
                 } else {
@@ -61,10 +61,6 @@
         }
     }
 </script>
-<style>
-    page { background: #FFFFFF; }
-
-    .zaiui-status-image-view { position: relative; text-align: center; margin-top: 90.9rpx; margin-bottom: 18.18rpx; background: #FFFFFF; }
-        .zaiui-status-image-view image { width: 472.72rpx; }
-    .zaiui-content-view { position: relative; padding: 0 72.72rpx; }
+<style lang="scss">
+    @import "applyState.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails/commissionDetails.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails/commissionDetails.scss
new file mode 100644
index 0000000000000000000000000000000000000000..92f21e3801e9cc535eb0f4846d921b099600be57
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails/commissionDetails.scss
@@ -0,0 +1,27 @@
+.wallet-wrap { background-color: #fff; padding: 30rpx; }
+.wallet-card { width: 690rpx; height: 301rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; border-radius: 20rpx; padding: 30rpx; position: relative; box-shadow: 1rpx 5rpx 16rpx 0px rgba(229,77,66, 0.81);
+    .head-box { margin-bottom: 20rpx;
+        .head-title { font-size: 24rpx; font-weight: 400; color: #ffffff; }
+        .look-btn { color: #fff; font-size: 30rpx; background: none; padding: 0; margin-left: 20rpx; }
+    }
+    .card-num { font-size: 40rpx; font-weight: 500; color: #fefefe; margin-bottom: 30rpx; }
+    .card-bottom {
+        .card-item {
+            .item-title { font-size: 24rpx; font-weight: 400; color: #ffffff; margin-bottom: 10rpx; }
+            .item-value { font-size: 30rpx; font-weight: 500; color: #fefefe; }
+        }
+    }
+    .draw-btn { position: absolute; top: 35rpx; right: 35rpx; width: 121rpx; height: 58rpx; background: #ffffff; border-radius: 29rpx; padding: 0; font-size: 24rpx; font-weight: 500; color: #e54d42; }
+}
+    .wallet-card .head-box .look-btn .cuIcon-attentionfill,
+    .wallet-card .head-box .look-btn .cuIcon-attentionforbidfill { line-height: 30rpx; }
+.head_box { height: 120rpx; padding: 0 30rpx; background-color: #f6f6f6;
+    .date-btn { font-size: 24rpx; color: #666666; }
+    .total-box { font-size: 24rpx; font-weight: 500; color: #666666; }
+}
+.state-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; background-color: #fff; border-bottom: 1rpx solid rgba(153, 153, 153, 0.5);
+    .state-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
+    .title-active { color: #333; }
+    .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
+    .underline-active { background: #e54d42; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails/commissionDetails.vue
similarity index 67%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails/commissionDetails.vue
index 9f2f8648cc71d68873cd92f7e76a51b789597788..76f45765929eb14e7471a9a4e18bd3e00690f791 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/commissionDetails/commissionDetails.vue
@@ -1,29 +1,26 @@
 <!-- 佣金明细 -->
 <template>
-    <view class="commission-log-wrap">
+    <view>
+        <u-navbar title="佣金明细"></u-navbar>
         <view class="topheader">
-
-            <cu-custom isBack bg-color="bg-white">
-                <block slot="backText">佣金明细</block>
-            </cu-custom>
             <!-- 筛选 -->
             <view class="wallet-wrap">
-                <view class="wallet-card bg-blue">
-                    <view class="head-box x-f">
+                <view class="wallet-card  coreshop-bg-blue">
+                    <view class="head-box coreshop-flex coreshop-align-center">
                         <view class="head-title">总收益（元）</view>
-                        <button class="cu-btn look-btn" @tap="onEye">
-                            <text v-if="showMoney" class="cuIcon-attentionfill"></text>
-                            <text v-else class="cuIcon-attentionforbidfill"></text>
-                        </button>
+                        <view class="look-btn" @click="onEye">
+                                <u-icon class="eye" v-if="showMoney" name="eye-fill"></u-icon>
+                                <u-icon class="eye" v-else name="eye-off"></u-icon>
+                         </view>
                     </view>
                     <view class="card-num">{{ showMoney ? info.totalSettlementAmount || '0.00' : '***' }}</view>
-                    <view class="card-bottom x-bc">
-                        <view class="card-item y-start">
+                    <view class="card-bottom u-flex u-row-between">
+                        <view class="card-item coreshop-flex coreshop-flex-direction coreshop-align-start">
                             <view class="item-title">待入账佣金</view>
                             <view class="item-value">{{ showMoney ? info.freezeAmount || '0.00' : '***' }}</view>
                         </view>
 
-                        <view class="card-item y-start">
+                        <view class="card-item coreshop-flex coreshop-flex-direction coreshop-align-start">
                             <view class="item-title">可提现佣金</view>
                             <view class="item-value">{{ showMoney ? userInfo.balance || '0.00' : '***' }}</view>
                         </view>
@@ -32,17 +29,12 @@
                     <button class="cu-btn draw-btn" @tap="goWithdraw">提现</button>
                 </view>
             </view>
-
-
-            <view class="head_box x-bc">
-                <button class="cu-btn date-btn" @tap="onFilterDate">
-                    {{ selDateText }}
-                    <text class="cuIcon-triangledownfill"></text>
-                </button>
+            <view class="head_box u-flex u-row-between">
+                <u-button @click="onFilterDate" shape="square" size="mini" class="date-btn">{{ selDateText }}<u-icon name="arrow-down" class="u-margin-left-20"></u-icon></u-button>
                 <view class="total-box">收入￥{{ totalMoney || '0.00' }}</view>
             </view>
             <!-- 状态分类 -->
-            <!--<view class="x-f nav-box">
+            <!--<view class="coreshop-flex coreshop-align-center nav-box">
                 <view class="state-item flex-sub " v-for="(state, index) in statusList" :key="state.value" @tap="onTab(state.value)">
                     <text class="state-title" :class="{ 'title-active': stateCurrent === state.value }">{{ state.name }}</text>
                     <text class="underline" :class="{ 'underline-active': stateCurrent === state.value }"></text>
@@ -53,17 +45,17 @@
             <view class="item-box">
                 <!-- 佣金明细列表 -->
                 <view v-if="list.length>0">
-                    <view class="log-item x-bc" v-for="item in list" :key="item.id">
-                        <view class="item-left x-f">
+                    <view class="coreshop-log-item u-flex u-row-between" v-for="item in list" :key="item.id">
+                        <view class="item-left coreshop-flex coreshop-align-center">
                             <!--<image class="log-img" :src="item.buyer.avatar" mode=""></image>-->
-                            <view class="y-start">
-                                <view class="log-name  text-black">{{ item.typeName }}</view>
-                                <view class="log-notice  text-grey">订单号：{{ item.sourceId }}</view>
+                            <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
+                                <view class="log-name  coreshop-text-black">{{ item.typeName }}</view>
+                                <view class="log-notice  coreshop-text-grey">订单号：{{ item.sourceId }}</view>
                             </view>
                         </view>
-                        <view class="item-right y-end">
-                            <view class="log-num  text-red">+{{ item.money }}</view>
-                            <view class="log-date  text-grey">{{ $u.timeFormat(item.createTime, 'yyyy.mm.dd') }}</view>
+                        <view class="item-right coreshop-flex coreshop-flex-direction coreshop-align-end">
+                            <view class="log-num  coreshop-text-red">+{{ item.money }}</view>
+                            <view class="log-date  coreshop-text-grey">{{ $u.timeFormat(item.createTime, 'yyyy.mm.dd') }}</view>
                         </view>
                     </view>
                     <!-- 更多 -->
@@ -72,7 +64,7 @@
 
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="当前日期暂无佣金明细" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="当前日期暂无佣金明细" mode="list"></u-empty>
                 </view>
             </view>
 
@@ -228,7 +220,7 @@
             },
             //去提现
             goWithdraw() {
-                this.$u.route('/pages/member/balance/withdrawCash')
+                this.$u.route('/pages/member/balance/withdrawCash/withdrawCash')
             },
             initData() {
                 // 获取用户信息
@@ -270,28 +262,5 @@
 </script>
 
 <style lang="scss">
-    .wallet-wrap { background-color: #fff; padding: 30rpx; }
-    .wallet-card { width: 690rpx; height: 301rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; border-radius: 20rpx; padding: 30rpx; position: relative; box-shadow: 1rpx 5rpx 16rpx 0px rgba(229,77,66, 0.81); }
-        .wallet-card .head-box { margin-bottom: 20rpx; }
-            .wallet-card .head-box .head-title { font-size: 24rpx; font-weight: 400; color: #ffffff; }
-            .wallet-card .head-box .look-btn { color: #fff; font-size: 30rpx; background: none; padding: 0; margin-left: 20rpx; }
-                .wallet-card .head-box .look-btn .cuIcon-attentionfill,
-                .wallet-card .head-box .look-btn .cuIcon-attentionforbidfill { line-height: 30rpx; }
-                .wallet-card .head-box .look-btn .cuIcon-attentionfill { line-height: 30rpx; }
-        .wallet-card .card-num { font-size: 40rpx; font-weight: 500; color: #fefefe; margin-bottom: 30rpx; }
-        .wallet-card .card-bottom .card-item .item-title { font-size: 24rpx; font-weight: 400; color: #ffffff; margin-bottom: 10rpx; }
-        .wallet-card .card-bottom .card-item .item-value { font-size: 30rpx; font-weight: 500; color: #fefefe; }
-        .wallet-card .draw-btn { position: absolute; top: 35rpx; right: 35rpx; width: 121rpx; height: 58rpx; background: #ffffff; border-radius: 29rpx; padding: 0; font-size: 24rpx; font-weight: 500; color: #e54d42; }
-
-    .head_box { height: 120rpx; padding: 0 30rpx; background-color: #f6f6f6; }
-        .head_box .date-btn { background-color: #fff; height: 54rpx; border-radius: 27rpx; padding: 0; padding-left: 20rpx; font-size: 24rpx; font-weight: 500; color: #666666; }
-            .head_box .date-btn .cuIcon-triangledownfill { font-size: 60rpx; color: #e5e5e5; }
-        .head_box .total-box { font-size: 24rpx; font-weight: 500; color: #666666; }
-
-
-    .state-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; background-color: #fff; border-bottom: 1rpx solid rgba(153, 153, 153, 0.5); }
-        .state-item .state-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
-        .state-item .title-active { color: #333; }
-        .state-item .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
-        .state-item .underline-active { background: #e54d42; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+    @import"commissionDetails.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/index/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/index/index.scss
new file mode 100644
index 0000000000000000000000000000000000000000..7eabe1b0e63386ff0312547fa53f0ef812219ec3
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/index/index.scss
@@ -0,0 +1,3 @@
+.page-body { background: #FFFFFF; border-top-left-radius: 38rpx; border-top-right-radius: 38rpx; margin: 25rpx; padding: 25rpx; margin-bottom: 150rpx; }
+.u-content { margin-top: 20rpx; color: $u-content-color; font-size: 28rpx; line-height: 1.8; }
+    .u-content p { color: $u-tips-color; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/index/index.vue
similarity index 66%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/agent/index.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/index/index.vue
index a18bef2e243650bf8269f3f464e240d538c8e2e4..7aef7b659d17ec464e9e8b8abe0e89dc1588573b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/index/index.vue
@@ -3,19 +3,18 @@
         <view v-if="show">
             <u-toast ref="uToast" /><u-no-network></u-no-network>
             <u-navbar title="代理商申请"></u-navbar>
-
             <view class="page-body">
                 <view class="u-content">
                     <u-parse :html="agentNotes" :selectable="true"></u-parse>
                 </view>
-                <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
-                    <view class="flex padding-sm flex-direction">
-                        <button class="cu-btn bg-blue" v-if="condition.conditionStatus" @click="goApply()">申请</button>
-                        <button class="cu-btn bg-grey" v-else>您的条件暂不满足</button>
+                <!--按钮-->
+                <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" size="medium" type="error" v-if="condition.conditionStatus" @click="goApply()">申请</u-button>
+                        <u-button :custom-style="customStyle" size="medium" type="primary" v-else>您的条件暂不满足</u-button>
                     </view>
                 </view>
             </view>
-
         </view>
     </view>
 
@@ -24,13 +23,16 @@
     export default {
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 show: false,
                 condition: {}
             }
         },
         methods: {
             goApply() {
-                this.$u.route('/pages/member/agent/apply');
+                this.$u.route('/pages/member/agent/apply/apply');
             }
         },
         computed: {
@@ -44,9 +46,9 @@
                 if (res.status) {
                     _this.condition = res.data;
                     if (_this.condition.verifyStatus == 1 || (!_this.condition.needApply && _this.conditionStatus)) {
-                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/panel' });
+                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/panel/panel' });
                     } else if (_this.condition.verifyStatus > 1) {
-                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/applyState' });
+                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/applyState/applyState' });
                     } else {
                         _this.show = true;
                     }
@@ -59,7 +61,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    .page-body { background: #FFFFFF; border-top-left-radius: 38rpx; border-top-right-radius: 38rpx; margin: 25rpx; padding: 25rpx; margin-bottom: 150rpx; }
-    .u-content { margin-top: 20rpx; color: $u-content-color; font-size: 28rpx; line-height: 1.8; }
-        .u-content p { color: $u-tips-color; }
+    @import "index.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.scss
new file mode 100644
index 0000000000000000000000000000000000000000..10c03d7aff366fa77e904b6f96c4776d52ead1da
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.scss
@@ -0,0 +1,17 @@
+.mst-top { width: 100%;
+    image { width: 100%; max-height: 450rpx; }
+}
+.coreshop-grid { padding: 20rpx 26rpx; width: 100%; display: flex; border-top: 2rpx solid #ddd; background-color: #fff; margin-bottom: 20rpx;
+    .coreshop-item { flex: 1; text-align: center; position: relative; border-right: 2rpx solid #eee; height: 90rpx;
+        &:last-child { border: none; }
+        &:active { transform: scale(.90); transition: all .5s; opacity: .8; }
+        .coreshop-item-icon { width: 50rpx; height: 50rpx; display: block; margin: 0 auto; }
+        .coreshop-item-text { font-size: 28rpx; color: #666; display: block; margin-top: 6rpx; }
+        .coreshop-item-img { width: 150rpx; height: 150rpx; top: -70rpx; position: absolute; left: 42%; transform: translateX(-50%); border-radius: 10rpx; background-color: #fff; border-radius: 6rpx; box-shadow: 0 0 10rpx #ccc; }
+    }
+}
+
+.collect-pop { width: 100%; height: 100%;
+    image { width: 100%; }
+}
+.h5-tip { text-align: center; margin-top: 300rpx; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
similarity index 51%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
index 62a26b8691aeaaf81ec90e49d305eabf77ced73f..ab3a5359cd3d5059e2f1aae80c4eed54c932facd 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
@@ -2,114 +2,98 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar :title="storeName"></u-navbar>
-        <view class="content my-store">
-            <view class="" ref="myStore">
-                <view class="my-store-t">
-                    <view class="mst-top">
-                        <image :src="storeBanner" mode="widthFix"></image>
+        <view ref="myStore">
+            <view class="mst-top">
+                <u-swiper :list="storeBanner"></u-swiper>
+            </view>
+            <view class="mst-bot">
+                <view class='coreshop-grid'>
+                    <view class='coreshop-item'>
+                        <image class='coreshop-item-img' :src='storeLogo'></image>
                     </view>
-                    <view class="mst-bot">
-                        <view class='coreshop-grid'>
-                            <view class='coreshop-item'>
-                                <image class='coreshop-item-img' :src='storeLogo'></image>
-                            </view>
-                            <view class='coreshop-item'>
-                                <view class="color-o fsz36">{{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 -->
-                            <view class='coreshop-item'>
-                                <!-- #ifdef MP-WEIXIN -->
-                                <!--<button class='share coreshop-btn' open-type="share">-->
-                                <button class='share coreshop-btn' @click="createPoster()">
-                                    <u-icon name="grid" size="36" label="二维码" label-pos="bottom" margin-top="15"></u-icon>
-                                </button>
-                                <!-- #endif -->
-                                <!-- #ifndef MP-WEIXIN -->
-                                <button class='share coreshop-btn' @click="createPoster()">
-                                    <u-icon name="grid" size="36" label="二维码" label-pos="bottom" margin-top="15"></u-icon>
-                                </button>
-                                <!-- #endif -->
-                            </view>
-                        </view>
+                    <view class='coreshop-item'>
+                        <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 class="my-store-m">
-                    <view class="u-padding-15 u-margin-bottom-15 bg-white u-border-bottom" @tap="goSearch()">
-                        <u-search placeholder="请输入关键字搜索" :show-action="true" action-text="搜索" :animation="false"></u-search>
+            </view>
+            <view class="u-padding-15 u-margin-bottom-15 coreshop-bg-white u-border-bottom" @tap="goSearch()">
+                <u-search placeholder="请输入关键字搜索" :show-action="true" action-text="搜索" :animation="false"></u-search>
+            </view>
+            <!-- 收藏弹出窗 -->
+            <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>
-                <!-- 收藏弹出窗 -->
-                <lvv-popup position="bottom" ref="lvvpopref" @click="closePopup()">
-                    <view class="collect-pop" @click="closePopup()">
-                        <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>
+            </u-popup>
+        </view>
+        <!-- 商品列表 -->
+        <view>
+            <view class="coreshop-goods-group" v-if="goodsData.length>0">
+                <u-grid col="2" :border="false" :align="center">
+                    <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in goodsData" :key="index" @click="goGoodsDetail(item.id)">
+                        <view class="good_box">
+                            <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
+                            <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
+                            <view class="good_title u-line-2">
+                                {{item.name}}
+                            </view>
+                            <view class="good-price">
+                                {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
+                            </view>
+                            <view class="good-tag-recommend" v-if="item.isRecommend">
+                                推荐
+                            </view>
+                            <view class="good-tag-hot" v-if="item.isHot">
+                                热门
+                            </view>
                         </view>
-                        <!-- #endif -->
-                    </view>
-                </lvv-popup>
+                    </u-grid-item>
+                </u-grid>
             </view>
-            <!-- 商品列表 -->
-            <view>
-                <view class="goodsBox" v-if="goodsData.length>0">
-                    <u-grid col="2" :border="false" :align="center">
-                        <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in goodsData" :key="index" @click="goGoodsDetail(item.id)">
-                            <view class="good_box">
-                                <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
-                                <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
-                                <view class="good_title u-line-2">
-                                    {{item.name}}
-                                </view>
-                                <view class="good-price">
-                                    {{item.price}}元 <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{item.mktprice}}元</span>
-                                </view>
-                                <view class="good-tag-recommend" v-if="item.isRecommend">
-                                    推荐
-                                </view>
-                                <view class="good-tag-hot" v-if="item.isHot">
-                                    热门
-                                </view>
-                            </view>
-                        </u-grid-item>
-                    </u-grid>
-                </view>
-                <!-- 无数据时默认显示 -->
-                <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="暂无商品列表" mode="list"></u-empty>
-                </view>
+            <!-- 无数据时默认显示 -->
+            <view class="coreshop-emptybox" v-else>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="暂无商品列表" mode="list"></u-empty>
             </view>
-            <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
         </view>
+        <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
     </view>
 
 </template>
 <script>
-    import lvvPopup from '@/components/corecms-lvv-popup/corecms-lvv-popup.vue';
     import { goods, articles, commonUse } from '@/common/mixins/mixinsHelper.js'
 
-    import {
-        apiBaseUrl
-    } from '@/common/setting/constVarsHelper.js'
     export default {
         mixins: [goods, articles, commonUse],
-        components: {
-            lvvPopup,
-        },
         data() {
             return {
                 goodsData: [],
@@ -138,12 +122,13 @@
                 storeLogo: '',
                 store_banner: '',
                 storeDesc: '', //店铺介绍
-                storeBanner: '',
+                storeBanner: [],
                 isWeixinBrowser: this.$common.isWeiXinBrowser(), //判断是否是微信浏览器
                 totalGoods: 0,
                 page: 1, //默认页码
                 searchKey: '请输入关键字搜索',
-                shareUrl: '/pages/share/jump/jump'
+                shareUrl: '/pages/share/jump/jump',
+                lvvpopref: false
             }
         },
         onShow: function () {
@@ -179,11 +164,11 @@
         methods: {
             // 显示modal弹出框
             openPopup() {
-                this.$refs.lvvpopref.show();
+                this.lvvpopref = true;
             },
             // 关闭modal弹出框
             closePopup() {
-                this.$refs.lvvpopref.close();
+                this.lvvpopref = false;
             },
             //去搜索
             goSearch() {
@@ -253,7 +238,13 @@
                         _this.storeName = res.data.storeName ? res.data.storeName : "我的店铺";
                         _this.storeDesc = res.data.storeDesc;
                         _this.storeLogo = res.data.storeLogo ? res.data.storeLogo : '/static/images/common/empty.png';
-                        _this.storeBanner = res.data.storeBanner ? res.data.storeBanner : '/static/images/common/empty-banner.png';
+
+                        if (res.data.storeBanner) {
+                            _this.storeBanner = res.data.storeBanner.split(',');
+                        } else {
+                            _this.storeBanner.push('/static/images/common/empty-banner.png');
+                        }
+
                         //_this.totalGoods = res.data.totalGoods;
                         uni.setNavigationBarTitle({
                             title: _this.storeName
@@ -276,7 +267,7 @@
                 let pageUrl = 'pages/share/jump/jump';
                 // #ifdef H5
                 data.client = 1;
-                data.url = apiBaseUrl + 'wap/' + pageUrl;
+                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
                 // #endif
                 // #ifdef MP-WEIXIN
                 data.client = 2;
@@ -288,7 +279,7 @@
                 // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 data.client = 5;
-                data.url = apiBaseUrl + 'wap/' + pageUrl;
+                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
                 // #endif
                 // #ifdef MP-TOUTIAO
                 data.client = 6;
@@ -357,36 +348,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    view { box-sizing: border-box; }
-    .mst-top { width: 100%; }
-        .mst-top image { width: 100%; max-height: 450rpx; }
-    .coreshop-grid { padding: 20rpx 26rpx; width: 100%; display: flex; border-top: 2rpx solid #ddd; background-color: #fff; margin-bottom: 20rpx; }
-    .coreshop-item { flex: 1; text-align: center; position: relative; border-right: 2rpx solid #eee; height: 90rpx; }
-        .coreshop-item:last-child { border-right: none; }
-        .coreshop-item:active { transform: scale(.90); transition: all .5s; opacity: .8; }
-    .coreshop-item-icon { width: 50rpx; height: 50rpx; display: block; margin: 0 auto; }
-    .coreshop-item-text { font-size: 28rpx; color: #666; display: block; margin-top: 15rpx; }
-    .coreshop-item-img { width: 150rpx; height: 150rpx; top: -70rpx; position: absolute; left: 42%; transform: translateX(-50%); border-radius: 10rpx; background-color: #fff; border-radius: 6rpx; box-shadow: 0 0 10rpx #ccc; }
-
-    .collect-pop { width: 100%; height: 100%; position: absolute; left: 0; bottom: 0; }
-        .collect-pop image { width: 100%; }
-    .h5-tip { text-align: center; margin-top: 300rpx; }
-
-    .coreshop-item .share { background: none !important; line-height: normal; }
-
-
-    .goodsBox { border-radius: 16rpx; /*padding: 0rpx 10rpx; background: #FFFFFF !important;*/ color: #333333 !important; margin: 0 10rpx; }
-    .u-cell { padding: 15rpx 25rpx; }
-    .u-close { position: absolute; top: 30rpx; right: 30rpx; }
-    .good_box { border-radius: 8px; margin: 3px; background-color: #ffffff; padding: 5px; position: relative; width: calc(100% - 6px); }
-    .good_image { width: 100%; border-radius: 4px; }
-    .good_title { font-size: 26rpx; margin-top: 5px; color: $u-main-color; }
-    .good_title-xl { font-size: 28rpx; margin-top: 5px; color: $u-main-color; }
-    .good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 15rpx; left: 15rpx; background-color: $u-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 4rpx 14rpx; border-radius: 50rpx; font-size: 20rpx; line-height: 1; }
-    .good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 15rpx; right: 15rpx; background-color: $u-type-primary; color: #FFFFFF; margin-left: 10px; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
-    .good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 15rpx; left: 15rpx; background-color: $u-type-primary; color: #FFFFFF; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
-    .good-price { font-size: 30rpx; color: $u-type-error; margin-top: 5px; }
-    .good-des { font-size: 20rpx; color: $u-tips-color; margin-top: 5px; }
-
-    .grid-text { font-size: 28rpx; margin-top: 4rpx; color: $u-type-info; }
+    @import "myStore.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.scss
new file mode 100644
index 0000000000000000000000000000000000000000..239844b3c2a038d1b2956bc65589934b89f23891
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.scss
@@ -0,0 +1,58 @@
+.direct-box { margin: 20rpx;
+    .direct-item { width: 341rpx; height: 117rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx;
+        .item-title { font-size: 22rpx; font-weight: 500; color: #999999; margin-bottom: 6rpx; }
+        .item-value { font-size: 38rpx; font-weight: 600; color: #333333; }
+    }
+}
+.team-data-box { padding: 20rpx;
+    .data-card { width: 340rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx;
+        .item-title { font-size: 22rpx; font-weight: 500; color: #999999; line-height: 30rpx; margin-bottom: 10rpx; }
+        .total-item { margin-bottom: 20rpx; }
+        .total-num { font-size: 38rpx; font-weight: 600; color: #333333; }
+        .category-num { font-size: 26rpx; font-weight: 600; color: #333333; }
+    }
+}
+.head_box { width: 750rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center;
+    .cu-back { color: #fff; font-size: 40rpx; }
+    .head-title { font-size: 38rpx; color: #fff; }
+}
+.nav-box { background-color: #fff; padding: 0 30rpx; }
+.state-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center;
+    .state-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
+    .title-active { color: #333; }
+    .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
+    .underline-active { background: #e54d42; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+}
+.order-list { background-color: #fff; margin-top: 20rpx;
+    .order-head { padding: 20rpx;
+        .order-code { font-size: 26rpx; font-weight: 400; color: #999999; }
+        .order-state { font-size: 26rpx; font-weight: 500; color: #05c3a1; }
+    }
+    .order-from { background-color: #f9f9f9; padding: 20rpx;
+        .from-user { font-size: 24rpx; font-weight: 400; color: #666666;
+            .user-avatar { width: 26rpx; height: 26rpx; border-radius: 50%; margin-right: 8rpx; }
+            .user-name { font-size: 24rpx; font-weight: 400; color: #999999; }
+        }
+        .order-time { font-size: 24rpx; font-weight: 400; color: #999999; }
+    }
+    .goods-card { padding: 30rpx 20rpx;
+        .goods-img-box { margin-right: 30rpx;
+            .goods-img { width: 160rpx; height: 160rpx; background-color: #ccc; }
+        }
+        .goods-info { height: 160rpx; width: 600rpx; align-items: flex-start;
+            .goods-title { font-size: 28rpx; font-weight: 500; color: #333333; }
+            .goods-sku { font-size: 24rpx; font-weight: 400; color: #666666; }
+            .goods-price { font-size: 30rpx; font-weight: 500; color: #333333;
+                .goods-state { line-height: 30rpx; padding: 0 10rpx; background: #f1eeff; border: 1rpx solid #e54d42; border-radius: 30rpx; margin-left: 20rpx; font-size: 20rpx; color: #e54d42; }
+                &::before { content: '￥'; font-size: 20rpx; }
+            }
+        }
+    }
+    .total-box { height: 80rpx; padding: 0 20rpx;
+        .num-price { font-size: 24rpx; font-weight: 400; color: #999999; }
+        .name { font-size: 24rpx; font-weight: 400; color: #999999; }
+        .commission-num { font-size: 30rpx; font-weight: 400; color: #eb2b3d;
+            &::before { content: '￥'; font-size: 22rpx; }
+        }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.vue
similarity index 61%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.vue
index 136daf22b93b5263b9edf44074e7873a625a233f..4a5d4197e5f9f0d026ecf5976b4ae24d696f1453 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.vue
@@ -1,25 +1,22 @@
 <template>
-    <view class="pageBox commission-order-wrap">
+    <view >
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <view class="head_box bg-blue">
-            <!-- 标题 -->
-            <cu-custom isBack>
-                <block slot="backText">代理订单</block>
-            </cu-custom>
+        <u-navbar title="代理订单"></u-navbar>
 
+        <view class="head_box coreshop-bg-blue">
             <!-- 团队数据总览 -->
-            <view class="team-data-box x-bc">
+            <view class="team-data-box u-flex u-row-between">
                 <view class="data-card">
                     <view class="total-item">
                         <view class="item-title">总订单数量（单）</view>
                         <view class="total-num">{{ orderInfo.allOrder }}</view>
                     </view>
-                    <view class="category-item x-f">
-                        <view class="y-start flex-sub">
+                    <view class="category-item u-flex u-row-between">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">代购订单</view>
                             <view class="category-num">{{ orderInfo.procurementServiceOrder }}</view>
                         </view>
-                        <view class="y-start flex-sub">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">客户订单</view>
                             <view class="category-num">{{ orderInfo.customerOrder }}</view>
                         </view>
@@ -30,12 +27,12 @@
                         <view class="item-title">总订单金额（元）</view>
                         <view class="total-num">{{ orderInfo.allOrderMoney || '0.00' }}</view>
                     </view>
-                    <view class="category-item x-f">
-                        <view class="y-start flex-sub">
+                    <view class="category-item u-flex u-row-between">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">代购订单</view>
                             <view class="category-num">{{ orderInfo.procurementServiceOrderMoney || '0.00' }}</view>
                         </view>
-                        <view class="y-start ">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
                             <view class="item-title">客户订单</view>
                             <view class="category-num">{{ orderInfo.customerOrderMoney || '0.00' }}</view>
                         </view>
@@ -44,7 +41,7 @@
             </view>
 
             <!-- 直推 -->
-            <view class="direct-box x-bc">
+            <view class="direct-box u-flex u-row-between">
                 <view class="direct-item ">
                     <view class="item-title">本月订单总数（单）</view>
                     <view class="item-value">{{ orderInfo.monthOrder || '0'  }}</view>
@@ -56,7 +53,7 @@
             </view>
 
             <!-- 状态分类 -->
-            <view class="x-f nav-box">
+            <view class="u-flex u-row-between nav-box">
                 <view class="state-item flex-sub " v-for="(state, index) in statusList" :key="state.value" @tap="onTab(state.value)">
                     <text class="state-title" :class="{ 'title-active': stateCurrent === state.value }">{{ state.name }}</text>
                     <text class="underline" :class="{ 'underline-active': stateCurrent === state.value }"></text>
@@ -65,37 +62,35 @@
         </view>
 
         <scroll-view :style="'height:'+viewHeight+'px'" scroll-y="true" class="scroll-Y" @scrolltolower="bottomOut()">
-
             <view class="content_box">
                 <!-- 订单列表 -->
                 <view class="order-list" v-for="item in list" :key="item.id" v-if="list.length > 0">
-                    <view class="order-head x-bc">
+                    <view class="order-head u-flex u-row-between">
                         <text class="order-code">订单编号：{{ item.orderId }}</text>
                         <text class="order-state">{{ item.userId==item.buyUserId?'代购订单':'推广订单' }}</text>
                     </view>
-                    <view class="order-from x-bc">
-                        <view class="from-user x-f">
+                    <view class="order-from u-flex u-row-between">
+                        <view class="from-user coreshop-flex coreshop-align-center">
                             <text>下单人：</text>
                             <image class="user-avatar" :src="item.buyer.avatar" mode=""></image>
                             <text class="user-name">{{ item.buyUserNickName }}</text>
                         </view>
                         <view class="order-time">{{ $u.timeFormat(item.createTime, ' yyyy.mm.dd hh:MM ') }}</view>
                     </view>
-                    <view class="total-box x-bc px20">
-                        <view class="num-price">提成:￥{{ item.amount || '0'}}</view>
-                        <view class="x-f">{{item.isSettlement==1?'已结算':item.isSettlement==2?'未结算':'已退款'}}</view>
+                    <view class="total-box u-flex u-row-between px20">
+                        <view class="num-price">提成：￥{{ item.amount || '0'}}</view>
+                        <view class="coreshop-flex coreshop-align-center">{{item.isSettlement==1?'已结算':item.isSettlement==2?'未结算':'已退款'}}</view>
                     </view>
                 </view>
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="当前日明细" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="当前日明细" mode="list"></u-empty>
                 </view>
                 <!-- 更多 -->
                 <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" v-if="list.length" />
             </view>
         </scroll-view>
     </view>
-
 </template>
 
 <script>
@@ -168,7 +163,7 @@
         },
         onReachBottom() {
             if (this.status === 'loadmore') {
-                this.getDistributionOrder()
+                this.getAgentOrder()
             }
         },
         methods: {
@@ -178,7 +173,7 @@
                     return;
                 }
                 if (this.status == 'loadmore') {
-                    this.getDistributionOrder();//调用数据请求
+                    this.getAgentOrder();//调用数据请求
                 }
             },
             // 切换分类
@@ -242,52 +237,6 @@
     };
 </script>
 
-<style lang="scss">
-    .direct-box { margin: 20rpx; }
-        .direct-box .direct-item { width: 341rpx; height: 117rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx; }
-            .direct-box .direct-item .item-title { font-size: 22rpx; font-weight: 500; color: #999999; margin-bottom: 6rpx; }
-            .direct-box .direct-item .item-value { font-size: 38rpx; font-weight: 600; color: #333333; }
-
-    .team-data-box { margin: 20rpx; }
-        .team-data-box .data-card { width: 340rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx; }
-            .team-data-box .data-card .item-title { font-size: 22rpx; font-weight: 500; color: #999999; line-height: 30rpx; margin-bottom: 10rpx; }
-            .team-data-box .data-card .total-item { margin-bottom: 20rpx; }
-            .team-data-box .data-card .total-num { font-size: 38rpx; font-weight: 600; color: #333333; }
-            .team-data-box .data-card .category-num { font-size: 26rpx; font-weight: 600; color: #333333; }
-
-    .head_box { width: 750rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; }
-        .head_box .cu-back { color: #fff; font-size: 40rpx; }
-        .head_box .head-title { font-size: 38rpx; color: #fff; }
-
-    .nav-box { background-color: #fff; }
-
-    .state-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; }
-        .state-item .state-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
-        .state-item .title-active { color: #333; }
-        .state-item .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
-        .state-item .underline-active { background: #e54d42; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
-
-    .order-list { background-color: #fff; margin-top: 20rpx; }
-        .order-list .order-head { padding: 20rpx; }
-            .order-list .order-head .order-code { font-size: 26rpx; font-weight: 400; color: #999999; }
-            .order-list .order-head .order-state { font-size: 26rpx; font-weight: 500; color: #05c3a1; }
-        .order-list .order-from { background-color: #f9f9f9; padding: 20rpx; }
-            .order-list .order-from .from-user { font-size: 24rpx; font-weight: 400; color: #666666; }
-                .order-list .order-from .from-user .user-avatar { width: 26rpx; height: 26rpx; border-radius: 50%; margin-right: 8rpx; }
-                .order-list .order-from .from-user .user-name { font-size: 24rpx; font-weight: 400; color: #999999; }
-            .order-list .order-from .order-time { font-size: 24rpx; font-weight: 400; color: #999999; }
-        .order-list .goods-card { padding: 30rpx 20rpx; }
-            .order-list .goods-card .goods-img-box { margin-right: 30rpx; }
-                .order-list .goods-card .goods-img-box .goods-img { width: 160rpx; height: 160rpx; background-color: #ccc; }
-            .order-list .goods-card .goods-info { height: 160rpx; width: 600rpx; align-items: flex-start; }
-                .order-list .goods-card .goods-info .goods-title { font-size: 28rpx; font-weight: 500; color: #333333; }
-                .order-list .goods-card .goods-info .goods-sku { font-size: 24rpx; font-weight: 400; color: #666666; }
-                .order-list .goods-card .goods-info .goods-price { font-size: 30rpx; font-weight: 500; color: #333333; }
-                    .order-list .goods-card .goods-info .goods-price .goods-state { line-height: 30rpx; padding: 0 10rpx; background: #f1eeff; border: 1rpx solid #e54d42; border-radius: 30rpx; margin-left: 20rpx; font-size: 20rpx; color: #e54d42; }
-                    .order-list .goods-card .goods-info .goods-price::before { content: '￥'; font-size: 20rpx; }
-        .order-list .total-box { height: 80rpx; padding: 0 20rpx; }
-            .order-list .total-box .num-price { font-size: 24rpx; font-weight: 400; color: #999999; }
-            .order-list .total-box .name { font-size: 24rpx; font-weight: 400; color: #999999; }
-            .order-list .total-box .commission-num { font-size: 30rpx; font-weight: 400; color: #eb2b3d; }
-                .order-list .total-box .commission-num::before { content: '￥'; font-size: 22rpx; }
+<style lang="scss" scoped>
+    @import "order.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.scss
new file mode 100644
index 0000000000000000000000000000000000000000..5f2503a59de34e64fea0812412146edb6b92c73b
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.scss
@@ -0,0 +1,31 @@
+.user-card { width: 690rpx; min-height: 350rpx; border-radius: 14rpx; margin: 30rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; padding-top: 10rpx; position: relative;
+    &::after { content: ""; position: absolute; z-index: -1; background-color: inherit; width: 100%; height: 100%; left: 0; bottom: -10%; border-radius: 10upx; opacity: 0.2; transform: scale(0.9, 0.9); }
+    .card-top { padding: 40rpx 40rpx 30rpx; margin-bottom: 30rpx; border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+        .user-name { font-size: 26rpx; font-weight: 500; color: #ffffff; line-height: 30rpx; margin-bottom: 20rpx; }
+        .cu-btn { padding: 0; background: none; }
+        .log-btn { width: 83rpx; height: 41rpx; border: 1rpx solid rgba(255, 255, 255, 0.33); border-radius: 21rpx; font-size: 22rpx; font-weight: 400; color: #ffffff; line-height: 41rpx; text-align: center; }
+        .look-btn { color: #fff; font-size: 40rpx;
+            .eye { line-height: 50rpx; margin-top: 20rpx; }
+        }
+    }
+    .head-img-box { margin-right: 26rpx; width: 76rpx; height: 76rpx; border-radius: 50px; position: relative; background: #fff; padding: 10rpx; background-clip: padding-box;
+        .head-img { width: 66rpx; height: 66rpx; border-radius: 50%; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); }
+    }
+    .user-info-box {
+        .tag-box { background: rgba(0, 0, 0, 0.2); border-radius: 21rpx; line-height: 38rpx; padding-right: 10rpx;
+            .tag-img { width: 36rpx; height: 36rpx; margin-right: 6rpx; border-radius: 50%; }
+            .tag-title { font-size: 20rpx; font-family: PingFang SC; font-weight: 500; color: white; line-height: 20rpx; }
+        }
+    }
+    .card-bottom { margin: 0 40rpx 40rpx;
+        .item-title { font-size: 24rpx; font-family: PingFang SC; font-weight: 400; color: #ffffff; line-height: 30rpx; }
+        .item-detail { font-size: 40rpx; font-family: DIN; font-weight: 500; color: #fefefe; line-height: 30rpx; margin-top: 30rpx; }
+    }
+}
+
+.menu-box { flex-wrap: wrap; margin: 30rpx; position: fixed; width: 750rpx; bottom: 0; z-index: 10;
+    .menu-item { width: 172.5rpx; margin-bottom: 50rpx;
+        .item-img { width: 68rpx; height: 68rpx; }
+        .item-title { font-size: 24rpx; font-weight: 600; color: #fff; line-height: 30rpx; margin-top: 16rpx; }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
similarity index 60%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
index d01641c42c0d2417191193fa76800a777113c3ec..80affeff83dc10d6dfd0f98877d91f5f83acd6f0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
@@ -2,62 +2,59 @@
     <view style="width:100%;height: 100%;">
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="代理面板"></u-navbar>
-        <view class="commission-wrap">
-            <!--<cu-custom isBack="true" bgColor="bg-white">
-                <block slot="backText">代理面板</block>
-            </cu-custom>-->
+        <view>
             <!-- 用户资料 -->
-            <view class="user-card bg-blue">
-                <view class="card-top x-bc">
-                    <view class="x-f">
+            <view class="user-card coreshop-bg-blue">
+                <view class="card-top u-flex u-row-between">
+                    <view class="coreshop-flex coreshop-align-center">
                         <view class="head-img-box"><image class="head-img" :src="userInfo.avatarImage" mode=""></image></view>
-                        <view class="y-start">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
                             <view class="user-name">{{ userInfo.nickName }}</view>
-                            <view class="user-info-box x-f">
-                                <view class="x-f" v-if="info.gradeName">
+                            <view class="user-info-box coreshop-flex coreshop-align-center">
+                                <view class="coreshop-flex coreshop-align-center" v-if="info.gradeName">
                                     <text class="cu-tag bg-purple sm radius">{{ info.gradeName }}</text>
                                 </view>
                             </view>
                         </view>
                     </view>
-                    <view class="y-start">
-                        <view class="y-f">
-                            <button class="cu-btn log-btn" @tap="navigateToHandle(utilityMenus.balance.router)">明细</button>
-                            <button class="cu-btn look-btn" @tap="onEye">
-                                <text v-if="showMoney" class="cuIcon-attentionfill"></text>
-                                <text v-else class="cuIcon-attentionforbidfill"></text>
-                            </button>
+                    <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-center">
+                            <view class="log-btn" @click="navigateToHandle(utilityMenus.balance.router)">明细</view>
+                            <view class="look-btn" @click="onEye">
+                                <u-icon class="eye" v-if="showMoney" name="eye-fill"></u-icon>
+                                <u-icon class="eye" v-else name="eye-off"></u-icon>
+                            </view>
                         </view>
                     </view>
                 </view>
-                <view class="card-bottom x-f">
-                    <view class="flex-sub y-start">
+                <view class="card-bottom u-flex u-row-between">
+                    <view class="flex-sub coreshop-flex coreshop-flex-direction coreshop-align-start">
                         <view class="item-title">已结算金额</view>
                         <view class="item-detail">{{ showMoney ? info.settlementAmount || '0.00' : '***' }}</view>
                     </view>
-                    <view class="flex-sub y-start" style="align-items: center;">
+                    <view class="flex-sub coreshop-flex coreshop-flex-direction coreshop-align-start" style="align-items: center;">
                         <view class="item-title">待入账佣金</view>
                         <view class="item-detail">{{ showMoney ? info.freezeAmount || '0.00' : '***' }}</view>
                     </view>
-                    <view class="flex-sub y-start" style="align-items: flex-end;">
+                    <view class="flex-sub coreshop-flex coreshop-flex-direction coreshop-align-start" style="align-items: flex-end;">
                         <view class="item-title">本月订单数</view>
                         <view class="item-detail">{{ showMoney ? info.currentMonthOrder || '0.00' : '***' }}</view>
                     </view>
                 </view>
             </view>
 
-            <view class="cu-list menu sm-border card-menu">
-                <view class="cu-item arrow" v-for="(menu, index) in utilityMenus" :key="index" @tap="navigateToHandle(menu.router)">
+            <view class="coreshop-list menu card-menu">
+                <view class="coreshop-list-item arrow" v-for="(menu, index) in utilityMenus" :key="index" @tap="navigateToHandle(menu.router)">
                     <view class="content">
                         <image :src="menu.icon" class="png" mode="aspectFit"></image>
-                        <text class="text-grey">{{ menu.name }}</text>
+                        <text class="coreshop-text-grey">{{ menu.name }}</text>
                     </view>
                 </view>
                 <!-- 分享二维码 -->
-                <view class="cu-item arrow"  @click="createPoster()">
+                <view class="coreshop-list-item arrow"  @click="createPoster()">
                     <view class="content">
                         <image src="/static/images/distribution/distribution_icon7.png" class="png" mode="aspectFit"></image>
-                        <text class="text-grey">邀请海报</text>
+                        <text class="coreshop-text-grey">邀请海报</text>
                     </view>
                 </view>
             </view>
@@ -77,33 +74,38 @@
                     invite: {
                         name: '我的推广',
                         icon: '/static/images/distribution/distribution_icon1.png',
-                        router: '/pages/member/agent/team'
+                        router: '/pages/member/agent/team/team'
                     },
                     balance: {
                         name: '佣金明细',
                         icon: '/static/images/distribution/distribution_icon2.png',
-                        router: '/pages/member/agent/commissionDetails'
+                        router: '/pages/member/agent/commissionDetails/commissionDetails'
                     },
                     order: {
                         name: '代理订单',
                         icon: '/static/images/distribution/distribution_icon3.png',
-                        router: '/pages/member/agent/order'
+                        router: '/pages/member/agent/order/order'
                     },
                     myStore: {
                         name: '我的店铺',
                         icon: '/static/images/distribution/distribution_icon4.png',
-                        router: '/pages/member/agent/myStore'
+                        router: '/pages/member/agent/myStore/myStore'
                     },
                     storeSetting: {
                         name: '店铺设置',
                         icon: '/static/images/distribution/distribution_icon5.png',
-                        router: '/pages/member/agent/storeSetting'
+                        router: '/pages/member/agent/storeSetting/storeSetting'
                     },
                     ranking: {
                         name: '代理排行',
                         icon: '/static/images/distribution/distribution_icon6.png',
-                        router: '/pages/member/agent/rankings'
-                    }
+                        router: '/pages/member/agent/rankings/rankings'
+                    },
+                    shareLog: {
+                        name: '分享记录',
+                        icon: '/static/images/distribution/distribution_icon8.png',
+                        router: '/pages/member/agent/shareLog/shareLog'
+                    },
                 },
                 info: {}, //分销商信息
                 userInfo: {}, // 用户信息
@@ -120,10 +122,10 @@
                 if (res.status) {
                     _this.info = res.data;
                     if (res.data.verifyStatus != 1) { //审核通过
-                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/index' });
+                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/index/index' });
                     }
                     if (_this.$store.state.config.distributionStore == '1') {
-                        _this.utilityMenus.myStore.router = '/pages/member/agent/myStore?store=' + _this.info.store;
+                        _this.utilityMenus.myStore.router = '/pages/member/agent/myStore/myStore?store=' + _this.info.store;
                     }
                 } else {
                     //报错了
@@ -154,7 +156,7 @@
             },
             //去提现
             goWithdraw() {
-                this.$u.route('/pages/member/balance/withdrawCash')
+                this.$u.route('/pages/member/balance/withdrawCash/withdrawCash')
             },
             //获取分享URL
             getShareUrl() {
@@ -184,7 +186,7 @@
                 let pageUrl = 'pages/share/jump/jump';
                 // #ifdef H5
                 data.client = 1;
-                data.url = apiBaseUrl + 'wap/' + pageUrl;
+                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
                 // #endif
                 // #ifdef MP-WEIXIN
                 data.client = 2;
@@ -196,7 +198,7 @@
                 // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 data.client = 5;
-                data.url = apiBaseUrl + 'wap/' + pageUrl;
+                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
                 // #endif
                 // #ifdef MP-TOUTIAO
                 data.client = 6;
@@ -231,30 +233,6 @@
         },
     }
 </script>
-<style lang="scss">
-    .user-card { width: 690rpx; min-height: 350rpx; border-radius: 14rpx; margin: 30rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; padding-top: 10rpx; position: relative; }
-        .user-card::after { content: ""; position: absolute; z-index: -1; background-color: inherit; width: 100%; height: 100%; left: 0; bottom: -10%; border-radius: 10upx; opacity: 0.2; transform: scale(0.9, 0.9); }
-
-        .user-card .card-top { padding: 40rpx 40rpx 30rpx; margin-bottom: 30rpx; border-bottom: 1px solid rgba(255, 255, 255, 0.12); }
-            .user-card .card-top .user-name { font-size: 26rpx; font-weight: 500; color: #ffffff; line-height: 30rpx; margin-bottom: 20rpx; }
-            .user-card .card-top .cu-btn { padding: 0; background: none; }
-            .user-card .card-top .log-btn { width: 83rpx; height: 41rpx; border: 1rpx solid rgba(255, 255, 255, 0.33); border-radius: 21rpx; font-size: 22rpx; font-weight: 400; color: #ffffff; }
-            .user-card .card-top .look-btn { color: #fff; font-size: 40rpx; }
-                .user-card .card-top .look-btn .cuIcon-attentionfill,
-                .user-card .card-top .look-btn .cuIcon-attentionforbidfill { line-height: 50rpx; margin-top: 20rpx; }
-                .user-card .card-top .look-btn .cuIcon-attentionfill { line-height: 50rpx; margin-top: 20rpx; }
-        .user-card .head-img-box { margin-right: 26rpx; width: 76rpx; height: 76rpx; border-radius: 50px; position: relative; background: #fff; padding: 10rpx; background-clip: padding-box; }
-            .user-card .head-img-box .head-img { width: 66rpx; height: 66rpx; border-radius: 50%; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); }
-        .user-card .user-info-box .tag-box { background: rgba(0, 0, 0, 0.2); border-radius: 21rpx; line-height: 38rpx; padding-right: 10rpx; }
-            .user-card .user-info-box .tag-box .tag-img { width: 36rpx; height: 36rpx; margin-right: 6rpx; border-radius: 50%; }
-            .user-card .user-info-box .tag-box .tag-title { font-size: 20rpx; font-family: PingFang SC; font-weight: 500; color: white; line-height: 20rpx; }
-        .user-card .card-bottom { margin: 0 40rpx 40rpx; }
-            .user-card .card-bottom .item-title { font-size: 24rpx; font-family: PingFang SC; font-weight: 400; color: #ffffff; line-height: 30rpx; }
-            .user-card .card-bottom .item-detail { font-size: 40rpx; font-family: DIN; font-weight: 500; color: #fefefe; line-height: 30rpx; margin-top: 30rpx; }
-
-
-    .menu-box { flex-wrap: wrap; margin: 30rpx; position: fixed; width: 750rpx; bottom: 0; z-index: 10; }
-        .menu-box .menu-item { width: 172.5rpx; margin-bottom: 50rpx; }
-            .menu-box .menu-item .item-img { width: 68rpx; height: 68rpx; }
-            .menu-box .menu-item .item-title { font-size: 24rpx; font-weight: 600; color: #fff; line-height: 30rpx; margin-top: 16rpx; }
+<style lang="scss" scoped>
+    @import "panel.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/rankings/rankings.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/rankings/rankings.scss
new file mode 100644
index 0000000000000000000000000000000000000000..86c8a9a8478ee8366ce10d783ad3c53fbd4bad42
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/rankings/rankings.scss
@@ -0,0 +1,20 @@
+.rankings-wrap { background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; overflow: hidden; }
+
+.rankings-list-box { background-color: #fff; border-radius: 20rpx 20rpx 0px 0px; width: 690rpx; margin: 60rpx auto 0; margin-bottom: 60rpx;
+    .ranking-list { height: 140rpx; padding: 0 30rpx; border-bottom: 1rpx solid #e5e5e5;
+        .list-left {
+            .tag-box { width: 50rpx; font-size: 36rpx; font-weight: 500; color: #beb4b3; margin-right: 20rpx;
+                .tag-icon { width: 40rpx; height: 60rpx; }
+            }
+            .user-avatar { width: 66rpx; height: 66rpx; border-radius: 50%; margin-right: 30rpx; }
+            .user-info {
+                .name { font-size: 28rpx; font-weight: bold; color: #333333; }
+                .date { font-size: 24rpx; font-weight: 400; color: #999999; }
+            }
+        }
+        .list-right {
+            .num { font-size: 30rpx; font-weight: 500; color: #5e4ddf; }
+            .des { font-size: 24rpx; font-weight: 500; color: #a09a98; }
+        }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/rankings.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/rankings/rankings.vue
similarity index 49%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/agent/rankings.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/rankings/rankings.vue
index 8634a1b7366f682a1ef51c6af08012ee0c8d9cb4..557c1dd3537a4729fde613fa939e7bbe48b6f232 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/rankings.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/rankings/rankings.vue
@@ -1,19 +1,13 @@
 <!-- 分销排行 -->
 <template>
-    <view class="rankings-wrap bg-blue">
-        <!-- 标题栏 -->
-        <view class="nav-box">
-            <cu-custom isBack>
-                <block slot="backText">代理排行</block>
-            </cu-custom>
-        </view>
-
+    <view class="rankings-wrap coreshop-bg-blue">
+        <u-navbar title="代理排行"></u-navbar>
         <!-- 排行榜 -->
         <view class="rankings-list-box">
-            <scroll-view :style="'height:'+viewHeight+'px'" scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
-                <view class="ranking-list x-bc" v-for="(item, index) in rankingsList" :key="index">
-                    <view class="list-left x-f">
-                        <view class="tag-box x-c">
+            <scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
+                <view class="ranking-list u-flex u-row-between" v-for="(item, index) in rankingsList" :key="index">
+                    <view class="list-left coreshop-flex coreshop-align-center">
+                        <view class="tag-box coreshop-flex coreshop-justify-center coreshop-align-center">
                             <text class="tag-text" v-if="index >= 3">{{ index }}</text>
                             <image v-else class="tag-icon" :src="rankingsIcon[index]" mode=""></image>
                         </view>
@@ -23,7 +17,7 @@
                             <view class="date">{{ $u.timeFormat(item.createtime, 'yyyy年mm月dd日') }}</view>
                         </view>
                     </view>
-                    <view class="list-right y-end">
+                    <view class="list-right coreshop-flex coreshop-flex-direction coreshop-align-end">
                         <view class="num mb10">{{ item.totalInCome }}</view>
                         <view class="des">累计收益</view>
                     </view>
@@ -49,25 +43,10 @@
                 loadStatus: 'loadmore', //loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
                 currentPage: 1,
                 limit: 20,
-                viewHeight: 0,
                 hasNextPage: false
             };
         },
         onShow() {
-            var _this = this;
-            uni.getSystemInfo({
-                success: function (res) { // res - 各种参数
-                    console.log(res); // 屏幕的宽度
-                    var windowHeight = res.windowHeight;
-
-                    let info = uni.createSelectorQuery().select(".nav-box");
-                    info.boundingClientRect(function (data) { //data - 各种参数
-                        var headHeight = data.height;
-                        _this.viewHeight = windowHeight - headHeight;
-
-                    }).exec()
-                }
-            });
         },
         onLoad() {
             this.getRankings();
@@ -75,8 +54,12 @@
         methods: {
             getRankings() {
                 let that = this;
+                let data = {
+                    page: this.currentPage,
+                    limit: this.limit,
+                }
                 this.loadStatus = 'loading';
-                this.$u.api.getAgentRanking().then(res => {
+                this.$u.api.getAgentRanking(data).then(res => {
                     if (res.code === 0) {
                         that.rankingsList = [...that.rankingsList, ...res.data.data];
                         that.hasNextPage = res.data.hasNextPage;
@@ -100,16 +83,5 @@
 </script>
 
 <style lang="scss">
-    .rankings-wrap { background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; height: 100%; overflow: hidden; min-height: 100vh; }
-    .nav-box .cu-back { color: #fff; font-size: 40rpx; }
-    .nav-box .head-title { font-size: 38rpx; color: #fff; }
-    .rankings-list-box { background-color: #fff; border-radius: 20rpx 20rpx 0px 0px; width: 690rpx; margin: 60rpx auto 0; margin-bottom: 60rpx; }
-        .rankings-list-box .ranking-list { height: 140rpx; padding: 0 30rpx; border-bottom: 1rpx solid #e5e5e5; }
-            .rankings-list-box .ranking-list .list-left .tag-box { width: 50rpx; font-size: 36rpx; font-weight: 500; color: #beb4b3; margin-right: 20rpx; }
-                .rankings-list-box .ranking-list .list-left .tag-box .tag-icon { width: 40rpx; height: 60rpx; }
-            .rankings-list-box .ranking-list .list-left .user-avatar { width: 66rpx; height: 66rpx; border-radius: 50%; margin-right: 30rpx; }
-            .rankings-list-box .ranking-list .list-left .user-info .name { font-size: 28rpx; font-weight: bold; color: #333333; }
-            .rankings-list-box .ranking-list .list-left .user-info .date { font-size: 24rpx; font-weight: 400; color: #999999; }
-            .rankings-list-box .ranking-list .list-right .num { font-size: 30rpx; font-weight: 500; color: #5e4ddf; }
-            .rankings-list-box .ranking-list .list-right .des { font-size: 24rpx; font-weight: 500; color: #a09a98; }
+    @import "rankings.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/shareLog/shareLog.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/shareLog/shareLog.scss
new file mode 100644
index 0000000000000000000000000000000000000000..3edbc23f4ccd412adef89ec775a2c9fe9acf3066
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/shareLog/shareLog.scss
@@ -0,0 +1,26 @@
+.tab-box { background-color: #fff; width: 100%;
+    .tab-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center;
+        .tab-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
+        .title-active { color: #333; }
+        .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
+        .underline-active { background: #5e49c3; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+    }
+}
+.log-list { background-color: #fff; padding: 30rpx; margin: 10rpx 0; align-items: flex-start;
+    .log-avatar-wrap { margin-right: 14rpx;
+        .log-avatar { width: 40rpx; height: 40rpx; border-radius: 50%; }
+    }
+    .item-right { flex: 1;
+        .name { font-size: 26rpx; font-weight: 500; color: #7f7aa5; margin-bottom: 30rpx; }
+        .content { background: rgba(241, 241, 241, 0.46); border-radius: 2rpx; padding: 10rpx; margin-bottom: 20rpx;
+            .content-img-wrap { margin-right: 16rpx; width: 80rpx; height: 80rpx;
+                .content-img { width: 80rpx; height: 80rpx; }
+            }
+            .content-text { font-size: 24rpx; font-weight: 500; color: #333333; }
+        }
+        .item-bottom { width: 100%;
+            .time { font-size: 22rpx; font-weight: 500; color: #c8c8c8; }
+            .from-text { font-size: 22rpx; font-weight: 500; color: #c8c8c8; }
+        }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/shareLog.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/shareLog/shareLog.vue
similarity index 46%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/shareLog.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/shareLog/shareLog.vue
index eac49d8ba04e76ddc71f3b501a0b4b4e09747803..80799f47816a458eacc66de46d6ba987438b10ca 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/shareLog.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/shareLog/shareLog.vue
@@ -1,49 +1,41 @@
 <!-- 分享记录 -->
 <template>
-    <view class="pageBox">
+    <view>
         <!-- 标题栏 -->
-        <view class="head_box bg-red">
-            <view class="nav-box">
-                <cu-custom isBack>
-                    <block slot="backText">分享记录</block>
-                </cu-custom>
-            </view>
-            <!-- 分类tab -->
-            <view class="tab-box x-f">
-                <view class="tab-item flex-sub " v-for="(tab, index) in tabsList" :key="tab.value" @tap="onTab(tab.value)">
-                    <text class="tab-title" :class="{ 'title-active': tabCurrent === tab.value }">{{ tab.name }}</text>
-                    <text class="underline" :class="{ 'underline-active': tabCurrent === tab.value }"></text>
-                </view>
+        <u-navbar title="分享记录"></u-navbar>
+        <!-- 分类tab -->
+        <view class="tab-box u-flex u-row-between u-padding-left-20 u-padding-right-20">
+            <view class="tab-item flex-sub " v-for="(tab, index) in tabsList" :key="tab.value" @tap="onTab(tab.value)">
+                <text class="tab-title" :class="{ 'title-active': tabCurrent === tab.value }">{{ tab.name }}</text>
+                <text class="underline" :class="{ 'underline-active': tabCurrent === tab.value }"></text>
             </view>
         </view>
 
         <view class="content_box">
             <scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
                 <!-- 分享记录列表 -->
-                <view class="log-list x-f" v-for="item in shareLogList" :key="item.id">
+                <view class="log-list coreshop-flex coreshop-align-center" v-for="item in shareLogList" :key="item.id">
                     <view class="log-avatar-wrap"><image class="log-avatar" :src="item.user.avatar" mode=""></image></view>
 
                     <view class="item-right">
                         <view class="name">{{ item.user.nickname }}</view>
-                        <view class="content x-f" v-if="item.type_data">
+                        <view class="content coreshop-flex coreshop-align-center" v-if="item.type_data">
                             <view class="content-img-wrap"><image class="content-img" :src="item.type_data.image" mode=""></image></view>
 
                             <view class="content-text">通过{{ typeObj[item.type] }}访问了商品“{{ item.type_data.title }}”, 进入商城</view>
                         </view>
-                        <view class="item-bottom x-bc">
+                        <view class="item-bottom u-flex u-row-between">
                             <view class="time">{{ $u.timeFormat(item.createtime, 'yyyy年mm月dd日 hh:MM') }}</view>
                             <view class="from-text">来自{{ typeObj[item.type] }}分享</view>
                         </view>
                     </view>
                 </view>
-
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-if="shareLogList.length<=0">
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无分享记录" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无分享记录" mode="list"></u-empty>
                 </view>
-
                 <!-- 更多 -->
-                <u-loadmore v-if="shareLogList.length"  :status="loadStatus" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
+                <u-loadmore v-if="shareLogList.length" :status="loadStatus" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
             </scroll-view>
         </view>
         <view class="foot_box"></view>
@@ -109,20 +101,20 @@
             getShareLog() {
                 let that = this;
                 that.loadStatus = 'loading';
-                that.$api('commission.share', {
-                    type: that.tabCurrent,
-                    page: that.currentPage
-                }).then(res => {
-                    if (res.code === 1) {
-                        that.shareLogList = [...that.shareLogList, ...res.data.data];
-                        that.lastPage = res.data.last_page;
-                        if (that.currentPage < res.data.last_page) {
-                            that.loadStatus = 'loadmore';
-                        } else {
-                            that.loadStatus = 'nomore';
-                        }
-                    }
-                });
+                //that.$api('commission.share', {
+                //    type: that.tabCurrent,
+                //    page: that.currentPage
+                //}).then(res => {
+                //    if (res.code === 1) {
+                //        that.shareLogList = [...that.shareLogList, ...res.data.data];
+                //        that.lastPage = res.data.last_page;
+                //        if (that.currentPage < res.data.last_page) {
+                //            that.loadStatus = 'loadmore';
+                //        } else {
+                //            that.loadStatus = 'nomore';
+                //        }
+                //    }
+                //});
             },
 
             // 加载更多
@@ -137,27 +129,5 @@
 </script>
 
 <style lang="scss">
-    .head_box { height: 280rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; position: relative; }
-        .head_box .nav-box { color: #fff; font-size: 40rpx; }
-            .head_box .nav-box .cu-back { color: #fff; font-size: 40rpx; }
-
-    .tab-box { background-color: #fff; border-radius: 20rpx 20rpx 0px 0px; position: absolute; width: 100%; bottom: 0; }
-        .tab-box .tab-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; }
-            .tab-box .tab-item .tab-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
-            .tab-box .tab-item .title-active { color: #333; }
-            .tab-box .tab-item .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
-            .tab-box .tab-item .underline-active { background: #5e49c3; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
-
-    .log-list { background-color: #fff; padding: 30rpx; margin: 10rpx 0; align-items: flex-start; }
-        .log-list .log-avatar-wrap { margin-right: 14rpx; }
-            .log-list .log-avatar-wrap .log-avatar { width: 40rpx; height: 40rpx; border-radius: 50%; }
-        .log-list .item-right { flex: 1; }
-            .log-list .item-right .name { font-size: 26rpx; font-weight: 500; color: #7f7aa5; margin-bottom: 30rpx; }
-            .log-list .item-right .content { background: rgba(241, 241, 241, 0.46); border-radius: 2rpx; padding: 10rpx; margin-bottom: 20rpx; }
-                .log-list .item-right .content .content-img-wrap { margin-right: 16rpx; width: 80rpx; height: 80rpx; }
-                    .log-list .item-right .content .content-img-wrap .content-img { width: 80rpx; height: 80rpx; }
-                .log-list .item-right .content .content-text { font-size: 24rpx; font-weight: 500; color: #333333; }
-            .log-list .item-right .item-bottom { width: 100%; }
-                .log-list .item-right .item-bottom .time { font-size: 22rpx; font-weight: 500; color: #c8c8c8; }
-                .log-list .item-right .item-bottom .from-text { font-size: 22rpx; font-weight: 500; color: #c8c8c8; }
+    @import "shareLog.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/storeSetting.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/storeSetting.vue
deleted file mode 100644
index 88c8a2f766a2a63ae956c5e683c76398155f2681..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/storeSetting.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar title="店铺设置"></u-navbar>
-
-        <form>
-            <view class="cu-form-group">
-                <view class="title">名称</view>
-                <input placeholder='请输入店铺名称' v-model="storeName"></input>
-            </view>
-            <view class="cu-form-group">
-                <view class="title">图标</view>
-                <image class='cu-avatar radius bg-gray' mode="aspectFill" :src="logo" @click="uploadLogo"></image>
-            </view>
-
-            <view class="cu-bar bg-white margin-top">
-                <view class="action">
-                    店招
-                </view>
-                <view class="action">
-                    {{images.length}}/{{imageMax}}
-                </view>
-            </view>
-            <view class="cu-form-group">
-                <view class="grid col-4 grid-square flex-sub">
-                    <view class="bg-img" v-for="(item,index) in images" :key="index" @tap="clickImg(item.src)" :data-url="images[index]">
-                        <image :src="item.src" mode="aspectFill"></image>
-                        <view class="cu-tag bg-blue" @tap.stop="delImage(item)" :data-index="index">
-                            <text class='cuIcon-close'></text>
-                        </view>
-                    </view>
-                    <view class="solids" @tap="upImage" v-if="images.length<imageMax">
-                        <text class='cuIcon-cameraadd'></text>
-                    </view>
-                </view>
-            </view>
-            <view class="cu-form-group align-start">
-                <view class="title">简介</view>
-                <textarea v-model="storeDesc" placeholder="请您在此描述问题(最多200字)" maxlength="200"></textarea>
-            </view>
-        </form>
-
-        <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom" @click="submitHandler()">
-            <view class="flex padding-sm flex-direction">
-                <button class="cu-btn bg-blue">保存</button>
-            </view>
-        </view>
-
-    </view>
-
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                title: 'picker',
-                logo: '/static/images/common/empty.png',
-                images: [],
-                imageMax: 1,
-                storeName: '',//店铺名称
-                storeLogo: '',
-                storeBanner: '',
-                storeDesc: '',//店铺介绍
-            }
-        },
-        computed: {
-            isImage() {
-                let num = this.imageMax - this.images.length;
-                if (num > 0) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        },
-        methods: {
-            // 用户上传头像
-            uploadLogo() {
-                this.$upload.uploadFiles(null, res => {
-                    if (res.status) {
-                        this.storeLogo = res.data.src;
-                        this.logo = res.data.src;
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                })
-            },
-            // 保存资料
-            submitHandler() {
-                if (!this.storeName || this.storeName == '') {
-                    this.$u.toast('请填写店铺名称');
-                    return;
-                }
-                if (this.images.length <= 0) {
-                    this.$u.toast('请上传店招');
-                    return;
-                }
-                if (!this.storeLogo) {
-                    this.$u.toast('请上传图标');
-                    return;
-                }
-                this.storeBanner = this.images[0].src;
-
-                this.$u.api.setAgentStore({
-                    storeName: this.storeName,
-                    storeLogo: this.storeLogo,
-                    storeBanner: this.storeBanner,
-                    storeDesc: this.storeDesc
-                }).then(res => {
-                    if (res.status) {
-                        this.$refs.uToast.show({ title: res.msg, type: 'success', back: false })
-                    } else {
-                        this.$u.toast(res.msg);
-                    }
-                }
-                );
-            },
-            //上传图片
-            upImage() {
-                let num = this.imageMax - this.images.length;
-                if (num > 0) {
-                    this.$upload.uploadImage(num, res => {
-                        if (res.status) {
-                            this.images.push(res.data);
-                            this.$refs.uToast.show({ title: res.msg, type: 'success' });
-                        } else {
-                            this.$u.toast(res.msg);
-                        }
-                    });
-                }
-            },
-            //删除图片
-            delImage(e) {
-                let newImages = [];
-                for (var i = 0; i < this.images.length; i++) {
-                    if (this.images[i].imageId != e.imageId) {
-                        newImages.push(this.images[i]);
-                    }
-                }
-                this.images = newImages;
-            },
-            // 图片点击放大
-            clickImg(img) {
-                // 预览图片
-                uni.previewImage({
-                    urls: img.split()
-                });
-            }
-        },
-        onLoad: function () {
-            var _this = this;
-            _this.$u.api.getAgentInfo({ check_condition: false }).then(res => {
-                if (res.status) {
-                    _this.storeName = res.data.storeName;
-                    _this.storeDesc = res.data.storeDesc;
-                    _this.storeLogo = res.data.storeLogo;
-                    if (res.data.storeLogo) {
-                        _this.logo = res.data.storeLogo;
-                    }
-                    _this.storeBanner = res.data.storeBanner;
-                    if (_this.storeBanner) {
-                        _this.images.push({
-                            imageId: res.data.storeBanner,
-                            url: res.data.storeBanner,
-                            src: res.data.storeBanner
-                        });
-                    }
-                } else {
-                    //报错了
-                    _this.$u.toast(res.msg);
-                }
-            });
-        }
-    }
-</script>
-
-<style lang="scss">
-    .cu-form-group .title { min-width: calc(4em + 15px); }
-
-    .user-head { height: 100upx; }
-    .user-head-img { height: 90upx; width: 90upx; border-radius: 50%; }
-    .cell-hd-title { color: #333; }
-    .cell-item-bd { color: #666; font-size: 26upx; }
-    .list-goods-name { width: 100% !important; }
-    .cart-checkbox-item { position: relative; }
-    .invoice-type .uni-list-cell { display: inline-block; font-size: 26upx; color: #333; position: relative; margin-left: 50upx; }
-        .invoice-type .uni-list-cell > view { display: inline-block; }
-    .invoice-type-icon { position: absolute; top: 50%; transform: translateY(-50%); }
-    .invoice-type-c { margin-left: 50upx; line-height: 2; }
-    .cell-item-ft .cell-bd-input { text-align: right; width: 500upx; font-size: 28upx; }
-    .right-img { border-bottom: 0; }
-    .cell-textarea { padding: 0 26upx 20upx; }
-        .cell-textarea textarea { width: 100%; height: 200upx; font-size: 26upx; color: #333; }
-    .evaluate-c-b { overflow: hidden; padding: 0 20upx; }
-    .upload-img { width: 146upx; height: 146upx; margin: 14upx; text-align: center; color: #999999; font-size: 22upx; border: 2upx solid #E1E1E1; border-radius: 4upx; display: inline-block; float: left; padding: 24upx 0; }
-    .goods-img-item { width: 174upx; height: 174upx; padding: 14upx; float: left; position: relative; }
-        .goods-img-item:nth-child(4n) { margin-right: 0; }
-        .goods-img-item image { width: 100%; height: 100%; }
-    .del { width: 30upx !important; height: 30upx !important; position: absolute; right: 0; top: 0; z-index: 999; }
-    .cell-textarea textarea { background-color: #f8f8f8; padding: 12upx 20upx; box-sizing: border-box; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/storeSetting/storeSetting.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/storeSetting/storeSetting.vue
new file mode 100644
index 0000000000000000000000000000000000000000..204c62ecf155a9ea82376332f4345468cc4fe643
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/storeSetting/storeSetting.vue
@@ -0,0 +1,160 @@
+<template>
+    <view class="coreshop-bg-white">
+        <u-toast ref="uToast" /><u-no-network></u-no-network>
+        <u-navbar title="店铺设置"></u-navbar>
+        <view class="u-padding-20 ">
+            <u-form :model="form" :rules="rules" ref="uForm" :errorType="errorType">
+                <u-form-item label="店铺名称" label-width="140" prop="storeName">
+                    <u-input type="text" placeholder='请输入店铺名称' v-model="form.storeName" />
+                </u-form-item>
+                <u-form-item label="店铺Logo" label-width="140">
+                    <image class='coreshop-avatar xl radius bg-gray' mode="aspectFill" :src="form.storeLogo" @click="uploadLogo"></image>
+                </u-form-item>
+                <u-form-item label="店铺简介" label-width="140" prop="storeDesc">
+                    <u-input v-model="form.storeDesc" type="textarea" border="true" height="100" auto-height="true" placeholder="请您在此描述问题(最多200字)" maxlength="200" />
+                </u-form-item>
+                <u-form-item label="店铺招牌" label-width="140">
+                    <u-upload :action="upLoadAction" ref="uUpload" :file-list="fileList" max-count="3" :max-size="2 * 1024 * 1024" width="120" height="120" :header="header"></u-upload>
+                </u-form-item>
+            </u-form>
+        </view>
+        <!--按钮-->
+        <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="submitHandler">保存</u-button>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+
+    export default {
+        data() {
+            return {
+                customStyle: {
+                    width: '100%',
+                },
+                upLoadAction: this.$globalConstVars.apiBaseUrl + '/Api/Common/UploadImages',
+                header: {
+                    'Accept': 'application/json',
+                    'Content-Type': 'multipart/form-data',
+                    'Authorization': 'Bearer ' + this.$db.get('userToken')
+                },
+                fileList: [],
+                errorType: ['message'],
+                form: {
+                    storeName: '',//店铺名称
+                    storeLogo: '',
+                    storeBanner: '',
+                    storeDesc: '',//店铺介绍
+                },
+                rules: {
+                    storeName: [
+                        {
+                            required: true,
+                            message: '请输入店铺名称',
+                            trigger: ['blur', 'change']
+                        }
+                    ],
+                    storeDesc: [
+                        {
+                            required: true,
+                            message: '请输入店铺简介',
+                            trigger: ['blur', 'change']
+                        }
+                    ]
+                }
+            }
+        },
+        onReady() {
+            this.$refs.uForm.setRules(this.rules);
+            this.fileList = this.$refs.uUpload.lists;
+        },
+        methods: {
+            // 用户上传头像
+            uploadLogo() {
+                this.$upload.uploadFiles(null, res => {
+                    if (res.status) {
+                        this.form.storeLogo = res.data.src;
+                    } else {
+                        this.$u.toast(res.msg)
+                    }
+                })
+            },
+            submitHandler() {
+                this.$refs.uForm.validate(valid => {
+                    if (valid) {
+                        console.log('验证通过');
+                        console.log(this.fileList);
+
+                        if (!this.form.storeName || this.form.storeName == '') {
+                            this.$u.toast('请填写店铺名称');
+                            return;
+                        }
+                        if (this.fileList.length <= 0) {
+                            this.$u.toast('请上传店铺招牌');
+                            return;
+                        } else {
+                            let images = [];
+                            for (var i = 0; i < this.fileList.length; i++) {
+                                if (this.fileList[i].url) {
+                                    images.push(this.fileList[i].url);
+                                } else if (this.fileList[i].error == false) {
+                                    images.push(this.fileList[i].response.data.fileUrl);
+                                }
+                            }
+                            this.form.storeBanner = images.join(',');
+                        }
+
+                        if (!this.form.storeLogo) {
+                            this.$u.toast('请上传店铺LOGO');
+                            return;
+                        }
+
+                        this.$u.api.setAgentStore({
+                            storeName: this.form.storeName,
+                            storeLogo: this.form.storeLogo,
+                            storeBanner: this.form.storeBanner,
+                            storeDesc: this.form.storeDesc
+                        }).then(res => {
+                            if (res.status) {
+                                this.$refs.uToast.show({ title: res.msg, type: 'success', back: false })
+                            } else {
+                                this.$u.toast(res.msg);
+                            }
+                        });
+
+                    } else {
+                        console.log('验证失败');
+                    }
+                });
+            }
+        },
+        onLoad: function () {
+            var _this = this;
+            _this.$u.api.getAgentInfo({ check_condition: false }).then(res => {
+                if (res.status) {
+                    _this.form.storeName = res.data.storeName;
+                    _this.form.storeDesc = res.data.storeDesc;
+                    _this.form.storeLogo = res.data.storeLogo;
+                    _this.form.storeBanner = res.data.storeBanner;
+                    if (res.data.storeBanner) {
+                        var arr = res.data.storeBanner.split(',');
+                        for (var i = 0; i < arr.length; i++) {
+                            _this.fileList.push({
+                                url: arr[i]
+                            });
+                        }
+                    }
+                } else {
+                    //报错了
+                    _this.$u.toast(res.msg);
+                }
+            });
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/team/team.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/team/team.scss
new file mode 100644
index 0000000000000000000000000000000000000000..414abdb904290bc7300a0a65d55e0bb5559852c4
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/team/team.scss
@@ -0,0 +1,28 @@
+.referrer-box { font-size: 28rpx; font-weight: 500; color: #ffffff; margin-top: 10rpx;
+    .referrer-avatarImage { width: 34rpx; height: 34rpx; border-radius: 50%; }
+}
+.refresh-btn { width: 100%; line-height: 100rpx; background: #ffffff; border-radius: 25rpx; font-size: 22rpx; font-weight: 500; color: #999999; white-space: nowrap;
+    .cuIcon-refresh { color: #dbdbdb; margin-right: 12rpx; font-size: 32rpx; }
+}
+.refresh-active { transform: rotate(360deg); transition: all linear 0.5s; }
+.head_box { background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; background-size: 100% auto; position: relative;
+    &::after { content: ""; position: absolute; z-index: -1; background-color: inherit; width: 100%; height: 100%; left: 0; bottom: -10%; border-radius: 10upx; opacity: 0.2; transform: scale(0.9, 0.9); }
+}
+.team-data-box { margin: 30rpx 20rpx;
+    .data-card { width: 340rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx;
+        .item-title { font-size: 22rpx; font-weight: 500; color: #999999; line-height: 30rpx; margin-bottom: 10rpx; }
+        .total-item { margin-bottom: 20rpx; }
+        .total-num { font-size: 38rpx; font-weight: 500; color: #333333; }
+        .category-num { font-size: 26rpx; font-weight: 500; color: #333333; }
+    }
+}
+.filter-box { width: 750rpx; height: 95rpx; background: #ffffff;
+    .filter-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center;
+        .filter-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
+        .cuIcon-unfold { font-size: 24rpx; color: #c4c4c4; margin-left: 10rpx; transition: all linear 0.3s; }
+        .icon-active { transform: rotate(180deg); transform-origin: center center; transition: all linear 0.3s; }
+        .title-active { color: #333; }
+        .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
+        .underline-active { background: #5e49c3; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/team.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/team/team.vue
similarity index 67%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/agent/team.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/agent/team/team.vue
index 12ba907c73469e48db565d94aa2d583fd16f9220..3c620f398f2b825f7662d326576a3fba6df45788 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/team.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/team/team.vue
@@ -1,35 +1,31 @@
 <!-- 我的团队 -->
 <template>
-    <view class="pageBox team-wrap">
-        <!--<u-navbar title="我的推广"></u-navbar>-->
-        <view class="head_box bg-blue shadow-warp">
-            <cu-custom isBack bgColor="text-white">
-                <block slot="backText">我的推广</block>
-            </cu-custom>
-
+    <view>
+        <u-navbar title="我的推广"></u-navbar>
+        <view class="head_box coreshop-bg-blue u-padding-top-20  u-padding-bottom-20">
             <!-- 推荐人 -->
-            <view class="referrer-box x-f u-padding-left-30  u-padding-right-30" v-if="referrerInfo && referrerInfo.avatarImage">
+            <view class="referrer-box coreshop-flex coreshop-align-center u-padding-left-30  u-padding-right-30" v-if="referrerInfo && referrerInfo.avatarImage">
                 上级推荐人：
                 <image class="referrer-avatarImage" :src="referrerInfo.avatarImage" mode=""></image>
                 {{ referrerInfo.nickName }}
             </view>
-            <view class="referrer-box x-f  u-padding-left-30  u-padding-right-30" v-else>
+            <view class="referrer-box coreshop-flex coreshop-align-center  u-padding-left-30  u-padding-right-30" v-else>
                 上级推荐人：无
             </view>
 
             <!-- 团队数据总览 -->
-            <view class="team-data-box x-bc">
+            <view class="team-data-box u-flex u-row-between">
                 <view class="data-card">
                     <view class="total-item">
                         <view class="item-title">团队总人数(人)</view>
                         <view class="total-num">{{ userInfo.count || 0 }}</view>
                     </view>
-                    <view class="category-item x-f">
-                        <view class="y-start flex-sub">
+                    <view class="category-item u-flex u-row-between">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">总人数</view>
                             <view class="category-num">{{ userInfo.first || 0 }}</view>
                         </view>
-                        <view class="y-start flex-sub">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">总订单</view>
                             <view class="category-num">{{ userInfo.second || 0 }}</view>
                         </view>
@@ -40,12 +36,12 @@
                         <view class="item-title">本月推广人数(人)</view>
                         <view class="total-num">{{ userInfo.monthCount || 0 }}</view>
                     </view>
-                    <view class="category-item x-f">
-                        <view class="y-start flex-sub">
+                    <view class="category-item u-flex u-row-between">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">人数</view>
                             <view class="category-num">{{ userInfo.monthFirst || 0 }}</view>
                         </view>
-                        <view class="y-start ">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start ">
                             <view class="item-title">订单</view>
                             <view class="category-num">{{ userInfo.monthSecond || 0 }}</view>
                         </view>
@@ -54,9 +50,9 @@
             </view>
 
             <!-- 筛选 TODO -->
-            <!--<view class="filter-box x-f">
+            <!--<view class="filter-box coreshop-flex coreshop-align-center">
                 <view class="filter-item flex-sub" v-for="(filter, index) in filterList" :key="index" @tap="onFilter(index)">
-                    <view class="x-f">
+                    <view class="coreshop-flex coreshop-align-center">
                         <text class="filter-title" :class="{ 'title-active': filterCurrent == index }">{{ filter.title }}</text>
                         <text v-show="index" class="cuIcon-unfold" :class="{ 'icon-active': filter.isUnfold }"></text>
                     </view>
@@ -66,19 +62,19 @@
         </view>
         <scroll-view :style="'height:'+viewHeight+'px'" scroll-y="true" class="scroll-Y">
             <!-- 团队列表 -->
-            <view class="team-box">
-                <view class="team-list">
+            <view class="coreshop-team-box">
+                <view class="coreshop-team-list">
                     <view v-if="list.length">
-                        <view class="team-children x-f" v-for="children in list" :key="children.id">
+                        <view class="coreshop-team-children coreshop-flex coreshop-align-center" v-for="children in list" :key="children.id">
                             <image class="head-img" :src="children.avatarImage" mode=""></image>
                             <view class="head-info">
-                                <view class="name-box x-bc">
+                                <view class="name-box u-flex u-row-between">
                                     <view class="name-text">{{ children.nickName }}</view>
-                                    <view class="x-f">
+                                    <view class="coreshop-flex coreshop-align-center">
                                         <text class="cu-tag bg-grey sm radius">{{  children.mobile }}</text>
                                     </view>
                                 </view>
-                                <view class="x-bc">
+                                <view class="u-flex u-row-between">
                                     <view class="head-time">{{ $u.timeFormat(children.createTime, 'yyyy年mm月dd日') }}</view>
                                     <!--<view class="child-num u-margin-left-30">下级成员：{{ childNum || 0 }}人</view>-->
                                 </view>
@@ -88,7 +84,7 @@
                     </view>
                     <!-- 无数据时默认显示 -->
                     <view class="coreshop-emptybox" v-else>
-                        <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无邀请列表" mode="list"></u-empty>
+                        <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无邀请列表" mode="list"></u-empty>
                     </view>
 
                 </view>
@@ -227,32 +223,5 @@
 </script>
 
 <style lang="scss">
-    .referrer-box { font-size: 28rpx; font-weight: 500; color: #ffffff; margin-top: 10rpx; }
-        .referrer-box .referrer-avatarImage { width: 34rpx; height: 34rpx; border-radius: 50%; }
-
-    .refresh-btn { width: 100%; line-height: 100rpx; background: #ffffff; border-radius: 25rpx; font-size: 22rpx; font-weight: 500; color: #999999; white-space: nowrap; }
-        .refresh-btn .cuIcon-refresh { color: #dbdbdb; margin-right: 12rpx; font-size: 32rpx; }
-
-    .refresh-active { transform: rotate(360deg); transition: all linear 0.5s; }
-
-    .head_box { background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; background-size: 100% auto; position: relative; }
-        .head_box::after { content: ""; position: absolute; z-index: -1; background-color: inherit; width: 100%; height: 100%; left: 0; bottom: -10%; border-radius: 10upx; opacity: 0.2; transform: scale(0.9, 0.9); }
-        .head_box .cu-back { color: #fff; font-size: 40rpx; }
-        .head_box .head-title { font-size: 38rpx; color: #fff; }
-
-    .team-data-box { margin: 30rpx 20rpx; }
-        .team-data-box .data-card { width: 340rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx; }
-            .team-data-box .data-card .item-title { font-size: 22rpx; font-weight: 500; color: #999999; line-height: 30rpx; margin-bottom: 10rpx; }
-            .team-data-box .data-card .total-item { margin-bottom: 20rpx; }
-            .team-data-box .data-card .total-num { font-size: 38rpx; font-weight: 500; color: #333333; }
-            .team-data-box .data-card .category-num { font-size: 26rpx; font-weight: 500; color: #333333; }
-
-    .filter-box { width: 750rpx; height: 95rpx; background: #ffffff; }
-        .filter-box .filter-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; }
-            .filter-box .filter-item .filter-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
-            .filter-box .filter-item .cuIcon-unfold { font-size: 24rpx; color: #c4c4c4; margin-left: 10rpx; transition: all linear 0.3s; }
-            .filter-box .filter-item .icon-active { transform: rotate(180deg); transform-origin: center center; transition: all linear 0.3s; }
-            .filter-box .filter-item .title-active { color: #333; }
-            .filter-box .filter-item .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
-            .filter-box .filter-item .underline-active { background: #5e49c3; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+    @import "team.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/addBankCard.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/addBankCard/addBankCard.vue
similarity index 38%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/balance/addBankCard.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/balance/addBankCard/addBankCard.vue
index dceead097ec310c0e11ecad2cc532cfdc4bac416..f9a47cedce8bc596e40c061d3799e228e4cb84cb 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/addBankCard.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/addBankCard/addBankCard.vue
@@ -2,47 +2,40 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="添加银行卡"></u-navbar>
-        <form>
-            <view class="cu-form-group">
-                <view class="title">银行卡号</view>
-                <input type="number" v-model="cardNumber" focus @blur="checkCard()" placeholder='请输入银行卡号'></input>
-            </view>
-            <view class="cu-form-group">
-                <view class="title">持卡人</view>
-                <input type="text" v-model="name" placeholder='请输入持卡人姓名'></input>
-
-            </view>
-            <view class="cu-form-group">
-                <view class="title">银行名称</view>
-                <input type="text" :disabled="true" v-model="bankName"></input>
-            </view>
-            <view class="cu-form-group">
-                <view class="title">银行卡类型</view>
-                <input type="text" :disabled="true" v-model='cardTypeName'></input>
-            </view>
-            <view class="cu-form-group">
-                <view class="title">开户行名</view>
-                <input type="text" v-model="accountBank" placeholder='请输入开户银行名'></input>
-            </view>
-            <view class="cu-form-group">
-                <view class="title">开户行地址</view>
-                <input :value="pickerValue" @focus="showThreePicker"></input>
-                <u-select v-model="show" mode="mutil-column-auto" :list="pickerList" :default-value="pickerIndex" @confirm="onConfirm"></u-select>
-                <text class='cuIcon-locationfill text-orange' @click="showThreePicker"></text>
-
-            </view>
-            <view class="cu-form-group" @click="defaultChange">
-                <view class="title">设为默认</view>
-                <radio value="0" :checked="checked" color="#333" />
-            </view>
-
-        </form>
 
-        <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
-            <view class="flex padding-sm flex-direction">
-                <button class="cu-btn bg-red" @click="addCard" hover-class="btn-hover2" :disabled='submitStatus' :loading='submitStatus'>保存</button>
+        <view class="u-padding-20">
+            <u-form :model="form" :rules="rules" ref="uForm" :errorType="errorType">
+                <u-form-item label="银行卡号" label-width="180" prop="cardNumber">
+                    <u-input type="text" v-model="form.cardNumber" placeholder="请输入银行卡号" @blur="checkCard()"></u-input>
+                </u-form-item>
+                <u-form-item label="持卡人姓名" label-width="180" prop="name">
+                    <u-input type="text" v-model="form.name" placeholder="请输入持卡人姓名"></u-input>
+                </u-form-item>
+                <u-form-item label="银行名称" label-width="180">
+                    <u-input type="text" :disabled="true" v-model="form.bankName"></u-input>
+                </u-form-item>
+                <u-form-item label="银行卡类型" label-width="180">
+                    <u-input type="text" :disabled="true" v-model="form.cardTypeName"></u-input>
+                </u-form-item>
+                <u-form-item label="开户行名" label-width="180">
+                    <u-input type="text" v-model="form.accountBank" placeholder="请输入开户银行名"></u-input>
+                </u-form-item>
+                <u-form-item label="开户行地址" label-width="180">
+                    <u-input :value="pickerValue" @click="showThreePicker" type="select" placeholder="请选择开户行区域"></u-input>
+                    <u-select v-model="show" mode="mutil-column-auto" :list="pickerList" :default-value="pickerIndex" @confirm="onConfirm"></u-select>
+                </u-form-item>
+                <u-form-item label="设为默认" label-width="180">
+                    <u-checkbox v-model="checked" @change="defaultChange">勾选将设为默认提现账户</u-checkbox>
+                </u-form-item>
+            </u-form>
+        </view>
+        <!--按钮-->
+        <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="addCard" :disabled='submitStatus' :loading='submitStatus'>保存</u-button>
             </view>
         </view>
+
     </view>
 
 </template>
@@ -51,18 +44,22 @@
     export default {
         data() {
             return {
-                bankName: '',	// 银行名称
-                cardType: 1, // 卡类型
-                cardTypeName: '', // 卡片类型
-                bankCode: '', // 银行缩写码
-                accountBank: '', // 开户行
-                cardNumber: '', // 银行卡号
-                name: '',	// 开户人姓名
-                mobile: '',	//
+                customStyle: {
+                    width: '100%',
+                },
+                form: {
+                    cardNumber: '', // 银行卡号
+                    name: '',	// 开户人姓名
+                    bankName: '',	// 银行名称
+                    bankCode: '', // 银行缩写码
+                    accountBank: '', // 开户行
+                    cardType: 1, // 卡类型
+                    cardTypeName: '', // 卡片类型
+                    isDefault: 0,
+                },
+                errorType: ['message'],
                 region: ['湖南省', '怀化市', '鹤城区'],
-                areaId: 431202,
-                address: '',
-                isDefault: 0,
+                areaId: 0,
                 checked: false,
                 pickerValue: '',
                 submitStatus: false,
@@ -73,9 +70,46 @@
                 provinceKey: -1,//省份id
                 cityKey: -1,//市id
                 areaKey: -1,//区域id
+                rules: {
+                    cardNumber: [
+                        {
+                            required: true,
+                            message: '请输入密码',
+                            trigger: ['change', 'blur'],
+                        },
+                        {
+                            type: 'number',
+                            message: '请输入数字银行卡号',
+                            trigger: ['change', 'blur'],
+                        }
+                    ],
+                    name: [
+                        {
+                            required: true,
+                            message: '请输入姓名',
+                            trigger: 'blur',
+                        },
+                        {
+                            min: 2,
+                            max: 4,
+                            message: '姓名长度在2到4个字符',
+                            trigger: ['change', 'blur'],
+                        },
+                        {
+                            validator: (rule, value, callback) => {
+                                return this.$u.test.chinese(value);
+                            },
+                            message: '必须为中文',
+                            trigger: ['change', 'blur'],
+                        }
+                    ],
+                },
             }
         },
         computed: {},
+        onReady() {
+            this.$refs.uForm.setRules(this.rules);
+        },
         methods: {
             // 省市区联动初始化
             showThreePicker() {
@@ -93,7 +127,7 @@
                     cityName: cityName,
                     countyName: countyName
                 }
-                let regionName = [provinceName, cityName, countyName];
+                //let regionName = [provinceName, cityName, countyName];
                 this.$u.api.getAreaId(data).then(res => {
                     if (res.status) {
                         this.areaId = res.data;
@@ -108,138 +142,84 @@
                 });
             },
             // 选择/取消默认
-            defaultChange() {
-                this.checked = !this.checked
-                this.isDefault = this.isDefault === 0 ? 1 : 0
-            },
-            //存储收货地址
-            saveShip() {
-                if (this.id && this.id != 0) {
-                    //编辑存储
-                    let data = {
-                        'id': this.id,
-                        'name': this.name,
-                        'address': this.address,
-                        'mobile': this.mobile,
-                        'isDefault': this.isDefault
-                    }
-
-                    data['areaId'] = this.areaId,
-                        this.$u.api.editShip(data).then(res => {
-                            if (res.status) {
-                                this.$refs.uToast.show({ title: '编辑成功', type: 'success', back: true })
-                            } else {
-                                this.$u.toast(res.msg);
-                            }
-                        });
-                } else {
-                    //添加
-                    let data = {
-                        'areaId': this.areaId,
-                        'name': this.name,
-                        'address': this.address,
-                        'mobile': this.mobile,
-                        'isDefault': this.isDefault
-                    }
-                    this.$u.api.saveUserShip(data).then(res => {
-                        if (res.status) {
-                            this.$refs.uToast.show({ title: '添加成功', type: 'success', back: true })
-                        } else {
-                            this.$u.toast(res.msg);
-                        }
-                    });
-                }
+            defaultChange(e) {
+                this.form.isDefault = e.value ? 1 : 0;
+                console.log(this.form.isDefault);
             },
             // 判断获取银行卡类型
             checkCard() {
                 let _this = this;
-                if (this.cardNumber) {
+                if (this.form.cardNumber) {
                     let data = {
-                        id: this.cardNumber
+                        id: this.form.cardNumber
                     }
                     this.$u.api.getBankCardOrganization(data).then(res => {
                         if (res.status) {
                             let data = res.data
-                            _this.bankName = data.name
-                            _this.cardType = data.type
-                            _this.bankCode = data.bankCode
-                            _this.cardTypeName = data.typeName
+                            _this.form.bankName = data.name
+                            _this.form.cardType = data.type
+                            _this.form.bankCode = data.bankCode
+                            _this.form.cardTypeName = data.typeName
                         } else {
                             _this.$refs.uToast.show({
                                 title: res.msg, type: 'error', callback: function () {
-                                    _this.bankCode = _this.bankName = _this.cardType = _this.cardTypeName = ''
+                                    _this.form.bankCode = _this.form.bankName = _this.form.cardType = _this.form.cardTypeName = ''
                                 }
                             })
 
                         }
                     })
                 } else {
-                    this.bankCode = this.bankName = this.cardType = this.cardTypeName = ''
+                    this.form.bankCode = this.form.bankName = this.form.cardType = this.form.cardTypeName = ''
                 }
             },
             // 添加银行卡
             addCard() {
-                if (!this.cardNumber) {
-                    this.$u.toast('请输入银行卡号')
-                } else if (!this.bankName || !this.cardType || !this.bankCode) {
-                    this.$u.toast('请输入正确的银行卡号')
-                } else if (!/^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,30}$/.test(this.name)) {
-                    this.$u.toast('请输入正确的持卡人名称')
-                } else if (!this.areaId) {
-                    this.$u.toast('请选择开户行所在地区')
-                } else if (!this.accountBank) {
-                    this.$u.toast('请输入开户银行信息')
-                } else {
-                    this.submitStatus = true;
-                    let data = {
-                        bankName: this.bankName,
-                        bankCode: this.bankCode,
-                        bankAreaId: this.areaId,
-                        accountBank: this.accountBank,
-                        accountName: this.name,
-                        cardNumber: this.cardNumber,
-                        cardType: this.cardType,
-                        isDefault: this.isDefault
-                    }
 
-                    this.$u.api.addBankCard(data).then(res => {
-                        this.submitStatus = false;
-                        if (res.status) {
-                            this.$refs.uToast.show({ title: res.msg, type: 'success', back: true })
-                        } else {
-                            this.$u.toast(res.msg);
-                        }
-                    });
-                }
-            },
-            // #ifdef MP-ALIPAY
-            // alipay bank
-            aliPayBank() {
-                let _this = this;
-                if (this.cardNumber.length >= 16 && this.cardNumber.length <= 19) {
-                    let data = {
-                        card_code: this.cardNumber
-                    }
-                    this.$u.api.getBankCardOrganization(data).then(res => {
-                        if (res.status) {
-                            let data = res.data
-                            this.bankName = data.name
-                            this.cardType = data.type
-                            this.bankCode = data.bank_code
-                            this.cardTypeName = data.type_name
+                this.$refs.uForm.validate(valid => {
+                    if (valid) {
+                        console.log('验证通过');
+
+                        if (!this.form.cardNumber) {
+                            this.$u.toast('请输入银行卡号')
+                        } else if (!this.form.bankName || !this.form.cardType || !this.form.bankCode) {
+                            this.$u.toast('请输入正确的银行卡号')
+                        } else if (!/^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,30}$/.test(this.form.name)) {
+                            this.$u.toast('请输入正确的持卡人名称')
+                        } else if (this.areaId <= 0) {
+                            this.$u.toast('请选择开户行所在地区')
+                        } else if (!this.form.accountBank) {
+                            this.$u.toast('请输入开户银行信息')
                         } else {
-                            _this.$refs.uToast.show({
-                                title: res.msg, type: 'error', callback: function () {
-                                    _this.bankCode = _this.bankName = _this.cardType = _this.cardTypeName = ''
+                            this.submitStatus = true;
+                            let data = {
+                                bankName: this.form.bankName,
+                                bankCode: this.form.bankCode,
+                                bankAreaId: this.areaId,
+                                accountBank: this.form.accountBank,
+                                accountName: this.form.name,
+                                cardNumber: this.form.cardNumber,
+                                cardType: this.form.cardType,
+                                isDefault: this.form.isDefault
+                            }
+                            this.$u.api.addBankCard(data).then(res => {
+                                this.submitStatus = false;
+                                if (res.status) {
+                                    this.$refs.uToast.show({ title: res.msg, type: 'success', back: true })
+                                } else {
+                                    this.$u.toast(res.msg);
                                 }
-                            })
+                            });
                         }
-                    })
-                } else {
-                    this.bankCode = this.bankName = this.cardType = this.cardTypeName = ''
-                }
+
+
+                    } else {
+                        console.log('验证失败');
+                    }
+                });
+
+
             },
-            // #endif
             //倒查城市信息
             getFullPath(id, data) {
                 for (var i = 0; i < data.length; i++) {
@@ -275,6 +255,7 @@
                     }
                 }
             },
+            //增加默认省市区选中
             init() {
                 this.getFullPath(this.areaId, this.province);
                 this.pickerIndex = [this.provinceKey, this.cityKey, this.areaKey];
@@ -287,24 +268,14 @@
                 this.id = e.ship_id;
                 this.getShipInfo();
             } else {
-                //添加
-                this.pickerValue = this.region[0] + " " + this.region[1] + " " + this.region[2];
-                this.init();
-            }
-        },
-        // #ifdef MP-ALIPAY
-        watch: {
-            cardNumber() {
-                this.$u.throttle(this.aliPayBank, 500)
+                //添加（取消初始化）
+                //this.pickerValue = this.region[0] + " " + this.region[1] + " " + this.region[2];
+                //this.init();
             }
         },
-        // #endif
     }
 </script>
 
-<style lang="scss" scoped>
-    .cu-form-group .title { min-width: calc(5em + 15px); }
-    /* #ifdef MP-ALIPAY */
-    input { font-size: 24upx; }
-    /* #endif */
+<style lang="scss">
+    page { background: #fff; }
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.scss
new file mode 100644
index 0000000000000000000000000000000000000000..3ee9a99817762c9243e42c3518211b327cda4797
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.scss
@@ -0,0 +1,18 @@
+.card-item { position: relative; background-color: #fff; margin: 26rpx; border-radius: 10rpx; box-shadow: 0 0 20rpx #ccc; padding: 60rpx 40rpx 80rpx 40rpx;
+    .card-item-tip { position: absolute; top: 0rpx; left: 0rpx; z-index: 10; border-top-left-radius: 10rpx; overflow: hidden; width: 100rpx; height: 100rpx;
+        .cit-bg { position: absolute; top: 0; left: 0; z-index: 11; color: #ffffff; width: 0rpx; height: 0rpx; border-bottom: solid 100rpx transparent; border-right: solid 100rpx transparent; border-top: solid 100rpx #ff7159; }
+        .cit-text { position: absolute; top: 0; left: 0; z-index: 12; color: #ffffff; margin-top: 4rpx; margin-left: 14rpx; font-size: 30rpx; }
+    }
+    .card-item-body {
+        .cib-left { position: absolute; top: 60%; transform: translateY(-50%); width: 250rpx;
+            .bank-logo { width: 240rpx; height: 70rpx; }
+        }
+        .cib-right { margin-left: 250rpx;
+            .cibr-t { font-size: 30rpx; margin-bottom: 10rpx; text-align: center; }
+            .cibr-b { font-size: 26rpx; text-align: center; }
+        }
+    }
+
+    .mr-card { position: absolute; right: 140rpx; bottom: 12rpx; position: absolute; right: 140rpx; }
+    .del-card { position: absolute; right: 30rpx; bottom: 12rpx; position: absolute; right: 30rpx; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue
similarity index 50%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue
index fe0d16904676139081f70ab11049d2cc69274299..556741df65f0ef2191b35a8e0d1899bcc9983958 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue
@@ -2,56 +2,51 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="我的银行卡"></u-navbar>
-        <view class="content">
-            <view class="content-top" v-if="cards.length">
-                <view class="card-item" v-for="(item, index) in cards" :key="index">
-                    <view class="card-item-tip" v-if="item.isdefault">
-                        <view class="cit-bg"></view>
-                        <view class="cit-text">默</view>
+        <view class="coreshop-content-top" v-if="cards.length">
+            <view class="card-item" v-for="(item, index) in cards" :key="index">
+                <view class="card-item-tip" v-if="item.isdefault">
+                    <view class="cit-bg"></view>
+                    <view class="cit-text">默</view>
+                </view>
+                <view class="card-item-body">
+                    <view class="cib-left">
+                        <image class="bank-logo" :src="item.bankLogo" mode=""></image>
                     </view>
-                    <view class="card-item-body">
-                        <view class="cib-left">
-                            <image class="bank-logo" :src="item.bankLogo" mode=""></image>
+                    <view class="cib-right">
+                        <view class="cibr-t color-3">
+                            {{ item.bankName }} - {{ item.cardTypeName }}
                         </view>
-                        <view class="cib-right">
-                            <view class="cibr-t color-3">
-                                {{ item.bankName }} - {{ item.cardTypeName }}
-                            </view>
-                            <view class="cibr-b color-9">
-                                {{ item.cardNumber }}
-                            </view>
+                        <view class="cibr-b ">
+                            {{ item.cardNumber }}
                         </view>
                     </view>
-                    <view class="mr-card" v-if="item.cardNumber === false" @click="setDefault(item.id)">
-                        <button class="coreshop-btn coreshop-btn-w" :disabled='submitStatus' :loading='submitStatus'>设为默认</button>
-                    </view>
-                    <view class="del-card" v-if="mold" @click="selected(index)">
-                        <button class="coreshop-btn coreshop-btn-b">选择</button>
-                    </view>
-                    <view class="del-card" v-else @click="removeCard(item.id)">
-                        <button class="coreshop-btn coreshop-btn-b" :disabled='delSubmitStatus' :loading='delSubmitStatus'>删除</button>
-                    </view>
-                </view>
-            </view>
-            <!-- 无数据时默认显示 -->
-            <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/coupon.png'" icon-size="300" text="暂无银行卡" mode="list"></u-empty>
-            </view>
-            <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
-                <view class="flex padding-sm flex-direction">
-                    <button class="cu-btn bg-red" @click="goAddcard()">添加银行卡</button>
                 </view>
+                <u-button class="mr-card" v-if="item.isdefault === false" @click="setDefault(item.id)" size="mini" :disabled='submitStatus' :loading='submitStatus'  type="success">设为默认</u-button>
+                <u-button class="del-card" v-if="mold" @click="selected(index)" size="mini" type="primary">选择</u-button>
+                <u-button class="del-card" v-else @click="removeCard(item.id)" size="mini" type="error" :disabled='delSubmitStatus' :loading='delSubmitStatus'>删除</u-button>
             </view>
+        </view>
+        <!-- 无数据时默认显示 -->
+        <view class="coreshop-emptybox" v-else>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/coupon.png'" icon-size="300" text="暂无银行卡" mode="list"></u-empty>
+        </view>
 
+        <!--按钮-->
+        <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="goAddcard()">添加银行卡</u-button>
+            </view>
         </view>
     </view>
-
 </template>
 
 <script>
     export default {
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 mold: '',
                 cards: [],// 我的银行卡列表
                 submitStatus: false,
@@ -120,7 +115,7 @@
             },
             // 添加新的银行卡
             goAddcard() {
-                this.$u.route({ url: '/pages/member/balance/addBankCard' })
+                this.$u.route({ url: '/pages/member/balance/addBankCard/addBankCard' })
             },
             selected(index) {
                 let pages = getCurrentPages();//当前页
@@ -147,25 +142,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .card-item { position: relative; background-color: #fff; margin: 26rpx; border-radius: 10rpx; box-shadow: 0 0 20rpx #ccc; padding: 60rpx 30rpx 80rpx; }
-    .card-item-tip { position: absolute; top: 0rpx; left: 0rpx; z-index: 10; border-top-left-radius: 10rpx; overflow: hidden; width: 100rpx; height: 100rpx; }
-    .cit-bg { position: absolute; top: 0; left: 0; z-index: 11; color: #ffffff; width: 0rpx; height: 0rpx; border-bottom: solid 100rpx transparent; border-right: solid 100rpx transparent; border-top: solid 100rpx #FF7159; }
-    .cit-text { position: absolute; top: 0; left: 0; z-index: 12; color: #ffffff; margin-top: 4rpx; margin-left: 14rpx; font-size: 30rpx; }
-
-    .cib-left { position: absolute; top: 60%; transform: translateY(-50%); width: 250rpx; }
-    .bank-logo { width: 240rpx; height: 70rpx; }
-    .cib-right { margin-left: 250rpx; }
-    .cibr-t { font-size: 30rpx; margin-bottom: 10rpx; text-align: center; }
-    .cibr-b { font-size: 26rpx; text-align: center; }
-    .mr-card { position: absolute; right: 140rpx; bottom: 0rpx; }
-    /* #ifdef MP-TOUTIAO */
-    .mr-card { position: absolute; right: 140rpx; bottom: 12rpx; }
-    .del-card { position: absolute; right: 30rpx; bottom: 12rpx; }
-    /* #endif */
-    /* #ifndef MP-TOUTIAO */
-    .mr-card { position: absolute; right: 140rpx; bottom: 0rpx; }
-    .del-card { position: absolute; right: 30rpx; bottom: 0rpx; }
-        /* #endif */
-        .del-card .coreshop-btn, .mr-card .coreshop-btn { font-size: 24rpx; height: 48rpx; line-height: 46rpx; padding: 0 16rpx; }
-
+    @import "bankcard.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/cashlist.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/cashlist/cashlist.vue
similarity index 64%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/balance/cashlist.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/balance/cashlist/cashlist.vue
index 5df3f75a03661da8373be9f01180f4de2e96ac9e..b2f4f4926c0e861d1db89b762663a6a1e2fa84e1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/cashlist.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/cashlist/cashlist.vue
@@ -2,39 +2,38 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="提现明细"></u-navbar>
-        <view class="content">
-
-            <view class="cu-form-group">
-                <view class="title">类型筛选</view>
-                <picker @change="changeState" :value="index" :range="objectType">
-                    <view class="picker">
-                        {{index>-1?objectType[index]:'禁止换行，超出容器部分会以 ... 方式截断'}}
-                    </view>
-                </picker>
-            </view>
-
-            <view class="cu-list menu-avatar sm-border card-menu margin-top" v-if="list.length>0">
-                <view class="cu-item" v-for="(item, index) in list" :key="index">
-                    <view class="content">
-                        <view class="text-grey">{{ item.statusName }}</view>
-                        <view class="text-gray text-sm flex">
-                            提现卡号：{{ item.cardNumber }}
+        <view class="u-flex u-flex-nowrap u-row-between u-padding-30 coreshop-bg-white">
+            <view class="title">类型筛选</view>
+            <picker @change="changeState" :value="index" :range="objectType">
+                <view class="picker">
+                    {{index>-1?objectType[index]:''}}
+                    <u-icon name="arrow-right-double" margin-left="20rpx" class="u-margin-left-20"></u-icon>
+                </view>
+            </picker>
+        </view>
+        <view class="u-margin-top-30  u-margin-left-30 u-margin-right-30 radius">
+            <view v-if="list.length>0">
+                <view class="coreshop-log-item u-flex u-row-between" v-for="item in list" :key="item.id">
+                    <view class="item-left coreshop-flex coreshop-align-center">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
+                            <view class="log-name coreshop-text-black">{{ item.statusName }}</view>
+                            <view class="log-notice coreshop-text-grey">提现卡号：{{ item.cardNumber }}</view>
                         </view>
                     </view>
-                    <view class="action">
-                        <view class="text-grey text-sm"> {{ item.createTime }}</view>
-                        <view class="text-red text-price text-xl"> {{ item.money }}</view>
+                    <view class="item-right coreshop-flex coreshop-flex-direction coreshop-align-end">
+                        <view class="log-num coreshop-text-red">{{ item.money }}</view>
+                        <view class="log-date coreshop-text-grey">{{ item.createTime }}</view>
                     </view>
                 </view>
+                <!-- 更多 -->
                 <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
             </view>
             <!-- 无数据时默认显示 -->
             <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无提现明细" mode="list"></u-empty>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无提现明细" mode="list"></u-empty>
             </view>
         </view>
     </view>
-
 </template>
 
 <script>
@@ -79,15 +78,12 @@
                     page: this.page,
                     limit: this.limit
                 }
-
                 if (this.states[this.index]) {
                     data.id = this.states[this.index];
                 } else {
                     data.id = 0;
                 }
-
                 this.status = 'loading'
-
                 this.$u.api.cashList(data).then(res => {
                     if (res.status) {
                         if (this.page >= res.otherData.totalPages) {
@@ -115,9 +111,4 @@
 
 
 <style lang="scss" scoped>
-    .cu-form-group picker .picker { text-align: right; }
-    .cu-list.menu-avatar > .cu-item .action { width: auto; }
-    .cu-list.menu-avatar > .cu-item .content { position: absolute; left: 20rpx; width: calc(100% - 96rpx - 60rpx - 120rpx - 20rpx); line-height: 1.6em; }
-
-    .cu-list.menu-avatar > .cu-item { padding-right: 20rpx; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/details/details.vue
similarity index 64%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/balance/details.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/balance/details/details.vue
index 1edfa5a751cd677decbe95532b521f3103bd11d8..8782156fd7fd01aabc243083516644e83e051786 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/details/details.vue
@@ -2,38 +2,38 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="余额明细"></u-navbar>
-        <view class="content">
-            <view class="cu-form-group">
-                <view class="title">类型筛选</view>
-                <picker @change="changeState" :value="index" :range="objectType">
-                    <view class="picker">
-                        {{index>-1?objectType[index]:'禁止换行，超出容器部分会以 ... 方式截断'}}
-                    </view>
-                </picker>
-            </view>
-
-            <view class="cu-list menu-avatar sm-border card-menu margin-top" v-if="list.length>0">
-                <view class="cu-item" v-for="(item, index) in list" :key="index">
-                    <view class="content">
-                        <view class="text-grey">{{ item.typeName }}</view>
-                        <view class="text-gray text-sm flex">
-                            余额：{{ item.balance }}
+        <view class="u-flex u-flex-nowrap u-row-between u-padding-30 coreshop-bg-white">
+            <view class="title">类型筛选</view>
+            <picker @change="changeState" :value="index" :range="objectType">
+                <view class="picker">
+                    {{index>-1?objectType[index]:''}}
+                    <u-icon name="arrow-right-double" margin-left="20rpx" class="u-margin-left-20"></u-icon>
+                </view>
+            </picker>
+        </view>
+        <view class="u-margin-top-30  u-margin-left-30 u-margin-right-30 radius">
+            <view v-if="list.length>0">
+                <view class="coreshop-log-item u-flex u-row-between" v-for="item in list" :key="item.id">
+                    <view class="item-left coreshop-flex coreshop-align-center">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
+                            <view class="log-name coreshop-text-black">{{ item.typeName }}</view>
+                            <view class="log-notice coreshop-text-grey">余额：{{ item.balance }}</view>
                         </view>
                     </view>
-                    <view class="action">
-                        <view class="text-grey text-sm"> {{ item.createTime }}</view>
-                        <view class="text-red text-price text-xl"> {{ item.money }}</view>
+                    <view class="item-right coreshop-flex coreshop-flex-direction coreshop-align-end">
+                        <view class="log-num coreshop-text-red">{{ item.money }}</view>
+                        <view class="log-date coreshop-text-grey">{{ item.createTime }}</view>
                     </view>
                 </view>
+                <!-- 更多 -->
                 <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
             </view>
             <!-- 无数据时默认显示 -->
             <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无余额明细" mode="list"></u-empty>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无余额明细" mode="list"></u-empty>
             </view>
         </view>
     </view>
-
 </template>
 
 <script>
@@ -111,10 +111,5 @@
     }
 </script>
 
-<style lang="scss" scoped>
-    .cu-form-group picker .picker { text-align: right; }
-    .cu-list.menu-avatar > .cu-item .action { width: auto; }
-    .cu-list.menu-avatar > .cu-item .content { position: absolute; left: 20rpx; width: calc(100% - 96rpx - 60rpx - 120rpx - 20rpx); line-height: 1.6em; }
-
-    .cu-list.menu-avatar > .cu-item { padding-right: 20rpx; }
+<style lang="scss">
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.scss
new file mode 100644
index 0000000000000000000000000000000000000000..d7907b2ea5ee35d92262f45caba9a67b868c2555
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.scss
@@ -0,0 +1,3 @@
+.withdrawcash-top { padding: 40upx 26upx; background-color: #FF7159; color: #fff; }
+.withdrawcash-title { font-size: 28upx; display: block }
+.withdrawcash-num { font-size: 70upx; display: block; margin-top: 20upx; margin-left: 50upx; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.vue
similarity index 46%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.vue
index 891b8cc388026fac24663e44cd1a9381fc03471e..7a794a98ba45ec7a2a009b749bdf41d0035f952e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.vue
@@ -8,37 +8,37 @@
                 <text class='withdrawcash-num'>{{ userInfo.balance }}</text>
             </view>
 
-            <view class="cu-list menu sm-border card-menu margin-top">
+            <view class="coreshop-list menu card-menu u-margin-top-30">
 
-                <view class="cu-item arrow" v-if="platform != 'ios' && showRecharge" @click="navigateToHandle('/pages/member/balance/recharge')">
+                <view class="coreshop-list-item arrow" v-if="platform != 'ios' && showRecharge" @click="navigateToHandle('/pages/member/balance/recharge/recharge')">
                     <view class="content">
-                        <text class="cuIcon-recharge text-grey"></text>
-                        <text class="text-grey">账户充值</text>
+                        <u-icon name="gift" size="32" class="coreshop-text-grey"></u-icon>
+                        <text class="coreshop-text-grey u-margin-left-20">账户充值</text>
                     </view>
                 </view>
-                <view class="cu-item arrow" @click="navigateToHandle('/pages/member/balance/withdrawCash')">
-                    <button class="cu-btn content">
-                        <text class="cuIcon-moneybag text-yellow"></text>
-                        <text class="text-grey">余额提现</text>
-                    </button>
+                <view class="coreshop-list-item arrow">
+                    <view class="content" @click="navigateToHandle('/pages/member/balance/withdrawCash/withdrawCash')">
+                        <u-icon name="rmb" size="32" class="coreshop-text-yellow"></u-icon>
+                        <text class="coreshop-text-grey u-margin-left-20">余额提现</text>
+                    </view>
                 </view>
-                <view class="cu-item arrow" @click="navigateToHandle('/pages/member/balance/details')">
-                    <button class="cu-btn content">
-                        <text class="cuIcon-refund text-olive"></text>
-                        <text class="text-grey">余额明细</text>
-                    </button>
+                <view class="coreshop-list-item arrow">
+                    <view class="content" @click="navigateToHandle('/pages/member/balance/details/details')">
+                        <u-icon name="rmb-circle" size="32" class="coreshop-text-olive"></u-icon>
+                        <text class="coreshop-text-grey u-margin-left-20">余额明细</text>
+                    </view>
                 </view>
-                <view class="cu-item arrow">
-                    <navigator class="content" @click="navigateToHandle('/pages/member/balance/cashlist')">
-                        <text class="cuIcon-list text-orange"></text>
-                        <text class="text-grey">提现记录</text>
-                    </navigator>
+                <view class="coreshop-list-item arrow">
+                    <view class="content" @click="navigateToHandle('/pages/member/balance/cashlist/cashlist')">
+                        <u-icon name="list-dot" size="32" class="coreshop-text-orange"></u-icon>
+                        <text class="coreshop-text-grey u-margin-left-20">提现记录</text>
+                    </view>
                 </view>
-                <view class="cu-item arrow">
-                    <navigator class="content" @click="navigateToHandle('/pages/member/balance/bankcard')">
-                        <text class="cuIcon-card text-blue"></text>
-                        <text class="text-grey">我的银行卡</text>
-                    </navigator>
+                <view class="coreshop-list-item arrow">
+                    <view class="content" @click="navigateToHandle('/pages/member/balance/bankcard/bankcard')">
+                        <u-icon name="coupon" size="32" class="coreshop-text-blue"></u-icon>
+                        <text class="coreshop-text-grey u-margin-left-20">我的银行卡</text>
+                    </view>
                 </view>
             </view>
 
@@ -90,7 +90,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .withdrawcash-top { padding: 40upx 26upx; background-color: #FF7159; color: #fff; }
-    .withdrawcash-title { font-size: 28upx; display: block }
-    .withdrawcash-num { font-size: 70upx; display: block; margin-top: 20upx; margin-left: 50upx; }
+    @import "index.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge.vue
deleted file mode 100644
index 47df99de133a57a35ead11803d02b7fa78e9ce05..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar title="在线充值"></u-navbar>
-        <view class="content">
-            <view class="content-top">
-                <view class="cu-form-group margin-top">
-                    <view class="title">当前金额</view>
-                    <view class="text-red text-price text-xxl">{{ user.balance || '0'}}</view>
-                </view>
-                <view class="cu-form-group">
-                    <view class="title">储值金额</view>
-                    <input placeholder='请输入要储值的金额' v-model="money" focus type="digit"></input>
-                </view>
-            </view>
-
-            <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom" @click="navigateToHandle">
-                <view class="flex padding-sm flex-direction">
-                    <button class="cu-btn bg-red">去支付</button>
-                </view>
-            </view>
-
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                user: {}, // 用户信息
-                payments: [], // 可用储值方式列表
-                money: '', // 储值的金额
-                orderType: 2	// 储值类型
-            }
-        },
-        onLoad() {
-            this.userInfo()
-        },
-        methods: {
-            // 获取用户信息
-            userInfo() {
-                this.$u.api.userInfo().then(res => {
-                    if (res.status) {
-                        this.user = res.data
-                    }
-                })
-            },
-            // 去储值
-            navigateToHandle() {
-                if (!Number(this.money)) {
-                    this.$u.toast('请输入要储值的金额')
-                } else {
-                    this.$u.route('/pages/payment/pay/pay?recharge=' + Number(this.money) + '&type=' + this.orderType)
-                }
-            }
-        }
-    }
-</script>
-
-<style lang="scss" scoped>
-    .coreshop-bottomBox .coreshop-btn { width: 100%; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b505485fe1e6024a5ab27fbfc686e6e040a9ca48
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue
@@ -0,0 +1,87 @@
+<template>
+    <view>
+        <u-toast ref="uToast" /><u-no-network></u-no-network>
+        <u-navbar title="在线充值"></u-navbar>
+        <view class="coreshop-bg-white u-margin-20 u-padding-20">
+            <u-form :model="form" ref="uForm" :rules="rules" :errorType="errorType">
+                <u-form-item label="当前金额" label-width="150">
+                    <view class="coreshop-text-red coreshop-text-price u-text-lg">{{ user.balance || '0'}}</view>
+                </u-form-item>
+                <u-form-item label="储值金额" label-width="150" prop="money">
+                    <u-input type="number" v-model="form.money" placeholder='请输入要储值的金额' />
+                </u-form-item>
+            </u-form>
+            <!--按钮-->
+            <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="navigateToHandle">去支付</u-button>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                customStyle: {
+                    width: '100%',
+                },
+                user: {}, // 用户信息
+                errorType: ['message'],
+                form: {
+                    money: ''// 储值的金额
+                },
+                rules: {
+                    money: [
+                        {
+                            required: true,
+                            message: '请输入储值金额',
+                            trigger: 'blur,change'
+                        }, {
+                            type: 'number',
+                            message: '请输入整数金额',
+                            trigger: 'blur,change'
+                        }
+                    ]
+                },
+                orderType: 2	// 储值类型
+            }
+        },
+        onReady() {
+            this.$refs.uForm.setRules(this.rules);
+        },
+        onLoad() {
+            this.userInfo()
+        },
+        methods: {
+            // 获取用户信息
+            userInfo() {
+                this.$u.api.userInfo().then(res => {
+                    if (res.status) {
+                        this.user = res.data
+                    }
+                })
+            },
+            // 去储值
+            navigateToHandle() {
+                this.$refs.uForm.validate(valid => {
+                    if (valid) {
+                        console.log('验证通过');
+                        if (!Number(this.form.money)) {
+                            this.$u.toast('请输入要储值的金额')
+                        } else {
+                            this.$u.route('/pages/payment/pay/pay?recharge=' + Number(this.form.money) + '&type=' + this.orderType)
+                        }
+                    } else {
+                        console.log('验证失败');
+                    }
+                });
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+</style>
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
new file mode 100644
index 0000000000000000000000000000000000000000..ebbafd29824f06967de42a3c050b4bd01a46f518
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.scss
@@ -0,0 +1,11 @@
+.coreshop-cell-hd-title { color: #333; }
+.coreshop-cell-item { border: none; }
+.coreshop-cell-item-bd { color: #666; font-size: 26upx; }
+.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 */
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue
similarity index 71%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue
index 1b7199f1514f87e2265484d0350be954bf311da6..0a2640d7200b1b82acc9d66b61ca55c0571c0113 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue
@@ -3,51 +3,51 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="余额提现"></u-navbar>
         <view class="content">
-            <view class="content-top">
+            <view class="coreshop-content-top">
                 <!-- 我的银行卡信息 -->
-                <view class="cu-list menu sm-border margin-top" v-if="userbankCard" @click="toBankCardList">
-                    <view class="cu-item arrow">
+                <view class="coreshop-list menu sm-border margin-top" v-if="userbankCard" @click="toBankCardList">
+                    <view class="coreshop-list-item arrow">
                         <view class="content">
                             <image :src="cardInfo.bankLogo" class="png" mode="aspectFit" style="width:6em;height:2em;"></image>
-                            <text class="text-grey">{{ cardInfo.cardNumber || ''}}</text>
+                            <text class="coreshop-text-grey">{{ cardInfo.cardNumber || ''}}</text>
                         </view>
                     </view>
                 </view>
 
-                <view class="cu-list menu sm-border margin-top" v-else @click="toBankCardList">
-                    <view class="cu-item arrow">
+                <view class="coreshop-list menu sm-border margin-top" v-else @click="toBankCardList">
+                    <view class="coreshop-list-item arrow">
                         <view class="content">
                             <image src="/static/images/common/yl.png" class="png" mode="aspectFit" style="width:6em;height:2em;"></image>
-                            <text class="text-grey">{{ cardInfo.cardNumber || ''}}</text>
+                            <text class="coreshop-text-grey">{{ cardInfo.cardNumber || ''}}</text>
                         </view>
                     </view>
                 </view>
 
                 <!-- 提现金额手续费 提现金额input -->
-                <view class='cell-group margin-cell-group'>
-                    <view class='cell-item'>
-                        <view class='cell-item-bd' v-if="tocashExplain">
-                            <view class='cell-hd-title text-grey'>{{ tocashExplain || ''}}</view>
+                <view class='coreshop-cell-group u-margin-top-20 u-margin-bottom-20'>
+                    <view class='coreshop-cell-item'>
+                        <view class='coreshop-cell-item-bd' v-if="tocashExplain">
+                            <view class='coreshop-cell-hd-title coreshop-text-grey'>{{ tocashExplain || ''}}</view>
                         </view>
                     </view>
-                    <view class='cell-item'>
-                        <view class='cell-item-bd withdrawcash-input'>
+                    <view class='coreshop-cell-item'>
+                        <view class='coreshop-cell-item-bd withdrawcash-input'>
                             <text>￥</text><input type="number" focus v-model="money" />
                         </view>
                     </view>
-                    <view class='cell-item'>
-                        <view class='cell-item-bd'>
-                            <view class='cell-hd-title text-grey' v-show="!isError">可用余额 {{ user.balance}} 元</view>
-                            <view class='cell-hd-title text-red' v-show="isError">提现金额超过可用余额</view>
+                    <view class='coreshop-cell-item'>
+                        <view class='coreshop-cell-item-bd'>
+                            <view class='coreshop-cell-hd-title coreshop-text-grey' v-show="!isError">可用余额 {{ user.balance}} 元</view>
+                            <view class='coreshop-cell-hd-title coreshop-text-red' v-show="isError">提现金额超过可用余额</view>
                         </view>
                     </view>
                 </view>
             </view>
 
-            <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
-                <view class="flex padding-sm flex-direction">
-                    <button class="cu-btn bg-red" v-if="isSubmit" @click="toCash" :disabled='submitStatus' :loading='submitStatus'>确认提现</button>
-                    <button class="cu-btn bg-red" v-else-if="!isSubmit" disabled>确认提现</button>
+            <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" size="medium"  type="success" v-if="isSubmit" @click="toCash" :disabled='submitStatus' :loading='submitStatus'>确认提现</u-button>
+                    <u-button :custom-style="customStyle" size="medium" v-else-if="!isSubmit" disabled>确认提现</u-button>
                 </view>
             </view>
 
@@ -59,6 +59,9 @@
     export default {
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 cardInfo: {}, // 我的银行卡信息
                 user: {}, // 用户信息
                 isError: false, // 当提现金额大于可用余额 显示错误提示
@@ -155,7 +158,7 @@
             },
             // 跳转我的银行卡列表
             toBankCardList() {
-                this.$u.route('/pages/member/balance/bankcard?mold=select')
+                this.$u.route('/pages/member/balance/bankcard/bankcard?mold=select')
             }
         },
         watch: {
@@ -179,13 +182,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .cell-hd-title { color: #333; }
-    .cell-item { border: none; }
-    .cell-item-bd { color: #666; font-size: 26upx; }
-    .withdrawcash-input { display: flex; align-items: center; font-size: 50upx; border-bottom: 2upx solid #e8e8e8; padding-bottom: 20upx; width: 95%; max-width: 95%; }
-        .withdrawcash-input text { font-size: 40upx; }
-        .withdrawcash-input input { display: inline-block; min-width: 500upx; padding-left: 20upx; }
-    /* #ifdef MP-ALIPAY */
-    .cell-hd-title input { font-size: 24px; height: 18px; }
-    /* #endif */
+    @import "withdrawCash.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/collection/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/collection/index.scss
new file mode 100644
index 0000000000000000000000000000000000000000..136bb085ab609c7dbcf3014f1bb2dd6ca25c8ba8
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/collection/index.scss
@@ -0,0 +1,2 @@
+.title { font-size: 28rpx; color: $core-content-color; }
+.desc { font-size: 24rpx; color: $core-content-color; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/collection/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/collection/index.vue
index ebd1914be5c64b7de6b785d36df436c05519b2e8..6e201874cae62cb33f49a7643290f45608e8e4fa 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/collection/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/collection/index.vue
@@ -2,25 +2,25 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="收藏商品"></u-navbar>
-        <view class="content">
-            <view v-if="list.length">
-                <u-swipe-action :show="item.show" :index="index" v-for="(item, index) in list" :key="item.id" @click="collect" @open="open" :options="options">
-                    <view class="item u-border-bottom" @click="goGoodsDetail(item.goodsId)">
-                        <image mode="aspectFill" :src="item.goods.image" />
-                        <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
-                        <view class="title-wrap">
-                            <text class="title u-line-2">{{ item.goods.name }}</text>
-                            <text class="title u-line-1">{{ item.createTime }}</text>
 
+        <view v-if="list.length">
+            <u-swipe-action :show="item.show" :index="index" v-for="(item, index) in list" :key="item.id" @click="collect" @open="open" :options="options">
+                <view class="u-padding-20 u-padding-bottom-0 u-border-bottom coreshop-display-flex" @click="goGoodsDetail(item.goodsId)">
+                    <u-avatar :src="item.goods.image" mode="square" size="120" class="u-margin-10"></u-avatar>
+                    <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
+                    <view class="title-wrap">
+                        <text class="u-text-left title u-line-2">{{ item.goods.name }}</text>
+                        <view class="u-margin-top-10">
+                            <u-icon name="clock" class="u-margin-right-6"></u-icon><text class="u-text-left desc u-line-1">{{ item.createTime }}</text>
                         </view>
                     </view>
-                </u-swipe-action>
-                <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
-            </view>
-            <!-- 无数据时默认显示 -->
-            <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/collect.png'" icon-size="300" text="暂无收藏" mode="list"></u-empty>
-            </view>
+                </view>
+            </u-swipe-action>
+            <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
+        </view>
+        <!-- 无数据时默认显示 -->
+        <view class="coreshop-emptybox" v-else>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/collect.png'" icon-size="300" text="暂无收藏" mode="list"></u-empty>
         </view>
     </view>
 
@@ -124,7 +124,5 @@
 
 
 <style lang="scss" scoped>
-    .item { display: flex; padding: 20rpx; }
-    image { width: 120rpx; flex: 0 0 120rpx; height: 120rpx; margin-right: 20rpx; border-radius: 12rpx; }
-    .title { text-align: left; font-size: 28rpx; color: $u-content-color; margin-top: 10rpx; }
+    @import "index.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.scss
new file mode 100644
index 0000000000000000000000000000000000000000..1367b2d40a801132f7928203b804014967868fd5
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.scss
@@ -0,0 +1,10 @@
+page { background: #fff; }
+.coreshop-coupon {
+    .coreshop-coupon-card-view { position: relative; position: relative; margin: 27.27rpx 27.27rpx 0;
+        .card-num-view { position: relative; background: #FFECED; border-radius: 0 0 14.54rpx 14.54rpx; border-top: 2rpx dashed #dedbdb; padding: 10.9rpx 27.27rpx; color: #999898;
+            .btnUnfold { position: absolute; right: 27.27rpx; top: 14.54rpx; }
+        }
+        .card-num-view::before { content: ''; position: absolute; width: 36.36rpx; height: 36.36rpx; background: #ffffff; border-radius: 50%; top: -18.18rpx; left: -18.18rpx; }
+        .card-num-view::after { content: ''; position: absolute; width: 36.36rpx; height: 36.36rpx; background: #ffffff; border-radius: 50%; top: -18.18rpx; right: -18.18rpx; }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue
index 938a6094ee5a7f56187e3706e5dcf333cac86289..2536e66f675f35e46d65ff0b6b1275db79b8b42a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue
@@ -6,31 +6,31 @@
             <view class="u-padding-15">
                 <u-subsection :list="items" :current="current" :animation="true" @change="onClickItem" active-color="#ff9900"></u-subsection>
             </view>
-            <view class="" v-if="listData.length > 0">
+            <view class="coreshop-coupon" v-if="listData.length > 0">
                 <view v-for="(item, key) in listData" :key="key">
-                    <view class="coreshop-sponsored-card-view" :class="item.isExpire || item.isUsed ?' grayscale':''">
+                    <view class="coreshop-coupon-card-view" :class="item.isExpire || item.isUsed ?' grayscale':''">
                         <view class="card-price-view">
-                            <view class="text-red price-left-view">
-                                <text class="text-xs">{{item.couponCode}}</text>
+                            <view class="coreshop-text-red price-left-view">
+                                <text class="u-font-xs">{{item.couponCode}}</text>
                             </view>
                             <view class="name-content-view">
-                                <view class="text-cut text-red">{{item.couponName}}</view>
-                                <view class="text-xs">
+                                <view class="u-line-1 coreshop-text-red">{{item.couponName}}</view>
+                                <view class="u-font-xs">
                                     <text v-for="(itemResult, index) in item.results" :key="index">{{itemResult}}</text>
                                 </view>
-                                <view class="text-xs">有效期：{{item.stime}} - {{item.etime}}</view>
+                                <view class="u-font-xs">有效期：{{item.stime}} - {{item.etime}}</view>
                             </view>
                             <view class="btn-right-view">
-                                <button class="cu-btn bg-red round sm" @click="goIndex" v-if="current == 0">去使用</button>
-                                <button class="cu-btn bg-grey round sm" v-if="item.isUsed==true">已使用</button>
-                                <button class="cu-btn bg-grey round sm" v-if="item.isExpire==true && item.isUsed==fasle">已失效</button>
+                                <u-button type="success" shape="circle" size="mini" @click="goIndex" v-if="current == 0">去使用</u-button>
+                                <u-button type="default" shape="circle" size="mini" v-if="item.isUsed==true">已使用</u-button>
+                                <u-button type="default" shape="circle" size="mini" v-if="item.isExpire==true && item.isUsed==fasle">已失效</u-button>
                             </view>
                         </view>
                         <view class="card-num-view">
-                            <view class="text-xs">
+                            <view class="u-font-xs">
                                 <text v-for="(itemCondition, index) in item.conditions" :key="index">【{{itemCondition}}】</text>
                             </view>
-                            <text class="cuIcon-unfold btnUnfold" />
+                            <u-icon name="arrow-down-fill" class="btnUnfold" size="28"></u-icon>
                         </view>
                     </view>
                 </view>
@@ -38,7 +38,7 @@
             </view>
             <!-- 无数据时默认显示 -->
             <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/coupon.png'" icon-size="300" text="暂无此类优惠券" mode="list"></u-empty>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/coupon.png'" icon-size="300" text="暂无此类优惠券" mode="list"></u-empty>
             </view>
         </view>
     </view>
@@ -134,5 +134,5 @@
     }
 </script>
 <style lang="scss">
-    @import '../../../static/style/coupon.scss';
+    @import 'index.scss';
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/agreement/agreement.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/agreement/agreement.scss
new file mode 100644
index 0000000000000000000000000000000000000000..f46800a5b44640d0fcc89b10068f4c1a5c400fd1
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/agreement/agreement.scss
@@ -0,0 +1,5 @@
+.page-body { background: #FFFFFF; border-top-left-radius: 38rpx; border-top-right-radius: 38rpx; margin: 25rpx; padding: 25rpx;
+    .u-content { margin-top: 20rpx; color: $u-content-color; font-size: 28rpx; line-height: 1.8;
+        p { color: $u-tips-color; }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/agreement.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/agreement/agreement.vue
similarity index 67%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/agreement.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/agreement/agreement.vue
index c392852cdbdabcd8e0acd341f5ce656f1e8aa59d..861cb8d98f90020cae0070f7e98b7d2f61d43038 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/agreement.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/agreement/agreement.vue
@@ -25,7 +25,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    .page-body { background: #FFFFFF; border-top-left-radius: 38rpx; border-top-right-radius: 38rpx; margin: 25rpx; padding: 25rpx; }
-    .u-content { margin-top: 20rpx; color: $u-content-color; font-size: 28rpx; line-height: 1.8; }
-        .u-content p { color: $u-tips-color; }
+    @import "agreement.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/apply.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/apply.vue
deleted file mode 100644
index 0fcdb91292182ff2a06d7fa8e93bb0dee29fe355..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/apply.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar title="提交申请"></u-navbar>
-        <view class="contentBody">
-            <view class="apply-content">
-                <view class="apply-form">
-                    <view class="cu-form-group">
-                        <view class="title">姓名</view>
-                        <input type="text" placeholder='请填您的姓名' v-model="name" />
-                    </view>
-                    <view class="cu-form-group">
-                        <view class="title">微信</view>
-                        <input type="text" placeholder='请填您的微信' v-model="weixin" />
-                    </view>
-                    <view class="cu-form-group">
-                        <view class="title">QQ</view>
-                        <input type="number" placeholder='请填您的QQ' v-model="qq" />
-                    </view>
-                    <view class="cu-form-group">
-                        <view class="title">手机</view>
-                        <input type="number" placeholder='请填写您的手机号码' v-model="mobile" />
-                    </view>
-
-                    <view class="apply-tip">
-                        <label class="radio u-padding-left-20  u-padding-right-20" @click="agreeAgreement"><radio value="1" :checked="checked" color="#FF7159" /> &nbsp;</label> 我已经阅读并接受 <text class="agreement u-padding-left-20  u-padding-right-20" @click="goAgreement()">"分销协议"</text>
-                    </view>
-                </view>
-                <view class="apply-bottom">
-                    <button class="coreshop-btn coreshop-btn-square coreshop-btn-o coreshop-btn-all" hover-class="btn-hover" @click="goApplyState()">申请成为分销</button>
-                </view>
-            </view>
-        </view>
-    </view>
-</template>
-<script>
-    export default {
-        data() {
-            return {
-                name: '',
-                weixin: '',
-                qq: '',
-                mobile: '',
-                checked: false,
-                isAgreement: 'off'
-            }
-        },
-        methods: {
-            // 是否同意协议
-            agreeAgreement() {
-                if (this.checked) {
-                    this.checked = false;
-                    this.isAgreement = 'off';
-                } else {
-                    this.checked = true;
-                    this.isAgreement = 'on';
-                }
-            },
-            // 信息验证
-            checkData(data) {
-                if (!data.name) {
-                    this.$u.toast('请输入您的姓名')
-                    return false
-                } else if (!data.weixin) {
-                    this.$u.toast('请输入您的微信')
-                    return false
-                } else if (!data.qq) {
-                    this.$u.toast('请输入您的QQ')
-                    return false
-                } else if (!data.mobile) {
-                    this.$u.toast('请输入您的手机号')
-                    return false
-                } else if (data.mobile.length !== 11) {
-                    this.$u.toast('手机号格式不正确')
-                    return false
-                } else if (data.agreement != 'on') {
-                    //console.log(data)
-                    this.$u.toast('请勾选分销协议')
-                    return false
-                } else {
-                    return true
-                }
-            },
-            // 提交审核
-            goApplyState() {
-                let data = {
-                    name: this.name,
-                    weixin: this.weixin,
-                    qq: this.qq,
-                    mobile: this.mobile,
-                    agreement: this.isAgreement,
-                }
-                if (this.checkData(data)) {
-                    this.$u.api.applyDistribution(data).then(res => {
-                        if (res.status) {
-                            this.$refs.uToast.show({ title: res.msg, type: 'success', url: '/pages/member/distribution/applyState' })
-                        } else {
-                            this.$u.toast(res.msg);
-                        }
-                    });
-                }
-            },
-            goAgreement() {
-                uni.navigateTo({
-                    url: '/pages/member/distribution/agreement'
-                })
-            }
-        }
-    }
-</script>
-<style lang="scss" scoped>
-    .contentBody { background-color: #FF7159; height: calc(100vh - 100px); padding-top: 50rpx; }
-    .cu-form-group .title { min-width: calc(4em + 15px); }
-    .apply-content { margin: 40rpx auto; padding: 26rpx 0; border-radius: 30rpx; box-shadow: 0 0 10px #aaa; width: 670rpx; min-height: 400rpx; background-color: #fff; }
-    .apply-tip { padding: 26rpx; }
-    .apply-bottom { width: 100%; text-align: center; }
-        .apply-bottom .coreshop-btn { border-radius: 50rpx; width: 90%; margin: 40rpx auto 0; }
-    .agreement { text-decoration: underline; color: #FF7159; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/apply/apply.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/apply/apply.scss
new file mode 100644
index 0000000000000000000000000000000000000000..371f2556c8000c6808803d56c153d12e0faac5d0
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/apply/apply.scss
@@ -0,0 +1,4 @@
+.contentBody { background-color: #FF7159; height: calc(100vh - 100px); padding-top: 50rpx;
+    .apply-content { margin: 40rpx auto; padding: 26rpx 0; border-radius: 30rpx; box-shadow: 0 0 10px #aaa; width: 670rpx; min-height: 400rpx; background-color: #fff; }
+    .agreement { text-decoration: underline; color: #FF7159; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/apply/apply.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/apply/apply.vue
new file mode 100644
index 0000000000000000000000000000000000000000..584a16a806c6a827567ce88d3075c99a38e6e6bb
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/apply/apply.vue
@@ -0,0 +1,147 @@
+<template>
+    <view>
+        <u-toast ref="uToast" /><u-no-network></u-no-network>
+        <u-navbar title="提交申请"></u-navbar>
+        <view class="contentBody">
+            <view class="apply-content">
+                <view class="u-padding-30">
+                    <u-form :model="form" :rules="rules" ref="uForm" :errorType="errorType">
+                        <u-form-item label="姓名" prop="name">
+                            <u-input type="text" placeholder="请输入姓名" v-model="form.name" />
+                        </u-form-item>
+                        <u-form-item label="微信" prop="weixin">
+                            <u-input type="text" placeholder="请输入微信" v-model="form.weixin" />
+                        </u-form-item>
+                        <u-form-item label="QQ" prop="qq">
+                            <u-input type="text" placeholder="请输入QQ" v-model="form.qq" />
+                        </u-form-item>
+                        <u-form-item label="手机" prop="mobile">
+                            <u-input type="number" placeholder="请输入手机" v-model="form.mobile" />
+                        </u-form-item>
+                    </u-form>
+
+                    <view class="u-padding-30 flex u-flex-nowrap">
+                        <u-checkbox-group>
+                            <u-checkbox v-model="form.checked">我已经阅读并接受</u-checkbox>
+                            <text class="coreshop-text-orange u-padding-left-20  u-padding-right-20 u-padding-top-8 u-font-30 coreshop-vertical-align-sub" @click="goAgreement()">"分销协议"</text>
+                        </u-checkbox-group>
+                    </view>
+                </view>
+                <view class="u-padding-30">
+                    <u-button :custom-style="customStyle" type="error" size="medium" @click="submit()">申请成为分销</u-button>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                customStyle: {
+                    width: '100%',
+                },
+                form: {
+                    name: '',
+                    weixin: '',
+                    qq: '',
+                    mobile: '',
+                    checked: false,
+                    isAgreement: 'off'
+                },
+                errorType: ['message'],
+                rules: {
+                    name: [
+                        {
+                            required: true,
+                            message: '请输入姓名',
+                            trigger: ['blur', 'change']
+                        },
+                        {
+                            min: 2,
+                            max: 4,
+                            message: '长度在2-4个字符之间'
+                        }
+                    ],
+                    weixin: [
+                        {
+                            required: true,
+                            message: '请输入微信',
+                            trigger: ['blur', 'change']
+                        }
+                    ],
+                    qq: [
+                        {
+                            required: true,
+                            message: '请输入QQ',
+                            trigger: ['blur', 'change']
+                        },
+                        {
+                            type: "number",
+                            message: 'QQ必须为数字',
+                            trigger: ['change', 'blur']
+                        },
+                    ],
+                    mobile: [
+                        {
+                            required: true,
+                            message: '请输入手机号码',
+                            trigger: ['blur', 'change']
+                        },
+                        {
+                            validator: (rule, value, callback) => {
+                                return this.$u.test.mobile(value);
+                            },
+                            message: '手机号码不正确',
+                            trigger: ['change', 'blur'],
+                        }
+                    ]
+                }
+            }
+        },
+        onReady() {
+            this.$refs.uForm.setRules(this.rules);
+        },
+        methods: {
+            submit() {
+                this.$refs.uForm.validate(valid => {
+                    if (valid) {
+                        console.log('验证通过');
+                        if (this.form.checked == false) {
+                            this.$u.toast('请勾选分销协议')
+                            return false;
+                        }
+                        this.form.isAgreement = "on";
+
+                        // 提交审核
+                        let data = {
+                            name: this.form.name,
+                            weixin: this.form.weixin,
+                            qq: this.form.qq,
+                            mobile: this.form.mobile,
+                            agreement: this.form.isAgreement,
+                        }
+                        this.$u.api.applyDistribution(data).then(res => {
+                            if (res.status) {
+                                this.$refs.uToast.show({ title: res.msg, type: 'success', url: '/pages/member/distribution/applyState/applyState' })
+                            } else {
+                                this.$u.toast(res.msg);
+                            }
+                        });
+
+                    } else {
+                        console.log('验证失败');
+                    }
+                });
+            },
+            goAgreement() {
+                uni.navigateTo({
+                    url: '/pages/member/distribution/agreement/agreement'
+                })
+            }
+        }
+    }
+</script>
+<style lang="scss" scoped>
+    @import "apply.scss";
+</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/applyState/applyState.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/applyState/applyState.scss
new file mode 100644
index 0000000000000000000000000000000000000000..07147f92aaee265ced12d58f36afa2878f8679a4
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/applyState/applyState.scss
@@ -0,0 +1,4 @@
+page { background: #FFFFFF; }
+.coreshop-status-image-view { position: relative; text-align: center; margin-top: 90.9rpx; margin-bottom: 18.18rpx; background: #FFFFFF;
+    image { width: 472.72rpx; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/applyState.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/applyState/applyState.vue
similarity index 56%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/applyState.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/applyState/applyState.vue
index d47c68415f50ec2a75c7795d301588ece4500706..6053ec5be51277552fa1a345297dea30f5ee8615 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/applyState.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/applyState/applyState.vue
@@ -4,29 +4,29 @@
         <u-navbar title="申请状态"></u-navbar>
 
         <!--状态图标-->
-        <view class="zaiui-status-image-view">
-            <image :src="$apiFilesUrl+'/static/images/common/non_real_name.png'" mode="widthFix" v-if="info.verifyStatus==3" />
-            <image :src="$apiFilesUrl+'/static/images/common/real_name.png'" mode="widthFix" v-if="info.verifyStatus==2 || info.verifyStatus==1" />
+        <view class="coreshop-status-image-view">
+            <image :src="$globalConstVars.apiFilesUrl+'/static/images/common/non_real_name.png'" mode="widthFix" v-if="info.verifyStatus==3" />
+            <image :src="$globalConstVars.apiFilesUrl+'/static/images/common/real_name.png'" mode="widthFix" v-if="info.verifyStatus==2 || info.verifyStatus==1" />
         </view>
 
 
-        <view class="text-black text-lg text-center margin-bottom-sm" v-if="status">
-            <text class="margin-right">{{info.name}}</text>
+        <view class="coreshop-text-black u-font-lg u-text-center u-margin-bottom-20" v-if="status">
+            <text class="u-margin-right-20">{{info.name}}</text>
             <text>{{info.mobile}}</text>
         </view>
 
         <!--状态信息-->
-        <view class="text-black text-xl text-center margin-bottom-sm" v-if="info.verifyStatus==2">
+        <view class="coreshop-text-black u-font-xl u-text-center u-margin-bottom-20" v-if="info.verifyStatus==2">
             恭喜，您的申请已提交！
         </view>
-        <view class="text-black text-xl text-center margin-bottom-sm" v-if="info.verifyStatus==3">
+        <view class="coreshop-text-black u-font-xl u-text-center u-margin-bottom-20" v-if="info.verifyStatus==3">
             抱歉，您的申请被驳回！
         </view>
-        <view class="text-black text-xl text-center margin-bottom-sm" v-if="info.verifyStatus==1">
+        <view class="coreshop-text-black u-font-xl u-text-center u-margin-bottom-20" v-if="info.verifyStatus==1">
             恭喜，您的申请已通过！
         </view>
 
-        <view class="text-gray text-center zaiui-content-view" v-if="info.verifyStatus==2">
+        <view class="coreshop-text-gray u-text-center u-padding-70" v-if="info.verifyStatus==2">
             您于{{info.createTime}}提交的申请已经提交成功，当前状态：<text v-if="info.verifyStatus==2">等待审核</text><text v-if="info.verifyStatus==3">审核驳回</text><text v-if="info.verifyStatus==1">审核通过</text>
         </view>
 
@@ -45,10 +45,10 @@
             _this.$u.api.getDistributionInfo({ check_condition: true }).then(res => {
                 if (res.status) {
                     if (res.data.needApply && res.data.conditionStatus == false) {
-                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/distribution/index' });
+                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/distribution/index/index' });
                     }
                     if (res.data.verifyStatus == 1) {//审核通过
-                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/distribution/index' });
+                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/distribution/index/index' });
                     }
                     _this.info = res.data;
                 } else {
@@ -61,10 +61,7 @@
         }
     }
 </script>
-<style>
-    page { background: #FFFFFF; }
-
-    .zaiui-status-image-view { position: relative; text-align: center; margin-top: 90.9rpx; margin-bottom: 18.18rpx; background: #FFFFFF; }
-        .zaiui-status-image-view image { width: 472.72rpx; }
-    .zaiui-content-view { position: relative; padding: 0 72.72rpx; }
+<style lang="scss">
+    @import "applyState.scss";
 </style>
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.scss
new file mode 100644
index 0000000000000000000000000000000000000000..92f21e3801e9cc535eb0f4846d921b099600be57
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.scss
@@ -0,0 +1,27 @@
+.wallet-wrap { background-color: #fff; padding: 30rpx; }
+.wallet-card { width: 690rpx; height: 301rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; border-radius: 20rpx; padding: 30rpx; position: relative; box-shadow: 1rpx 5rpx 16rpx 0px rgba(229,77,66, 0.81);
+    .head-box { margin-bottom: 20rpx;
+        .head-title { font-size: 24rpx; font-weight: 400; color: #ffffff; }
+        .look-btn { color: #fff; font-size: 30rpx; background: none; padding: 0; margin-left: 20rpx; }
+    }
+    .card-num { font-size: 40rpx; font-weight: 500; color: #fefefe; margin-bottom: 30rpx; }
+    .card-bottom {
+        .card-item {
+            .item-title { font-size: 24rpx; font-weight: 400; color: #ffffff; margin-bottom: 10rpx; }
+            .item-value { font-size: 30rpx; font-weight: 500; color: #fefefe; }
+        }
+    }
+    .draw-btn { position: absolute; top: 35rpx; right: 35rpx; width: 121rpx; height: 58rpx; background: #ffffff; border-radius: 29rpx; padding: 0; font-size: 24rpx; font-weight: 500; color: #e54d42; }
+}
+    .wallet-card .head-box .look-btn .cuIcon-attentionfill,
+    .wallet-card .head-box .look-btn .cuIcon-attentionforbidfill { line-height: 30rpx; }
+.head_box { height: 120rpx; padding: 0 30rpx; background-color: #f6f6f6;
+    .date-btn { font-size: 24rpx; color: #666666; }
+    .total-box { font-size: 24rpx; font-weight: 500; color: #666666; }
+}
+.state-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; background-color: #fff; border-bottom: 1rpx solid rgba(153, 153, 153, 0.5);
+    .state-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
+    .title-active { color: #333; }
+    .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
+    .underline-active { background: #e54d42; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.vue
similarity index 66%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.vue
index 82708f61cbd923ac62a3d03efd37fe39a932fcd0..94815f2aae79441ec7f3c9b352f9f81df31ea9a2 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.vue
@@ -1,28 +1,25 @@
 <!-- 佣金明细 -->
 <template>
-    <view class="commission-log-wrap">
+    <view>
+        <u-navbar title="佣金明细"></u-navbar>
         <view class="topheader">
-            <cu-custom isBack bg-color="bg-white">
-                <block slot="backText">佣金明细</block>
-            </cu-custom>
             <!-- 筛选 -->
             <view class="wallet-wrap">
-                <view class="wallet-card bg-red">
-                    <view class="head-box x-f">
+                <view class="wallet-card coreshop-bg-red">
+                    <view class="head-box coreshop-flex coreshop-align-center">
                         <view class="head-title">总收益（元）</view>
-                        <button class="cu-btn look-btn" @tap="onEye">
-                            <text v-if="showMoney" class="cuIcon-attentionfill"></text>
-                            <text v-else class="cuIcon-attentionforbidfill"></text>
-                        </button>
+                         <view class="look-btn" @click="onEye">
+                                <u-icon class="eye" v-if="showMoney" name="eye-fill"></u-icon>
+                                <u-icon class="eye" v-else name="eye-off"></u-icon>
+                         </view>
                     </view>
                     <view class="card-num">{{ showMoney ? info.totalSettlementAmount || '0.00' : '***' }}</view>
-                    <view class="card-bottom x-bc">
-                        <view class="card-item y-start">
+                    <view class="card-bottom u-flex u-row-between">
+                        <view class="card-item coreshop-flex coreshop-flex-direction coreshop-align-start">
                             <view class="item-title">待入账佣金</view>
                             <view class="item-value">{{ showMoney ? info.freezeAmount || '0.00' : '***' }}</view>
                         </view>
-
-                        <view class="card-item y-start">
+                        <view class="card-item coreshop-flex coreshop-flex-direction coreshop-align-start">
                             <view class="item-title">可提现佣金</view>
                             <view class="item-value">{{ showMoney ? userInfo.balance || '0.00' : '***' }}</view>
                         </view>
@@ -32,15 +29,12 @@
                 </view>
             </view>
 
-            <view class="head_box x-bc">
-                <button class="cu-btn date-btn" @tap="onFilterDate">
-                    {{ selDateText }}
-                    <text class="cuIcon-triangledownfill"></text>
-                </button>
+            <view class="head_box u-flex u-row-between">
+                <u-button @click="onFilterDate" shape="square" size="mini" class="date-btn">{{ selDateText }}<u-icon name="arrow-down" class="u-margin-left-20"></u-icon></u-button>
                 <view class="total-box">收入￥{{ totalMoney || '0.00' }}</view>
             </view>
             <!-- 状态分类 -->
-            <!--<view class="x-f nav-box">
+            <!--<view class="coreshop-flex coreshop-align-center nav-box">
                 <view class="state-item flex-sub " v-for="(state, index) in statusList" :key="state.value" @tap="onTab(state.value)">
                     <text class="state-title" :class="{ 'title-active': stateCurrent === state.value }">{{ state.name }}</text>
                     <text class="underline" :class="{ 'underline-active': stateCurrent === state.value }"></text>
@@ -50,32 +44,28 @@
         </view>
 
         <scroll-view :style="'height:'+viewHeight+'px'" scroll-y="true" class="scroll-Y" @scrolltolower="bottomOut()">
-
-            <view class="item-box">
                 <!-- 佣金明细列表 -->
                 <view v-if="list.length>0">
-                    <view class="log-item x-bc" v-for="item in list" :key="item.id">
-                        <view class="item-left x-f">
+                    <view class="coreshop-log-item u-flex u-row-between" v-for="item in list" :key="item.id">
+                        <view class="item-left coreshop-flex coreshop-align-center">
                             <!--<image class="log-img" :src="item.buyer.avatar" mode=""></image>-->
-                            <view class="y-start">
-                                <view class="log-name  text-black">{{ item.typeName }}</view>
-                                <view class="log-notice  text-grey">订单号：{{ item.sourceId }}</view>
+                            <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
+                                <view class="log-name  coreshop-text-black">{{ item.typeName }}</view>
+                                <view class="log-notice  coreshop-text-grey">订单号：{{ item.sourceId }}</view>
                             </view>
                         </view>
-                        <view class="item-right y-end">
-                            <view class="log-num  text-red">+{{ item.money }}</view>
-                            <view class="log-date  text-grey">{{ $u.timeFormat(item.createTime, 'yyyy.mm.dd') }}</view>
+                        <view class="item-right coreshop-flex coreshop-flex-direction coreshop-align-end">
+                            <view class="log-num  coreshop-text-red">+{{ item.money }}</view>
+                            <view class="log-date  coreshop-text-grey">{{ $u.timeFormat(item.createTime, 'yyyy.mm.dd') }}</view>
                         </view>
                     </view>
                     <!-- 更多 -->
                     <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
                 </view>
-
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="当前日期暂无佣金明细" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="当前日期暂无佣金明细" mode="list"></u-empty>
                 </view>
-            </view>
         </scroll-view>
 
         <!-- 日期选择 -->
@@ -97,7 +87,7 @@
         mixins: [commonUse],
         data() {
             return {
-                showMoney: true, //是否显示金额
+                showMoney: false, //是否显示金额
                 info: {}, //分销商信息
                 userInfo: {}, // 用户信息
                 //日期选择
@@ -228,7 +218,7 @@
             },
             //去提现
             goWithdraw() {
-                this.$u.route('/pages/member/balance/withdrawCash')
+                this.$u.route('/pages/member/balance/withdrawCash/withdrawCash')
             },
             initData() {
                 // 获取用户信息
@@ -270,28 +260,5 @@
 </script>
 
 <style lang="scss">
-    .wallet-wrap { background-color: #fff; padding: 30rpx; }
-    .wallet-card { width: 690rpx; height: 301rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; border-radius: 20rpx; padding: 30rpx; position: relative; box-shadow: 1rpx 5rpx 16rpx 0px rgba(229,77,66, 0.81); }
-        .wallet-card .head-box { margin-bottom: 20rpx; }
-            .wallet-card .head-box .head-title { font-size: 24rpx; font-weight: 400; color: #ffffff; }
-            .wallet-card .head-box .look-btn { color: #fff; font-size: 30rpx; background: none; padding: 0; margin-left: 20rpx; }
-                .wallet-card .head-box .look-btn .cuIcon-attentionfill,
-                .wallet-card .head-box .look-btn .cuIcon-attentionforbidfill { line-height: 30rpx; }
-                .wallet-card .head-box .look-btn .cuIcon-attentionfill { line-height: 30rpx; }
-        .wallet-card .card-num { font-size: 40rpx; font-weight: 500; color: #fefefe; margin-bottom: 30rpx; }
-        .wallet-card .card-bottom .card-item .item-title { font-size: 24rpx; font-weight: 400; color: #ffffff; margin-bottom: 10rpx; }
-        .wallet-card .card-bottom .card-item .item-value { font-size: 30rpx; font-weight: 500; color: #fefefe; }
-        .wallet-card .draw-btn { position: absolute; top: 35rpx; right: 35rpx; width: 121rpx; height: 58rpx; background: #ffffff; border-radius: 29rpx; padding: 0; font-size: 24rpx; font-weight: 500; color: #e54d42; }
-
-    .head_box { height: 120rpx; padding: 0 30rpx; background-color: #f6f6f6; }
-        .head_box .date-btn { background-color: #fff; height: 54rpx; border-radius: 27rpx; padding: 0; padding-left: 20rpx; font-size: 24rpx; font-weight: 500; color: #666666; }
-            .head_box .date-btn .cuIcon-triangledownfill { font-size: 60rpx; color: #e5e5e5; }
-        .head_box .total-box { font-size: 24rpx; font-weight: 500; color: #666666; }
-
-
-    .state-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; background-color: #fff; border-bottom: 1rpx solid rgba(153, 153, 153, 0.5); }
-        .state-item .state-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
-        .state-item .title-active { color: #333; }
-        .state-item .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
-        .state-item .underline-active { background: #e54d42; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+    @import "commissionDetails.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.scss
new file mode 100644
index 0000000000000000000000000000000000000000..5f282702bb03ef11d7184d19c80927b47f919764
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.scss
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.vue
similarity index 38%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.vue
index 1829422f53ce55a54b936db16db806b90eaf16e7..5beac7367f7a2902346caebf01e58895075b6c02 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.vue
@@ -1,35 +1,33 @@
 <template>
     <view>
+        <u-navbar title="分销申请"></u-navbar>
         <view v-if="show">
-            <u-toast ref="uToast" /><u-no-network></u-no-network>
-            <u-navbar title="分销申请"></u-navbar>
-
-            <view class="content">
-                <view class="bg-red solid-top coreshop-head-box">
-                    <view class="text-center margin-bottom-sm">
-                        <text class="text-white" v-if="condition.conditionStatus">已达标</text>
-                        <text class="text-white" v-if="!condition.conditionStatus">未达标</text>
-                        <text class="text-white text-xxl">{{condition.conditionProgress}}%</text>
-                    </view>
-                    <progress class="coreshop-progress-radius" percent="100" active stroke-width="10" activeColor="#fbbd08" />
-                    <view class="text-center margin-bottom-sm margin-top-sm">
-                        <text class="text-white">{{condition.conditionMsg}}</text>
-                    </view>
-                    <view class="text-left margin-bottom-sm  u-margin-top-40">
-                        <text class="text-white text-xs">注：消费金额只算实付金额部分，储值抵扣/退款退货金额不算在内。</text>
-                    </view>
+            <u-toast ref="uToast" />
+            <u-no-network></u-no-network>
+            <view class="coreshop-bg-red coreshop-solid-top u-padding-left-80 u-padding-right-80 u-padding-top-45 u-padding-bottom-45">
+                <view class="u-text-center u-margin-bottom-20">
+                    <text class="coreshop-text-white" v-if="condition.conditionStatus">已达标</text>
+                    <text class="coreshop-text-white" v-if="!condition.conditionStatus">未达标</text>
+                    <text class="coreshop-text-white u-font-40">{{condition.conditionProgress}}%</text>
                 </view>
-                <!--标题-->
-                <view class="text-black text-df coreshop-title-view solid-bottom">分销商须知</view>
-                <!--内容-->
-                <view class="text-gray coreshop-content-view u-margin-top-10">
-                    <u-parse :html="distributionNotes"></u-parse>
+                <progress class="coreshop-progress-radius" percent="100" active stroke-width="10" activeColor="#fbbd08" />
+                <view class="u-text-center u-margin-bottom-20 u-margin-top-20">
+                    <text class="coreshop-text-white">{{condition.conditionMsg}}</text>
                 </view>
-                <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
-                    <view class="flex padding-sm flex-direction">
-                        <button class="cu-btn bg-red" v-if="condition.conditionStatus" @click="goApply()">申请</button>
-                        <button class="cu-btn bg-grey" v-else>您的条件暂不满足</button>
-                    </view>
+                <view class="u-text-left u-margin-bottom-20  u-margin-top-40">
+                    <text class="coreshop-text-white u-font-xs">注：消费金额只算实付金额部分，储值抵扣/退款退货金额不算在内。</text>
+                </view>
+            </view>
+            <!--标题-->
+            <view class="coreshop-text-black u-font-md  u-padding-20 coreshop-solid-bottom">分销商须知</view>
+            <!--内容-->
+            <view class="coreshop-text-gray u-margin-20">
+                <u-parse :html="distributionNotes"></u-parse>
+            </view>
+            <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" size="medium" type="error" v-if="condition.conditionStatus" @click="goApply()">申请</u-button>
+                    <u-button :custom-style="customStyle" size="medium" type="primary" v-else>您的条件暂不满足</u-button>
                 </view>
             </view>
         </view>
@@ -40,13 +38,16 @@
     export default {
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 show: false,
                 condition: {}
             }
         },
         methods: {
             goApply() {
-                this.$u.route('/pages/member/distribution/apply');
+                this.$u.route('/pages/member/distribution/apply/apply');
             }
         },
         computed: {
@@ -61,9 +62,9 @@
                     _this.condition = res.data;
                     if (_this.condition.hasOwnProperty('verifyStatus')) {
                         if (_this.condition.verifyStatus == 1 || (!_this.condition.needApply && _this.conditionStatus)) {
-                            _this.$u.route({ type: 'redirectTo', url: '/pages/member/distribution/panel' });
+                            _this.$u.route({ type: 'redirectTo', url: '/pages/member/distribution/panel/panel' });
                         } else if (_this.condition.verifyStatus > 1) {
-                            _this.$u.route({ type: 'redirectTo', url: '/pages/member/distribution/applyState' });
+                            _this.$u.route({ type: 'redirectTo', url: '/pages/member/distribution/applyState/applyState' });
                         } else {
                             _this.show = true;
                         }
@@ -77,10 +78,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    page { background: #FFFFFF; }
-
-    .coreshop-title-view { position: relative; padding: 18.18rpx; }
-    .coreshop-content-view { position: relative; padding: 0 18.18rpx; }
-    .coreshop-head-box { position: relative; padding: 45.45rpx 90.9rpx 10.45rpx 90.9rpx; }
-    .content { background-color: #fff; height: calc(100vh - 100px); }
+    @import "index.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.scss
new file mode 100644
index 0000000000000000000000000000000000000000..10c03d7aff366fa77e904b6f96c4776d52ead1da
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.scss
@@ -0,0 +1,17 @@
+.mst-top { width: 100%;
+    image { width: 100%; max-height: 450rpx; }
+}
+.coreshop-grid { padding: 20rpx 26rpx; width: 100%; display: flex; border-top: 2rpx solid #ddd; background-color: #fff; margin-bottom: 20rpx;
+    .coreshop-item { flex: 1; text-align: center; position: relative; border-right: 2rpx solid #eee; height: 90rpx;
+        &:last-child { border: none; }
+        &:active { transform: scale(.90); transition: all .5s; opacity: .8; }
+        .coreshop-item-icon { width: 50rpx; height: 50rpx; display: block; margin: 0 auto; }
+        .coreshop-item-text { font-size: 28rpx; color: #666; display: block; margin-top: 6rpx; }
+        .coreshop-item-img { width: 150rpx; height: 150rpx; top: -70rpx; position: absolute; left: 42%; transform: translateX(-50%); border-radius: 10rpx; background-color: #fff; border-radius: 6rpx; box-shadow: 0 0 10rpx #ccc; }
+    }
+}
+
+.collect-pop { width: 100%; height: 100%;
+    image { width: 100%; }
+}
+.h5-tip { text-align: center; margin-top: 300rpx; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
similarity index 51%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
index 982a101e35977eabad8d0e0951806ec3b7b88ccd..07dc3621eccc35ba48695edb7b79aea3aa102762 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
@@ -2,114 +2,98 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar :title="storeName"></u-navbar>
-        <view class="content my-store">
-            <view class="" ref="myStore">
-                <view class="my-store-t">
-                    <view class="mst-top">
-                        <image :src="storeBanner" mode="widthFix"></image>
+        <view ref="myStore" class="myStore">
+            <view class="mst-top">
+                <u-swiper :list="storeBanner"></u-swiper>
+            </view>
+            <view class="mst-bot">
+                <view class='coreshop-grid'>
+                    <view class='coreshop-item'>
+                        <image class='coreshop-item-img' :src='storeLogo'></image>
                     </view>
-                    <view class="mst-bot">
-                        <view class='coreshop-grid'>
-                            <view class='coreshop-item'>
-                                <image class='coreshop-item-img' :src='storeLogo'></image>
-                            </view>
-                            <view class='coreshop-item'>
-                                <view class="color-o fsz36">{{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 -->
-                            <view class='coreshop-item'>
-                                <!-- #ifdef MP-WEIXIN -->
-                                <!--<button class='share coreshop-btn' open-type="share">-->
-                                <button class='share coreshop-btn' @click="createPoster()">
-                                    <u-icon name="grid" size="36" label="二维码" label-pos="bottom" margin-top="15"></u-icon>
-                                </button>
-                                <!-- #endif -->
-                                <!-- #ifndef MP-WEIXIN -->
-                                <button class='share coreshop-btn' @click="createPoster()">
-                                    <u-icon name="grid" size="36" label="二维码" label-pos="bottom" margin-top="15"></u-icon>
-                                </button>
-                                <!-- #endif -->
-                            </view>
-                        </view>
+                    <view class='coreshop-item'>
+                        <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 class="my-store-m">
-                    <view class="u-padding-15 u-margin-bottom-15 bg-white u-border-bottom" @tap="goSearch()">
-                        <u-search placeholder="请输入关键字搜索" :show-action="true" action-text="搜索" :animation="false"></u-search>
+            </view>
+
+            <view class="u-padding-15 u-margin-bottom-15 coreshop-bg-white u-border-bottom" @tap="goSearch()">
+                <u-search placeholder="请输入关键字搜索" :show-action="true" action-text="搜索" :animation="false"></u-search>
+            </view>
+            <!-- 收藏弹出窗 -->
+            <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>
-                <!-- 收藏弹出窗 -->
-                <lvv-popup position="bottom" ref="lvvpopref" @click="closePopup()">
-                    <view class="collect-pop" @click="closePopup()">
-                        <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>
+            </u-popup>
+        </view>
+        <!-- 商品列表 -->
+        <view>
+            <view class="coreshop-goods-group" v-if="goodsData.length>0">
+                <u-grid col="2" :border="false" :align="center">
+                    <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in goodsData" :key="index" @click="goGoodsDetail(item.id)">
+                        <view class="good_box">
+                            <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
+                            <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
+                            <view class="good_title u-line-2">
+                                {{item.name}}
+                            </view>
+                            <view class="good-price">
+                                {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
+                            </view>
+                            <view class="good-tag-recommend" v-if="item.isRecommend">
+                                推荐
+                            </view>
+                            <view class="good-tag-hot" v-if="item.isHot">
+                                热门
+                            </view>
                         </view>
-                        <!-- #endif -->
-                    </view>
-                </lvv-popup>
+                    </u-grid-item>
+                </u-grid>
             </view>
-            <!-- 商品列表 -->
-            <view>
-                <view class="goodsBox" v-if="goodsData.length>0">
-                    <u-grid col="2" :border="false" :align="center">
-                        <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in goodsData" :key="index" @click="goGoodsDetail(item.id)">
-                            <view class="good_box">
-                                <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
-                                <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
-                                <view class="good_title u-line-2">
-                                    {{item.name}}
-                                </view>
-                                <view class="good-price">
-                                    {{item.price}}元 <span class="u-font-xs color-9 linethrough u-margin-left-15 text-gray">{{item.mktprice}}元</span>
-                                </view>
-                                <view class="good-tag-recommend" v-if="item.isRecommend">
-                                    推荐
-                                </view>
-                                <view class="good-tag-hot" v-if="item.isHot">
-                                    热门
-                                </view>
-                            </view>
-                        </u-grid-item>
-                    </u-grid>
-                </view>
-                <!-- 无数据时默认显示 -->
-                <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="暂无商品列表" mode="list"></u-empty>
-                </view>
+            <!-- 无数据时默认显示 -->
+            <view class="coreshop-emptybox" v-else>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="暂无商品列表" mode="list"></u-empty>
             </view>
-            <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
         </view>
+        <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
     </view>
-
 </template>
 <script>
-    import lvvPopup from '@/components/corecms-lvv-popup/corecms-lvv-popup.vue';
     import { goods, articles, commonUse } from '@/common/mixins/mixinsHelper.js'
 
-    import {
-        apiBaseUrl
-    } from '@/common/setting/constVarsHelper.js'
     export default {
         mixins: [goods, articles, commonUse],
-        components: {
-            lvvPopup,
-        },
         data() {
             return {
                 goodsData: [],
@@ -138,12 +122,13 @@
                 storeLogo: '',
                 store_banner: '',
                 storeDesc: '', //店铺介绍
-                storeBanner: '',
+                storeBanner: [],
                 isWeixinBrowser: this.$common.isWeiXinBrowser(), //判断是否是微信浏览器
                 totalGoods: 0,
                 page: 1, //默认页码
                 searchKey: '请输入关键字搜索',
-                shareUrl: '/pages/share/jump/jump'
+                shareUrl: '/pages/share/jump/jump',
+                lvvpopref: false
             }
         },
         onShow: function () {
@@ -179,11 +164,11 @@
         methods: {
             // 显示modal弹出框
             openPopup() {
-                this.$refs.lvvpopref.show();
+                this.lvvpopref = true;
             },
             // 关闭modal弹出框
             closePopup() {
-                this.$refs.lvvpopref.close();
+                this.lvvpopref = false;
             },
             //去搜索
             goSearch() {
@@ -252,7 +237,13 @@
                         _this.storeName = res.data.storeName ? res.data.storeName : "我的店铺";
                         _this.storeDesc = res.data.storeDesc;
                         _this.storeLogo = res.data.storeLogo ? res.data.storeLogo : '/static/images/common/empty.png';
-                        _this.storeBanner = res.data.storeBanner ? res.data.storeBanner : '/static/images/common/empty-banner.png';
+
+                        if (res.data.storeBanner) {
+                            _this.storeBanner = res.data.storeBanner.split(',');
+                        } else {
+                            _this.storeBanner.push('/static/images/common/empty-banner.png');
+                        }
+
                         _this.totalGoods = res.data.totalGoods;
                         uni.setNavigationBarTitle({
                             title: _this.storeName
@@ -277,7 +268,7 @@
                 let pageUrl = 'pages/share/jump/jump';
                 // #ifdef H5
                 data.client = 1;
-                data.url = apiBaseUrl + 'wap/' + pageUrl;
+                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
                 // #endif
                 // #ifdef MP-WEIXIN
                 data.client = 2;
@@ -289,7 +280,7 @@
                 // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 data.client = 5;
-                data.url = apiBaseUrl + 'wap/' + pageUrl;
+                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
                 // #endif
                 // #ifdef MP-TOUTIAO
                 data.client = 6;
@@ -358,36 +349,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    view { box-sizing: border-box; }
-    .mst-top { width: 100%; }
-        .mst-top image { width: 100%; max-height: 450rpx; }
-    .coreshop-grid { padding: 20rpx 26rpx; width: 100%; display: flex; border-top: 2rpx solid #ddd; background-color: #fff; margin-bottom: 20rpx; }
-    .coreshop-item { flex: 1; text-align: center; position: relative; border-right: 2rpx solid #eee; height: 90rpx; }
-        .coreshop-item:last-child { border-right: none; }
-        .coreshop-item:active { transform: scale(.90); transition: all .5s; opacity: .8; }
-    .coreshop-item-icon { width: 50rpx; height: 50rpx; display: block; margin: 0 auto; }
-    .coreshop-item-text { font-size: 28rpx; color: #666; display: block; margin-top: 15rpx; }
-    .coreshop-item-img { width: 150rpx; height: 150rpx; top: -70rpx; position: absolute; left: 42%; transform: translateX(-50%); border-radius: 10rpx; background-color: #fff; border-radius: 6rpx; box-shadow: 0 0 10rpx #ccc; }
-
-    .collect-pop { width: 100%; height: 100%; position: absolute; left: 0; bottom: 0; }
-        .collect-pop image { width: 100%; }
-    .h5-tip { text-align: center; margin-top: 300rpx; }
-
-    .coreshop-item .share { background: none !important; line-height: normal; }
-
-
-    .goodsBox { border-radius: 16rpx; /*padding: 0rpx 10rpx; background: #FFFFFF !important;*/ color: #333333 !important; margin: 0 10rpx; }
-    .u-cell { padding: 15rpx 25rpx; }
-    .u-close { position: absolute; top: 30rpx; right: 30rpx; }
-    .good_box { border-radius: 8px; margin: 3px; background-color: #ffffff; padding: 5px; position: relative; width: calc(100% - 6px); }
-    .good_image { width: 100%; border-radius: 4px; }
-    .good_title { font-size: 26rpx; margin-top: 5px; color: $u-main-color; }
-    .good_title-xl { font-size: 28rpx; margin-top: 5px; color: $u-main-color; }
-    .good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 15rpx; left: 15rpx; background-color: $u-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 4rpx 14rpx; border-radius: 50rpx; font-size: 20rpx; line-height: 1; }
-    .good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 15rpx; right: 15rpx; background-color: $u-type-primary; color: #FFFFFF; margin-left: 10px; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
-    .good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 15rpx; left: 15rpx; background-color: $u-type-primary; color: #FFFFFF; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
-    .good-price { font-size: 30rpx; color: $u-type-error; margin-top: 5px; }
-    .good-des { font-size: 20rpx; color: $u-tips-color; margin-top: 5px; }
-
-    .grid-text { font-size: 28rpx; margin-top: 4rpx; color: $u-type-info; }
+    @import "myStore.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.scss
new file mode 100644
index 0000000000000000000000000000000000000000..239844b3c2a038d1b2956bc65589934b89f23891
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.scss
@@ -0,0 +1,58 @@
+.direct-box { margin: 20rpx;
+    .direct-item { width: 341rpx; height: 117rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx;
+        .item-title { font-size: 22rpx; font-weight: 500; color: #999999; margin-bottom: 6rpx; }
+        .item-value { font-size: 38rpx; font-weight: 600; color: #333333; }
+    }
+}
+.team-data-box { padding: 20rpx;
+    .data-card { width: 340rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx;
+        .item-title { font-size: 22rpx; font-weight: 500; color: #999999; line-height: 30rpx; margin-bottom: 10rpx; }
+        .total-item { margin-bottom: 20rpx; }
+        .total-num { font-size: 38rpx; font-weight: 600; color: #333333; }
+        .category-num { font-size: 26rpx; font-weight: 600; color: #333333; }
+    }
+}
+.head_box { width: 750rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center;
+    .cu-back { color: #fff; font-size: 40rpx; }
+    .head-title { font-size: 38rpx; color: #fff; }
+}
+.nav-box { background-color: #fff; padding: 0 30rpx; }
+.state-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center;
+    .state-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
+    .title-active { color: #333; }
+    .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
+    .underline-active { background: #e54d42; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+}
+.order-list { background-color: #fff; margin-top: 20rpx;
+    .order-head { padding: 20rpx;
+        .order-code { font-size: 26rpx; font-weight: 400; color: #999999; }
+        .order-state { font-size: 26rpx; font-weight: 500; color: #05c3a1; }
+    }
+    .order-from { background-color: #f9f9f9; padding: 20rpx;
+        .from-user { font-size: 24rpx; font-weight: 400; color: #666666;
+            .user-avatar { width: 26rpx; height: 26rpx; border-radius: 50%; margin-right: 8rpx; }
+            .user-name { font-size: 24rpx; font-weight: 400; color: #999999; }
+        }
+        .order-time { font-size: 24rpx; font-weight: 400; color: #999999; }
+    }
+    .goods-card { padding: 30rpx 20rpx;
+        .goods-img-box { margin-right: 30rpx;
+            .goods-img { width: 160rpx; height: 160rpx; background-color: #ccc; }
+        }
+        .goods-info { height: 160rpx; width: 600rpx; align-items: flex-start;
+            .goods-title { font-size: 28rpx; font-weight: 500; color: #333333; }
+            .goods-sku { font-size: 24rpx; font-weight: 400; color: #666666; }
+            .goods-price { font-size: 30rpx; font-weight: 500; color: #333333;
+                .goods-state { line-height: 30rpx; padding: 0 10rpx; background: #f1eeff; border: 1rpx solid #e54d42; border-radius: 30rpx; margin-left: 20rpx; font-size: 20rpx; color: #e54d42; }
+                &::before { content: '￥'; font-size: 20rpx; }
+            }
+        }
+    }
+    .total-box { height: 80rpx; padding: 0 20rpx;
+        .num-price { font-size: 24rpx; font-weight: 400; color: #999999; }
+        .name { font-size: 24rpx; font-weight: 400; color: #999999; }
+        .commission-num { font-size: 30rpx; font-weight: 400; color: #eb2b3d;
+            &::before { content: '￥'; font-size: 22rpx; }
+        }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.vue
similarity index 62%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.vue
index fcb931ec9f6565353fc404f4e1db3bbd8241e491..452b09c9f5000a9cd2ac46d3ac12206e3cf5ea2c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.vue
@@ -1,26 +1,22 @@
 <template>
-    <view class="pageBox commission-order-wrap">
+    <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
+        <u-navbar title="分销订单"></u-navbar>
 
-        <view class="head_box bg-red">
-            <!-- 标题 -->
-            <cu-custom isBack>
-                <block slot="backText">分销订单</block>
-            </cu-custom>
-
+        <view class="head_box coreshop-bg-red">
             <!-- 团队数据总览 -->
-            <view class="team-data-box x-bc">
+            <view class="team-data-box u-flex u-row-between">
                 <view class="data-card">
                     <view class="total-item">
                         <view class="item-title">团队订单数量（单）</view>
                         <view class="total-num">{{ orderInfo.allOrder || 0 }}</view>
                     </view>
-                    <view class="category-item x-f">
-                        <view class="y-start flex-sub">
+                    <view class="category-item u-flex u-row-between">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">一级订单</view>
                             <view class="category-num">{{ orderInfo.firstOrder || 0 }}</view>
                         </view>
-                        <view class="y-start flex-sub">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">二级订单</view>
                             <view class="category-num">{{ orderInfo.secondOrder || 0 }}</view>
                         </view>
@@ -31,12 +27,12 @@
                         <view class="item-title">团队订单金额（元）</view>
                         <view class="total-num">{{ orderInfo.allOrderMoney || '0.00' }}</view>
                     </view>
-                    <view class="category-item x-f">
-                        <view class="y-start flex-sub">
+                    <view class="category-item u-flex u-row-between">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">一级订单</view>
                             <view class="category-num">{{ orderInfo.firstOrderMoney || '0.00' }}</view>
                         </view>
-                        <view class="y-start ">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
                             <view class="item-title">二级订单</view>
                             <view class="category-num">{{ orderInfo.secondOrderMoney || '0.00' }}</view>
                         </view>
@@ -45,7 +41,7 @@
             </view>
 
             <!-- 直推 -->
-            <view class="direct-box x-bc">
+            <view class="direct-box u-flex u-row-between">
                 <view class="direct-item ">
                     <view class="item-title">本月分销订单数量（单）</view>
                     <view class="item-value">{{ orderInfo.monthOrder || '0'  }}</view>
@@ -57,7 +53,7 @@
             </view>
 
             <!-- 状态分类 -->
-            <view class="x-f nav-box">
+            <view class="u-flex u-row-between nav-box">
                 <view class="state-item flex-sub " v-for="(state, index) in statusList" :key="state.value" @tap="onTab(state.value)">
                     <text class="state-title" :class="{ 'title-active': stateCurrent === state.value }">{{ state.name }}</text>
                     <text class="underline" :class="{ 'underline-active': stateCurrent === state.value }"></text>
@@ -69,26 +65,26 @@
             <view class="content_box">
                 <!-- 订单列表 -->
                 <view class="order-list" v-for="item in list" :key="item.id" v-if="list.length > 0">
-                    <view class="order-head x-bc">
+                    <view class="order-head u-flex u-row-between">
                         <text class="order-code">订单编号：{{ item.orderId }}</text>
                         <text class="order-state">{{ item.statusName }}</text>
                     </view>
-                    <view class="order-from x-bc">
-                        <view class="from-user x-f">
+                    <view class="order-from u-flex u-row-between">
+                        <view class="from-user coreshop-flex coreshop-align-center">
                             <text>下单人：</text>
                             <image class="user-avatar" :src="item.buyer.avatar" mode=""></image>
                             <text class="user-name">{{ item.buyUserNickName }}</text>
                         </view>
                         <view class="order-time">{{ $u.timeFormat(item.createTime, ' yyyy.mm.dd hh:MM ') }}</view>
                     </view>
-                    <view class="total-box x-bc px20">
-                        <view class="num-price">佣金:￥{{ item.amount || '0'}}</view>
-                        <view class="x-f">{{item.isSettlement==1?'已结算':item.isSettlement==2?'未结算':'已退款'}}</view>
+                    <view class="total-box u-flex u-row-between px20">
+                        <view class="num-price">佣金：￥{{ item.amount || '0'}}</view>
+                        <view class="coreshop-flex coreshop-align-center">{{item.isSettlement==1?'已结算':item.isSettlement==2?'未结算':'已退款'}}</view>
                     </view>
                 </view>
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="当前日明细" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="当前日明细" mode="list"></u-empty>
                 </view>
                 <!-- 更多 -->
                 <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" v-if="list.length" />
@@ -243,51 +239,5 @@
 </script>
 
 <style lang="scss">
-    .direct-box { margin: 20rpx; }
-        .direct-box .direct-item { width: 341rpx; height: 117rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx; }
-            .direct-box .direct-item .item-title { font-size: 22rpx; font-weight: 500; color: #999999; margin-bottom: 6rpx; }
-            .direct-box .direct-item .item-value { font-size: 38rpx; font-weight: 600; color: #333333; }
-
-    .team-data-box { margin: 20rpx; }
-        .team-data-box .data-card { width: 340rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx; }
-            .team-data-box .data-card .item-title { font-size: 22rpx; font-weight: 500; color: #999999; line-height: 30rpx; margin-bottom: 10rpx; }
-            .team-data-box .data-card .total-item { margin-bottom: 20rpx; }
-            .team-data-box .data-card .total-num { font-size: 38rpx; font-weight: 600; color: #333333; }
-            .team-data-box .data-card .category-num { font-size: 26rpx; font-weight: 600; color: #333333; }
-
-    .head_box { width: 750rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; }
-        .head_box .cu-back { color: #fff; font-size: 40rpx; }
-        .head_box .head-title { font-size: 38rpx; color: #fff; }
-
-    .nav-box { background-color: #fff; }
-
-    .state-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; }
-        .state-item .state-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
-        .state-item .title-active { color: #333; }
-        .state-item .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
-        .state-item .underline-active { background: #e54d42; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
-
-    .order-list { background-color: #fff; margin-top: 20rpx; }
-        .order-list .order-head { padding: 20rpx; }
-            .order-list .order-head .order-code { font-size: 26rpx; font-weight: 400; color: #999999; }
-            .order-list .order-head .order-state { font-size: 26rpx; font-weight: 500; color: #05c3a1; }
-        .order-list .order-from { background-color: #f9f9f9; padding: 20rpx; }
-            .order-list .order-from .from-user { font-size: 24rpx; font-weight: 400; color: #666666; }
-                .order-list .order-from .from-user .user-avatar { width: 26rpx; height: 26rpx; border-radius: 50%; margin-right: 8rpx; }
-                .order-list .order-from .from-user .user-name { font-size: 24rpx; font-weight: 400; color: #999999; }
-            .order-list .order-from .order-time { font-size: 24rpx; font-weight: 400; color: #999999; }
-        .order-list .goods-card { padding: 30rpx 20rpx; }
-            .order-list .goods-card .goods-img-box { margin-right: 30rpx; }
-                .order-list .goods-card .goods-img-box .goods-img { width: 160rpx; height: 160rpx; background-color: #ccc; }
-            .order-list .goods-card .goods-info { height: 160rpx; width: 600rpx; align-items: flex-start; }
-                .order-list .goods-card .goods-info .goods-title { font-size: 28rpx; font-weight: 500; color: #333333; }
-                .order-list .goods-card .goods-info .goods-sku { font-size: 24rpx; font-weight: 400; color: #666666; }
-                .order-list .goods-card .goods-info .goods-price { font-size: 30rpx; font-weight: 500; color: #333333; }
-                    .order-list .goods-card .goods-info .goods-price .goods-state { line-height: 30rpx; padding: 0 10rpx; background: #f1eeff; border: 1rpx solid #e54d42; border-radius: 30rpx; margin-left: 20rpx; font-size: 20rpx; color: #e54d42; }
-                    .order-list .goods-card .goods-info .goods-price::before { content: '￥'; font-size: 20rpx; }
-        .order-list .total-box { height: 80rpx; padding: 0 20rpx; }
-            .order-list .total-box .num-price { font-size: 24rpx; font-weight: 400; color: #999999; }
-            .order-list .total-box .name { font-size: 24rpx; font-weight: 400; color: #999999; }
-            .order-list .total-box .commission-num { font-size: 30rpx; font-weight: 400; color: #eb2b3d; }
-                .order-list .total-box .commission-num::before { content: '￥'; font-size: 22rpx; }
+    @import "order.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.scss
new file mode 100644
index 0000000000000000000000000000000000000000..5f2503a59de34e64fea0812412146edb6b92c73b
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.scss
@@ -0,0 +1,31 @@
+.user-card { width: 690rpx; min-height: 350rpx; border-radius: 14rpx; margin: 30rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; padding-top: 10rpx; position: relative;
+    &::after { content: ""; position: absolute; z-index: -1; background-color: inherit; width: 100%; height: 100%; left: 0; bottom: -10%; border-radius: 10upx; opacity: 0.2; transform: scale(0.9, 0.9); }
+    .card-top { padding: 40rpx 40rpx 30rpx; margin-bottom: 30rpx; border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+        .user-name { font-size: 26rpx; font-weight: 500; color: #ffffff; line-height: 30rpx; margin-bottom: 20rpx; }
+        .cu-btn { padding: 0; background: none; }
+        .log-btn { width: 83rpx; height: 41rpx; border: 1rpx solid rgba(255, 255, 255, 0.33); border-radius: 21rpx; font-size: 22rpx; font-weight: 400; color: #ffffff; line-height: 41rpx; text-align: center; }
+        .look-btn { color: #fff; font-size: 40rpx;
+            .eye { line-height: 50rpx; margin-top: 20rpx; }
+        }
+    }
+    .head-img-box { margin-right: 26rpx; width: 76rpx; height: 76rpx; border-radius: 50px; position: relative; background: #fff; padding: 10rpx; background-clip: padding-box;
+        .head-img { width: 66rpx; height: 66rpx; border-radius: 50%; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); }
+    }
+    .user-info-box {
+        .tag-box { background: rgba(0, 0, 0, 0.2); border-radius: 21rpx; line-height: 38rpx; padding-right: 10rpx;
+            .tag-img { width: 36rpx; height: 36rpx; margin-right: 6rpx; border-radius: 50%; }
+            .tag-title { font-size: 20rpx; font-family: PingFang SC; font-weight: 500; color: white; line-height: 20rpx; }
+        }
+    }
+    .card-bottom { margin: 0 40rpx 40rpx;
+        .item-title { font-size: 24rpx; font-family: PingFang SC; font-weight: 400; color: #ffffff; line-height: 30rpx; }
+        .item-detail { font-size: 40rpx; font-family: DIN; font-weight: 500; color: #fefefe; line-height: 30rpx; margin-top: 30rpx; }
+    }
+}
+
+.menu-box { flex-wrap: wrap; margin: 30rpx; position: fixed; width: 750rpx; bottom: 0; z-index: 10;
+    .menu-item { width: 172.5rpx; margin-bottom: 50rpx;
+        .item-img { width: 68rpx; height: 68rpx; }
+        .item-title { font-size: 24rpx; font-weight: 600; color: #fff; line-height: 30rpx; margin-top: 16rpx; }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
similarity index 61%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
index e302b7c01dc366b7288f88404c4a333b191d7f25..455e1e573ee3cabc24536f99487ec6c2c6c714ce 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
@@ -1,63 +1,60 @@
 <template>
     <view style="width:100%;height: 100%;">
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-
-        <view class="commission-wrap">
-            <cu-custom isBack="true" bgColor="bg-white">
-                <block slot="backText">分销面板</block>
-            </cu-custom>
+        <u-navbar title="分销面板"></u-navbar>
+        <view>
             <!-- 用户资料 -->
-            <view class="user-card bg-red">
-                <view class="card-top x-bc">
-                    <view class="x-f">
+            <view class="user-card coreshop-bg-red">
+                <view class="card-top u-flex u-row-between">
+                    <view class="coreshop-flex coreshop-align-center">
                         <view class="head-img-box"><image class="head-img" :src="userInfo.avatarImage" mode=""></image></view>
-                        <view class="y-start">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
                             <view class="user-name">{{ userInfo.nickName }}</view>
-                            <view class="user-info-box x-f">
-                                <view class="x-f" v-if="info.gradeName">
+                            <view class="user-info-box coreshop-flex coreshop-align-center">
+                                <view class="coreshop-flex coreshop-align-center" v-if="info.gradeName">
                                     <text class="cu-tag bg-purple sm radius">{{ info.gradeName }}</text>
                                 </view>
                             </view>
                         </view>
                     </view>
-                    <view class="y-start">
-                        <view class="y-f">
-                            <button class="cu-btn log-btn" @tap="navigateToHandle(utilityMenus.balance.router)">明细</button>
-                            <button class="cu-btn look-btn" @tap="onEye">
-                                <text v-if="showMoney" class="cuIcon-attentionfill"></text>
-                                <text v-else class="cuIcon-attentionforbidfill"></text>
-                            </button>
+                    <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-center">
+                            <view class="log-btn" @click="navigateToHandle(utilityMenus.balance.router)">明细</view>
+                            <view class="look-btn" @click="onEye">
+                                <u-icon class="eye" v-if="showMoney" name="eye-fill"></u-icon>
+                                <u-icon class="eye" v-else name="eye-off"></u-icon>
+                            </view>
                         </view>
                     </view>
                 </view>
-                <view class="card-bottom x-f">
-                    <view class="flex-sub y-start">
+                <view class="card-bottom u-flex u-row-between">
+                    <view class="flex-sub coreshop-flex coreshop-flex-direction coreshop-align-start">
                         <view class="item-title">已结算金额</view>
                         <view class="item-detail">{{ showMoney ? info.settlementAmount || '0.00' : '***' }}</view>
                     </view>
-                    <view class="flex-sub y-start" style="align-items: center;">
+                    <view class="flex-sub coreshop-flex coreshop-flex-direction coreshop-align-start" style="align-items: center;">
                         <view class="item-title">待入账佣金</view>
                         <view class="item-detail">{{ showMoney ? info.freezeAmount || '0.00' : '***' }}</view>
                     </view>
-                    <view class="flex-sub y-start" style="align-items: flex-end;">
+                    <view class="flex-sub coreshop-flex coreshop-flex-direction coreshop-align-start" style="align-items: flex-end;">
                         <view class="item-title">本月订单数</view>
                         <view class="item-detail">{{ showMoney ? info.currentMonthOrder || '0.00' : '***' }}</view>
                     </view>
                 </view>
             </view>
 
-            <view class="cu-list menu sm-border card-menu">
-                <view class="cu-item arrow" v-for="(menu, index) in utilityMenus" :key="index" @tap="navigateToHandle(menu.router)">
+            <view class="coreshop-list menu card-menu">
+                <view class="coreshop-list-item arrow" v-for="(menu, index) in utilityMenus" :key="index" @tap="navigateToHandle(menu.router)">
                     <view class="content">
                         <image :src="menu.icon" class="png" mode="aspectFit"></image>
-                        <text class="text-grey">{{ menu.name }}</text>
+                        <text class="coreshop-text-grey">{{ menu.name }}</text>
                     </view>
                 </view>
                 <!-- 分享二维码 -->
-                <view class="cu-item arrow"  @click="createPoster()">
+                <view class="coreshop-list-item arrow"  @click="createPoster()">
                     <view class="content">
                         <image src="/static/images/distribution/distribution_icon7.png" class="png" mode="aspectFit"></image>
-                        <text class="text-grey">邀请海报</text>
+                        <text class="coreshop-text-grey">邀请海报</text>
                     </view>
                 </view>
             </view>
@@ -70,38 +67,43 @@
         mixins: [commonUse],
         data() {
             return {
-                showMoney: true, //是否显示金额
+                showMoney: false, //是否显示金额
                 siteName: this.$store.state.config.shopName,
                 utilityMenus: {
                     invite: {
                         name: '我的团队',
                         icon: '/static/images/distribution/distribution_icon1.png',
-                        router: '/pages/member/distribution/team'
+                        router: '/pages/member/distribution/team/team'
                     },
                     balance: {
                         name: '佣金明细',
                         icon: '/static/images/distribution/distribution_icon2.png',
-                        router: '/pages/member/distribution/commissionDetails'
+                        router: '/pages/member/distribution/commissionDetails/commissionDetails'
                     },
                     order: {
                         name: '分销订单',
                         icon: '/static/images/distribution/distribution_icon3.png',
-                        router: '/pages/member/distribution/order'
+                        router: '/pages/member/distribution/order/order'
                     },
                     myStore: {
                         name: '我的店铺',
                         icon: '/static/images/distribution/distribution_icon4.png',
-                        router: '/pages/member/distribution/myStore'
+                        router: '/pages/member/distribution/myStore/myStore'
                     },
                     storeSetting: {
                         name: '店铺设置',
                         icon: '/static/images/distribution/distribution_icon5.png',
-                        router: '/pages/member/distribution/storeSetting'
+                        router: '/pages/member/distribution/storeSetting/storeSetting'
                     },
                     ranking: {
                         name: '分销排行',
                         icon: '/static/images/distribution/distribution_icon6.png',
-                        router: '/pages/member/distribution/rankings'
+                        router: '/pages/member/distribution/rankings/rankings'
+                    },
+                    shareLog: {
+                        name: '分享记录',
+                        icon: '/static/images/distribution/distribution_icon8.png',
+                        router: '/pages/member/distribution/shareLog/shareLog'
                     },
                 },
                 info: {}, //分销商信息
@@ -119,10 +121,10 @@
                 if (res.status) {
                     _this.info = res.data;
                     if (res.data.verifyStatus != 1) { //审核通过
-                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/distribution/index' });
+                        _this.$u.route({ type: 'redirectTo', url: '/pages/member/distribution/index/index' });
                     }
                     if (_this.$store.state.config.distributionStore == '1') {
-                        _this.utilityMenus.myStore.router = '/pages/member/distribution/myStore?store=' + _this.info.store;
+                        _this.utilityMenus.myStore.router = '/pages/member/distribution/myStore/myStore?store=' + _this.info.store;
                     }
                 } else {
                     //报错了
@@ -153,7 +155,7 @@
             },
             //去提现
             goWithdraw() {
-                this.$u.route('/pages/member/balance/withdrawCash')
+                this.$u.route('/pages/member/balance/withdrawCash/withdrawCash')
             },
             //获取分享URL
             getShareUrl() {
@@ -183,7 +185,7 @@
                 let pageUrl = 'pages/share/jump/jump';
                 // #ifdef H5
                 data.client = 1;
-                data.url = apiBaseUrl + 'wap/' + pageUrl;
+                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
                 // #endif
                 // #ifdef MP-WEIXIN
                 data.client = 2;
@@ -195,7 +197,7 @@
                 // #endif
                 // #ifdef APP-PLUS || APP-PLUS-NVUE
                 data.client = 5;
-                data.url = apiBaseUrl + 'wap/' + pageUrl;
+                data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl;
                 // #endif
                 // #ifdef MP-TOUTIAO
                 data.client = 6;
@@ -231,29 +233,5 @@
     }
 </script>
 <style lang="scss">
-    .user-card { width: 690rpx; min-height: 350rpx; border-radius: 14rpx; margin: 30rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; padding-top: 10rpx; position: relative; }
-        .user-card::after { content: ""; position: absolute; z-index: -1; background-color: inherit; width: 100%; height: 100%; left: 0; bottom: -10%; border-radius: 10upx; opacity: 0.2; transform: scale(0.9, 0.9); }
-
-        .user-card .card-top { padding: 40rpx 40rpx 30rpx; margin-bottom: 30rpx; border-bottom: 1px solid rgba(255, 255, 255, 0.12); }
-            .user-card .card-top .user-name { font-size: 26rpx; font-weight: 500; color: #ffffff; line-height: 30rpx; margin-bottom: 20rpx; }
-            .user-card .card-top .cu-btn { padding: 0; background: none; }
-            .user-card .card-top .log-btn { width: 83rpx; height: 41rpx; border: 1rpx solid rgba(255, 255, 255, 0.33); border-radius: 21rpx; font-size: 22rpx; font-weight: 400; color: #ffffff; }
-            .user-card .card-top .look-btn { color: #fff; font-size: 40rpx; }
-                .user-card .card-top .look-btn .cuIcon-attentionfill,
-                .user-card .card-top .look-btn .cuIcon-attentionforbidfill { line-height: 50rpx; margin-top: 20rpx; }
-                .user-card .card-top .look-btn .cuIcon-attentionfill { line-height: 50rpx; margin-top: 20rpx; }
-        .user-card .head-img-box { margin-right: 26rpx; width: 76rpx; height: 76rpx; border-radius: 50px; position: relative; background: #fff; padding: 10rpx; background-clip: padding-box; }
-            .user-card .head-img-box .head-img { width: 66rpx; height: 66rpx; border-radius: 50%; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); }
-        .user-card .user-info-box .tag-box { background: rgba(0, 0, 0, 0.2); border-radius: 21rpx; line-height: 38rpx; padding-right: 10rpx; }
-            .user-card .user-info-box .tag-box .tag-img { width: 36rpx; height: 36rpx; margin-right: 6rpx; border-radius: 50%; }
-            .user-card .user-info-box .tag-box .tag-title { font-size: 20rpx; font-family: PingFang SC; font-weight: 500; color: white; line-height: 20rpx; }
-        .user-card .card-bottom { margin: 0 40rpx 40rpx; }
-            .user-card .card-bottom .item-title { font-size: 24rpx; font-family: PingFang SC; font-weight: 400; color: #ffffff; line-height: 30rpx; }
-            .user-card .card-bottom .item-detail { font-size: 40rpx; font-family: DIN; font-weight: 500; color: #fefefe; line-height: 30rpx; margin-top: 30rpx; }
-
-
-    .menu-box { flex-wrap: wrap; margin: 30rpx; position: fixed; width: 750rpx; bottom: 0; z-index: 10; }
-        .menu-box .menu-item { width: 172.5rpx; margin-bottom: 50rpx; }
-            .menu-box .menu-item .item-img { width: 68rpx; height: 68rpx; }
-            .menu-box .menu-item .item-title { font-size: 24rpx; font-weight: 600; color: #fff; line-height: 30rpx; margin-top: 16rpx; }
+    @import "panel.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/rankings/rankings.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/rankings/rankings.scss
new file mode 100644
index 0000000000000000000000000000000000000000..86c8a9a8478ee8366ce10d783ad3c53fbd4bad42
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/rankings/rankings.scss
@@ -0,0 +1,20 @@
+.rankings-wrap { background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; overflow: hidden; }
+
+.rankings-list-box { background-color: #fff; border-radius: 20rpx 20rpx 0px 0px; width: 690rpx; margin: 60rpx auto 0; margin-bottom: 60rpx;
+    .ranking-list { height: 140rpx; padding: 0 30rpx; border-bottom: 1rpx solid #e5e5e5;
+        .list-left {
+            .tag-box { width: 50rpx; font-size: 36rpx; font-weight: 500; color: #beb4b3; margin-right: 20rpx;
+                .tag-icon { width: 40rpx; height: 60rpx; }
+            }
+            .user-avatar { width: 66rpx; height: 66rpx; border-radius: 50%; margin-right: 30rpx; }
+            .user-info {
+                .name { font-size: 28rpx; font-weight: bold; color: #333333; }
+                .date { font-size: 24rpx; font-weight: 400; color: #999999; }
+            }
+        }
+        .list-right {
+            .num { font-size: 30rpx; font-weight: 500; color: #5e4ddf; }
+            .des { font-size: 24rpx; font-weight: 500; color: #a09a98; }
+        }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/rankings.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/rankings/rankings.vue
similarity index 51%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/rankings.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/rankings/rankings.vue
index ad97300da1406a5db255e35c2fb4585b34940a76..1125bceac2bc60ea934e80579898189234e47fbe 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/rankings.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/rankings/rankings.vue
@@ -1,19 +1,13 @@
 <!-- 分销排行 -->
 <template>
-    <view class="rankings-wrap bg-red">
-        <!-- 标题栏 -->
-        <view class="nav-box">
-            <cu-custom isBack>
-                <block slot="backText">分销排行</block>
-            </cu-custom>
-        </view>
-
+    <view class="rankings-wrap coreshop-bg-red">
+         <u-navbar title="排行榜"></u-navbar>
         <!-- 排行榜 -->
         <view class="rankings-list-box">
-            <scroll-view :style="'height:'+viewHeight+'px'" scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
-                <view class="ranking-list x-bc" v-for="(item, index) in rankingsList" :key="index">
-                    <view class="list-left x-f">
-                        <view class="tag-box x-c">
+            <scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
+                <view class="ranking-list u-flex u-row-between" v-for="(item, index) in rankingsList" :key="index">
+                    <view class="list-left coreshop-flex coreshop-align-center">
+                        <view class="tag-box coreshop-flex coreshop-justify-center coreshop-align-center">
                             <text class="tag-text" v-if="index >= 3">{{ index }}</text>
                             <image v-else class="tag-icon" :src="rankingsIcon[index]" mode=""></image>
                         </view>
@@ -23,7 +17,7 @@
                             <view class="date">{{ $u.timeFormat(item.createtime, 'yyyy年mm月dd日') }}</view>
                         </view>
                     </view>
-                    <view class="list-right y-end">
+                    <view class="list-right coreshop-flex coreshop-flex-direction coreshop-align-end">
                         <view class="num mb10">{{ item.totalInCome }}</view>
                         <view class="des">累计收益</view>
                     </view>
@@ -49,25 +43,10 @@
                 loadStatus: 'loadmore', //loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
                 currentPage: 1,
                 limit: 20,
-                viewHeight: 0,
                 hasNextPage: false
             };
         },
         onShow() {
-            var _this = this;
-            uni.getSystemInfo({
-                success: function (res) { // res - 各种参数
-                    console.log(res); // 屏幕的宽度
-                    var windowHeight = res.windowHeight;
-
-                    let info = uni.createSelectorQuery().select(".nav-box");
-                    info.boundingClientRect(function (data) { //data - 各种参数
-                        var headHeight = data.height;
-                        _this.viewHeight = windowHeight - headHeight;
-
-                    }).exec()
-                }
-            });
         },
         onLoad() {
             this.getRankings();
@@ -75,7 +54,6 @@
         methods: {
             getRankings() {
                 let that = this;
-
                 let data = {
                     page: this.currentPage,
                     limit: this.limit,
@@ -94,7 +72,6 @@
                     }
                 });
             },
-
             // 加载更多
             loadMore() {
                 if (this.hasNextPage) {
@@ -105,17 +82,6 @@
     };
 </script>
 
-<style lang="scss">
-    .rankings-wrap { background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; overflow: hidden; }
-    .nav-box .cu-back { color: #fff; font-size: 40rpx; }
-    .nav-box .head-title { font-size: 38rpx; color: #fff; }
-    .rankings-list-box { background-color: #fff; border-radius: 20rpx 20rpx 0px 0px; width: 690rpx; margin: 60rpx auto 0; margin-bottom: 60rpx; }
-        .rankings-list-box .ranking-list { height: 140rpx; padding: 0 30rpx; border-bottom: 1rpx solid #e5e5e5; }
-            .rankings-list-box .ranking-list .list-left .tag-box { width: 50rpx; font-size: 36rpx; font-weight: 500; color: #beb4b3; margin-right: 20rpx; }
-                .rankings-list-box .ranking-list .list-left .tag-box .tag-icon { width: 40rpx; height: 60rpx; }
-            .rankings-list-box .ranking-list .list-left .user-avatar { width: 66rpx; height: 66rpx; border-radius: 50%; margin-right: 30rpx; }
-            .rankings-list-box .ranking-list .list-left .user-info .name { font-size: 28rpx; font-weight: bold; color: #333333; }
-            .rankings-list-box .ranking-list .list-left .user-info .date { font-size: 24rpx; font-weight: 400; color: #999999; }
-            .rankings-list-box .ranking-list .list-right .num { font-size: 30rpx; font-weight: 500; color: #5e4ddf; }
-            .rankings-list-box .ranking-list .list-right .des { font-size: 24rpx; font-weight: 500; color: #a09a98; }
+<style lang="scss" scoped>
+    @import "rankings.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/shareLog/shareLog.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/shareLog/shareLog.scss
new file mode 100644
index 0000000000000000000000000000000000000000..3edbc23f4ccd412adef89ec775a2c9fe9acf3066
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/shareLog/shareLog.scss
@@ -0,0 +1,26 @@
+.tab-box { background-color: #fff; width: 100%;
+    .tab-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center;
+        .tab-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
+        .title-active { color: #333; }
+        .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
+        .underline-active { background: #5e49c3; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+    }
+}
+.log-list { background-color: #fff; padding: 30rpx; margin: 10rpx 0; align-items: flex-start;
+    .log-avatar-wrap { margin-right: 14rpx;
+        .log-avatar { width: 40rpx; height: 40rpx; border-radius: 50%; }
+    }
+    .item-right { flex: 1;
+        .name { font-size: 26rpx; font-weight: 500; color: #7f7aa5; margin-bottom: 30rpx; }
+        .content { background: rgba(241, 241, 241, 0.46); border-radius: 2rpx; padding: 10rpx; margin-bottom: 20rpx;
+            .content-img-wrap { margin-right: 16rpx; width: 80rpx; height: 80rpx;
+                .content-img { width: 80rpx; height: 80rpx; }
+            }
+            .content-text { font-size: 24rpx; font-weight: 500; color: #333333; }
+        }
+        .item-bottom { width: 100%;
+            .time { font-size: 22rpx; font-weight: 500; color: #c8c8c8; }
+            .from-text { font-size: 22rpx; font-weight: 500; color: #c8c8c8; }
+        }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/shareLog.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/shareLog/shareLog.vue
similarity index 46%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/agent/shareLog.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/shareLog/shareLog.vue
index f353819836ccdccdf5ed24b0f65fd67b4ccb9a38..57f22f3da65148043614458fe4cea6f64c358d3d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/shareLog.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/shareLog/shareLog.vue
@@ -1,49 +1,41 @@
 <!-- 分享记录 -->
 <template>
-    <view class="pageBox">
+    <view>
         <!-- 标题栏 -->
-        <view class="head_box bg-blue">
-            <view class="nav-box">
-                <cu-custom isBack>
-                    <block slot="backText">分享记录</block>
-                </cu-custom>
-            </view>
-            <!-- 分类tab -->
-            <view class="tab-box x-f">
-                <view class="tab-item flex-sub " v-for="(tab, index) in tabsList" :key="tab.value" @tap="onTab(tab.value)">
-                    <text class="tab-title" :class="{ 'title-active': tabCurrent === tab.value }">{{ tab.name }}</text>
-                    <text class="underline" :class="{ 'underline-active': tabCurrent === tab.value }"></text>
-                </view>
+        <u-navbar title="分享记录"></u-navbar>
+        <!-- 分类tab -->
+        <view class="tab-box u-flex u-row-between u-padding-left-20 u-padding-right-20">
+            <view class="tab-item flex-sub " v-for="(tab, index) in tabsList" :key="tab.value" @tap="onTab(tab.value)">
+                <text class="tab-title" :class="{ 'title-active': tabCurrent === tab.value }">{{ tab.name }}</text>
+                <text class="underline" :class="{ 'underline-active': tabCurrent === tab.value }"></text>
             </view>
         </view>
 
         <view class="content_box">
             <scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
                 <!-- 分享记录列表 -->
-                <view class="log-list x-f" v-for="item in shareLogList" :key="item.id">
+                <view class="log-list coreshop-flex coreshop-align-center" v-for="item in shareLogList" :key="item.id">
                     <view class="log-avatar-wrap"><image class="log-avatar" :src="item.user.avatar" mode=""></image></view>
 
                     <view class="item-right">
                         <view class="name">{{ item.user.nickname }}</view>
-                        <view class="content x-f" v-if="item.type_data">
+                        <view class="content coreshop-flex coreshop-align-center" v-if="item.type_data">
                             <view class="content-img-wrap"><image class="content-img" :src="item.type_data.image" mode=""></image></view>
 
                             <view class="content-text">通过{{ typeObj[item.type] }}访问了商品“{{ item.type_data.title }}”, 进入商城</view>
                         </view>
-                        <view class="item-bottom x-bc">
+                        <view class="item-bottom u-flex u-row-between">
                             <view class="time">{{ $u.timeFormat(item.createtime, 'yyyy年mm月dd日 hh:MM') }}</view>
                             <view class="from-text">来自{{ typeObj[item.type] }}分享</view>
                         </view>
                     </view>
                 </view>
-
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-if="shareLogList.length<=0">
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无分享记录" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无分享记录" mode="list"></u-empty>
                 </view>
-
                 <!-- 更多 -->
-                <u-loadmore v-if="shareLogList.length"  :status="loadStatus" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
+                <u-loadmore v-if="shareLogList.length" :status="loadStatus" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
             </scroll-view>
         </view>
         <view class="foot_box"></view>
@@ -109,20 +101,20 @@
             getShareLog() {
                 let that = this;
                 that.loadStatus = 'loading';
-                that.$api('commission.share', {
-                    type: that.tabCurrent,
-                    page: that.currentPage
-                }).then(res => {
-                    if (res.code === 1) {
-                        that.shareLogList = [...that.shareLogList, ...res.data.data];
-                        that.lastPage = res.data.last_page;
-                        if (that.currentPage < res.data.last_page) {
-                            that.loadStatus = 'loadmore';
-                        } else {
-                            that.loadStatus = 'nomore';
-                        }
-                    }
-                });
+                //that.$api('commission.share', {
+                //    type: that.tabCurrent,
+                //    page: that.currentPage
+                //}).then(res => {
+                //    if (res.code === 1) {
+                //        that.shareLogList = [...that.shareLogList, ...res.data.data];
+                //        that.lastPage = res.data.last_page;
+                //        if (that.currentPage < res.data.last_page) {
+                //            that.loadStatus = 'loadmore';
+                //        } else {
+                //            that.loadStatus = 'nomore';
+                //        }
+                //    }
+                //});
             },
 
             // 加载更多
@@ -136,28 +128,6 @@
     };
 </script>
 
-<style lang="scss">
-    .head_box { height: 280rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; position: relative; }
-        .head_box .nav-box { color: #fff; font-size: 40rpx; }
-            .head_box .nav-box .cu-back { color: #fff; font-size: 40rpx; }
-
-    .tab-box { background-color: #fff; border-radius: 20rpx 20rpx 0px 0px; position: absolute; width: 100%; bottom: 0; }
-        .tab-box .tab-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; }
-            .tab-box .tab-item .tab-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
-            .tab-box .tab-item .title-active { color: #333; }
-            .tab-box .tab-item .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
-            .tab-box .tab-item .underline-active { background: #5e49c3; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
-
-    .log-list { background-color: #fff; padding: 30rpx; margin: 10rpx 0; align-items: flex-start; }
-        .log-list .log-avatar-wrap { margin-right: 14rpx; }
-            .log-list .log-avatar-wrap .log-avatar { width: 40rpx; height: 40rpx; border-radius: 50%; }
-        .log-list .item-right { flex: 1; }
-            .log-list .item-right .name { font-size: 26rpx; font-weight: 500; color: #7f7aa5; margin-bottom: 30rpx; }
-            .log-list .item-right .content { background: rgba(241, 241, 241, 0.46); border-radius: 2rpx; padding: 10rpx; margin-bottom: 20rpx; }
-                .log-list .item-right .content .content-img-wrap { margin-right: 16rpx; width: 80rpx; height: 80rpx; }
-                    .log-list .item-right .content .content-img-wrap .content-img { width: 80rpx; height: 80rpx; }
-                .log-list .item-right .content .content-text { font-size: 24rpx; font-weight: 500; color: #333333; }
-            .log-list .item-right .item-bottom { width: 100%; }
-                .log-list .item-right .item-bottom .time { font-size: 22rpx; font-weight: 500; color: #c8c8c8; }
-                .log-list .item-right .item-bottom .from-text { font-size: 22rpx; font-weight: 500; color: #c8c8c8; }
+<style lang="scss" scoped>
+    @import "shareLog.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/storeSetting.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/storeSetting.vue
deleted file mode 100644
index 3ea32fe13cc5682c122fc83fe71702f9f67a58e1..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/storeSetting.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-    <view>
-        <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar title="店铺设置"></u-navbar>
-
-        <form>
-            <view class="cu-form-group">
-                <view class="title">名称</view>
-                <input placeholder='请输入店铺名称' v-model="storeName"></input>
-            </view>
-            <view class="cu-form-group">
-                <view class="title">图标</view>
-                <image class='cu-avatar radius bg-gray' mode="aspectFill" :src="logo" @click="uploadLogo"></image>
-            </view>
-
-            <view class="cu-bar bg-white margin-top">
-                <view class="action">
-                    店招
-                </view>
-                <view class="action">
-                    {{images.length}}/{{imageMax}}
-                </view>
-            </view>
-            <view class="cu-form-group">
-                <view class="grid col-4 grid-square flex-sub">
-                    <view class="bg-img" v-for="(item,index) in images" :key="index" @tap="clickImg(item.src)" :data-url="images[index]">
-                        <image :src="item.src" mode="aspectFill"></image>
-                        <view class="cu-tag bg-red" @tap.stop="delImage(item)" :data-index="index">
-                            <text class='cuIcon-close'></text>
-                        </view>
-                    </view>
-                    <view class="solids" @tap="upImage" v-if="images.length<imageMax">
-                        <text class='cuIcon-cameraadd'></text>
-                    </view>
-                </view>
-            </view>
-            <view class="cu-form-group align-start">
-                <view class="title">简介</view>
-                <textarea v-model="storeDesc" placeholder="请您在此描述问题(最多200字)" maxlength="200"></textarea>
-            </view>
-        </form>
-
-        <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom" @click="submitHandler()">
-            <view class="flex padding-sm flex-direction">
-                <button class="cu-btn bg-red">保存</button>
-            </view>
-        </view>
-
-    </view>
-
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                title: 'picker',
-                logo: '',
-                images: [],
-                imageMax: 1,
-                storeName: '',//店铺名称
-                storeLogo: '',
-                storeBanner: '',
-                storeDesc: '',//店铺介绍
-            }
-        },
-        computed: {
-            isImage() {
-                let num = this.imageMax - this.images.length;
-                if (num > 0) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        },
-        methods: {
-            // 用户上传头像
-            uploadLogo() {
-                this.$upload.uploadFiles(null, res => {
-                    if (res.status) {
-                        this.storeLogo = res.data.src;
-                        this.logo = res.data.src;
-                    } else {
-                        this.$u.toast(res.msg)
-                    }
-                })
-            },
-            // 保存资料
-            submitHandler() {
-                if (!this.storeName || this.storeName == '') {
-                    this.$u.toast('请填写店铺名称');
-                    return;
-                }
-                if (this.images.length <= 0) {
-                    this.$u.toast('请上传店招');
-                    return;
-                }
-                if (!this.storeLogo) {
-                    this.$u.toast('请上传图标');
-                    return;
-                }
-                this.storeBanner = this.images[0].src;
-
-                this.$u.api.setDistributionStore({
-                    storeName: this.storeName,
-                    storeLogo: this.storeLogo,
-                    storeBanner: this.storeBanner,
-                    storeDesc: this.storeDesc
-                }).then(res => {
-                    if (res.status) {
-                        this.$refs.uToast.show({ title: res.msg, type: 'success', back: false })
-                    } else {
-                        this.$u.toast(res.msg);
-                    }
-                }
-                );
-            },
-            //上传图片
-            upImage() {
-                let num = this.imageMax - this.images.length;
-                if (num > 0) {
-                    this.$upload.uploadImage(num, res => {
-                        if (res.status) {
-                            this.images.push(res.data);
-                            this.$refs.uToast.show({ title: res.msg, type: 'success' });
-                        } else {
-                            this.$u.toast(res.msg);
-                        }
-                    });
-                }
-            },
-            //删除图片
-            delImage(e) {
-                let newImages = [];
-                for (var i = 0; i < this.images.length; i++) {
-                    if (this.images[i].imageId != e.imageId) {
-                        newImages.push(this.images[i]);
-                    }
-                }
-                this.images = newImages;
-            },
-            // 图片点击放大
-            clickImg(img) {
-                // 预览图片
-                uni.previewImage({
-                    urls: img.split()
-                });
-            }
-        },
-        onLoad: function () {
-            var _this = this;
-            _this.$u.api.getDistributionInfo({ check_condition: false }).then(res => {
-                if (res.status) {
-                    _this.storeName = res.data.storeName;
-                    _this.storeDesc = res.data.storeDesc;
-                    _this.storeLogo = res.data.storeLogo;
-                    if (res.data.storeLogo) {
-                        _this.logo = res.data.storeLogo;
-                    }
-                    _this.storeBanner = res.data.storeBanner;
-                    if (_this.storeBanner) {
-                        _this.images.push({
-                            imageId: res.data.storeBanner,
-                            url: res.data.storeBanner,
-                            src: res.data.storeBanner
-                        });
-                    }
-                } else {
-                    //报错了
-                    _this.$u.toast(res.msg);
-                }
-            });
-        }
-    }
-</script>
-
-<style lang="scss">
-    .cu-form-group .title { min-width: calc(4em + 15px); }
-
-    .user-head { height: 100upx; }
-    .user-head-img { height: 90upx; width: 90upx; border-radius: 50%; }
-    .cell-hd-title { color: #333; }
-    .cell-item-bd { color: #666; font-size: 26upx; }
-    .list-goods-name { width: 100% !important; }
-    .cart-checkbox-item { position: relative; }
-    .invoice-type .uni-list-cell { display: inline-block; font-size: 26upx; color: #333; position: relative; margin-left: 50upx; }
-        .invoice-type .uni-list-cell > view { display: inline-block; }
-    .invoice-type-icon { position: absolute; top: 50%; transform: translateY(-50%); }
-    .invoice-type-c { margin-left: 50upx; line-height: 2; }
-    .cell-item-ft .cell-bd-input { text-align: right; width: 500upx; font-size: 28upx; }
-    .right-img { border-bottom: 0; }
-    .cell-textarea { padding: 0 26upx 20upx; }
-        .cell-textarea textarea { width: 100%; height: 200upx; font-size: 26upx; color: #333; }
-    .evaluate-c-b { overflow: hidden; padding: 0 20upx; }
-    .upload-img { width: 146upx; height: 146upx; margin: 14upx; text-align: center; color: #999999; font-size: 22upx; border: 2upx solid #E1E1E1; border-radius: 4upx; display: inline-block; float: left; padding: 24upx 0; }
-    .goods-img-item { width: 174upx; height: 174upx; padding: 14upx; float: left; position: relative; }
-        .goods-img-item:nth-child(4n) { margin-right: 0; }
-        .goods-img-item image { width: 100%; height: 100%; }
-    .del { width: 30upx !important; height: 30upx !important; position: absolute; right: 0; top: 0; z-index: 999; }
-    .cell-textarea textarea { background-color: #f8f8f8; padding: 12upx 20upx; box-sizing: border-box; }
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/storeSetting/storeSetting.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/storeSetting/storeSetting.vue
new file mode 100644
index 0000000000000000000000000000000000000000..154680d28d7fa91a84f4ca95cf94b89a4b352d35
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/storeSetting/storeSetting.vue
@@ -0,0 +1,160 @@
+<template>
+    <view class="coreshop-bg-white">
+        <u-toast ref="uToast" /><u-no-network></u-no-network>
+        <u-navbar title="店铺设置"></u-navbar>
+        <view class="u-padding-20 ">
+            <u-form :model="form" :rules="rules" ref="uForm" :errorType="errorType">
+                <u-form-item label="店铺名称" label-width="140" prop="storeName">
+                    <u-input type="text" placeholder='请输入店铺名称' v-model="form.storeName" />
+                </u-form-item>
+                <u-form-item label="店铺Logo" label-width="140">
+                    <image class='coreshop-avatar xl radius bg-gray' mode="aspectFill" :src="form.storeLogo" @click="uploadLogo"></image>
+                </u-form-item>
+                <u-form-item label="店铺简介" label-width="140" prop="storeDesc">
+                    <u-input v-model="form.storeDesc" type="textarea" border="true" height="100" auto-height="true" placeholder="请您在此描述问题(最多200字)" maxlength="200" />
+                </u-form-item>
+                <u-form-item label="店铺招牌" label-width="140">
+                    <u-upload :action="upLoadAction" ref="uUpload" :file-list="fileList" max-count="3" :max-size="2 * 1024 * 1024" width="120" height="120" :header="header"></u-upload>
+                </u-form-item>
+            </u-form>
+        </view>
+        <!--按钮-->
+        <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="submitHandler">保存</u-button>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+
+    export default {
+        data() {
+            return {
+                customStyle: {
+                    width: '100%',
+                },
+                upLoadAction: this.$globalConstVars.apiBaseUrl + '/Api/Common/UploadImages',
+                header: {
+                    'Accept': 'application/json',
+                    'Content-Type': 'multipart/form-data',
+                    'Authorization': 'Bearer ' + this.$db.get('userToken')
+                },
+                fileList: [],
+                errorType: ['message'],
+                form: {
+                    storeName: '',//店铺名称
+                    storeLogo: '',
+                    storeBanner: '',
+                    storeDesc: '',//店铺介绍
+                },
+                rules: {
+                    storeName: [
+                        {
+                            required: true,
+                            message: '请输入店铺名称',
+                            trigger: ['blur', 'change']
+                        }
+                    ],
+                    storeDesc: [
+                        {
+                            required: true,
+                            message: '请输入店铺简介',
+                            trigger: ['blur', 'change']
+                        }
+                    ]
+                }
+            }
+        },
+        onReady() {
+            this.$refs.uForm.setRules(this.rules);
+            this.fileList = this.$refs.uUpload.lists;
+        },
+        methods: {
+            // 用户上传头像
+            uploadLogo() {
+                this.$upload.uploadFiles(null, res => {
+                    if (res.status) {
+                        this.form.storeLogo = res.data.src;
+                    } else {
+                        this.$u.toast(res.msg)
+                    }
+                })
+            },
+            submitHandler() {
+                this.$refs.uForm.validate(valid => {
+                    if (valid) {
+                        console.log('验证通过');
+                        console.log(this.fileList);
+
+                        if (!this.form.storeName || this.form.storeName == '') {
+                            this.$u.toast('请填写店铺名称');
+                            return;
+                        }
+                        if (this.fileList.length <= 0) {
+                            this.$u.toast('请上传店铺招牌');
+                            return;
+                        } else {
+                            let images = [];
+                            for (var i = 0; i < this.fileList.length; i++) {
+                                if (this.fileList[i].url) {
+                                    images.push(this.fileList[i].url);
+                                } else if (this.fileList[i].error == false) {
+                                    images.push(this.fileList[i].response.data.fileUrl);
+                                }
+                            }
+                            this.form.storeBanner = images.join(',');
+                        }
+
+                        if (!this.form.storeLogo) {
+                            this.$u.toast('请上传店铺LOGO');
+                            return;
+                        }
+
+                        this.$u.api.setDistributionStore({
+                            storeName: this.form.storeName,
+                            storeLogo: this.form.storeLogo,
+                            storeBanner: this.form.storeBanner,
+                            storeDesc: this.form.storeDesc
+                        }).then(res => {
+                            if (res.status) {
+                                this.$refs.uToast.show({ title: res.msg, type: 'success', back: false })
+                            } else {
+                                this.$u.toast(res.msg);
+                            }
+                        });
+
+                    } else {
+                        console.log('验证失败');
+                    }
+                });
+            }
+        },
+        onLoad: function () {
+            var _this = this;
+            _this.$u.api.getDistributionInfo({ check_condition: false }).then(res => {
+                if (res.status) {
+                    _this.form.storeName = res.data.storeName;
+                    _this.form.storeDesc = res.data.storeDesc;
+                    _this.form.storeLogo = res.data.storeLogo;
+                    _this.form.storeBanner = res.data.storeBanner;
+                    if (res.data.storeBanner) {
+                        var arr = res.data.storeBanner.split(',');
+                        for (var i = 0; i < arr.length; i++) {
+                            _this.fileList.push({
+                                url: arr[i]
+                            });
+                        }
+                    }
+                } else {
+                    //报错了
+                    _this.$u.toast(res.msg);
+                }
+            });
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/team/team.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/team/team.scss
new file mode 100644
index 0000000000000000000000000000000000000000..414abdb904290bc7300a0a65d55e0bb5559852c4
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/team/team.scss
@@ -0,0 +1,28 @@
+.referrer-box { font-size: 28rpx; font-weight: 500; color: #ffffff; margin-top: 10rpx;
+    .referrer-avatarImage { width: 34rpx; height: 34rpx; border-radius: 50%; }
+}
+.refresh-btn { width: 100%; line-height: 100rpx; background: #ffffff; border-radius: 25rpx; font-size: 22rpx; font-weight: 500; color: #999999; white-space: nowrap;
+    .cuIcon-refresh { color: #dbdbdb; margin-right: 12rpx; font-size: 32rpx; }
+}
+.refresh-active { transform: rotate(360deg); transition: all linear 0.5s; }
+.head_box { background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; background-size: 100% auto; position: relative;
+    &::after { content: ""; position: absolute; z-index: -1; background-color: inherit; width: 100%; height: 100%; left: 0; bottom: -10%; border-radius: 10upx; opacity: 0.2; transform: scale(0.9, 0.9); }
+}
+.team-data-box { margin: 30rpx 20rpx;
+    .data-card { width: 340rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx;
+        .item-title { font-size: 22rpx; font-weight: 500; color: #999999; line-height: 30rpx; margin-bottom: 10rpx; }
+        .total-item { margin-bottom: 20rpx; }
+        .total-num { font-size: 38rpx; font-weight: 500; color: #333333; }
+        .category-num { font-size: 26rpx; font-weight: 500; color: #333333; }
+    }
+}
+.filter-box { width: 750rpx; height: 95rpx; background: #ffffff;
+    .filter-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center;
+        .filter-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
+        .cuIcon-unfold { font-size: 24rpx; color: #c4c4c4; margin-left: 10rpx; transition: all linear 0.3s; }
+        .icon-active { transform: rotate(180deg); transform-origin: center center; transition: all linear 0.3s; }
+        .title-active { color: #333; }
+        .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
+        .underline-active { background: #5e49c3; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/team.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/team/team.vue
similarity index 61%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/team.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/team/team.vue
index ab3250c9c9242ac3d66a13c64a6dedddbeb404e6..74ba7e9d7be16afb94d15608ad1f4347bb1ce541 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/team.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/team/team.vue
@@ -1,32 +1,30 @@
 <!-- 我的团队 -->
 <template>
-    <view class="pageBox team-wrap">
-        <view class="head_box bg-red shadow-warp">
-            <cu-custom isBack bgColor="text-white">
-                <block slot="backText">我的团队</block>
-            </cu-custom>
+    <view>
+        <u-navbar title="我的团队"></u-navbar>
+        <view class="head_box coreshop-bg-red u-padding-top-20  u-padding-bottom-20 ">
             <!-- 推荐人 -->
-            <view class="referrer-box x-f u-padding-left-30  u-padding-right-30" v-if="referrerInfo && referrerInfo.avatarImage">
+            <view class="referrer-box coreshop-flex coreshop-align-center u-padding-left-30  u-padding-right-30" v-if="referrerInfo && referrerInfo.avatarImage">
                 推荐人：
                 <image class="referrer-avatarImage" :src="referrerInfo.avatarImage" mode=""></image>
                 {{ referrerInfo.nickName }}
             </view>
-            <view class="referrer-box x-f  u-padding-left-30  u-padding-right-30" v-else>
+            <view class="referrer-box coreshop-flex coreshop-align-center  u-padding-left-30  u-padding-right-30" v-else>
                 推荐人：无
             </view>
             <!-- 团队数据总览 -->
-            <view class="team-data-box x-bc">
+            <view class="team-data-box u-flex u-row-between">
                 <view class="data-card">
                     <view class="total-item">
                         <view class="item-title">团队总人数(人)</view>
                         <view class="total-num">{{ userInfo.count || 0 }}</view>
                     </view>
-                    <view class="category-item x-f">
-                        <view class="y-start flex-sub">
+                    <view class="category-item u-flex u-row-between">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">一级成员</view>
                             <view class="category-num">{{ userInfo.first || 0 }}</view>
                         </view>
-                        <view class="y-start flex-sub">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">二级成员</view>
                             <view class="category-num">{{ userInfo.second || 0 }}</view>
                         </view>
@@ -37,44 +35,34 @@
                         <view class="item-title">本月推广人数(人)</view>
                         <view class="total-num">{{ userInfo.monthCount || 0 }}</view>
                     </view>
-                    <view class="category-item x-f">
-                        <view class="y-start flex-sub">
+                    <view class="category-item u-flex u-row-between">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start flex-sub">
                             <view class="item-title">一级成员</view>
                             <view class="category-num">{{ userInfo.monthFirst || 0 }}</view>
                         </view>
-                        <view class="y-start ">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start ">
                             <view class="item-title">二级成员</view>
                             <view class="category-num">{{ userInfo.monthSecond || 0 }}</view>
                         </view>
                     </view>
                 </view>
             </view>
-            <!-- 筛选 TODO -->
-            <view class="filter-box x-f" v-if="false">
-                <view class="filter-item flex-sub" v-for="(filter, index) in filterList" :key="index" @tap="onFilter(index)">
-                    <view class="x-f">
-                        <text class="filter-title" :class="{ 'title-active': filterCurrent == index }">{{ filter.title }}</text>
-                        <text v-show="index" class="cuIcon-unfold" :class="{ 'icon-active': filter.isUnfold }"></text>
-                    </view>
-                    <text class="underline" :class="{ 'underline-active': filterCurrent == index }"></text>
-                </view>
-            </view>
         </view>
         <scroll-view :style="'height:'+viewHeight+'px'" scroll-y="true" class="scroll-Y">
             <!-- 团队列表 -->
-            <view class="team-box">
-                <view class="team-list">
+            <view class="coreshop-team-box">
+                <view class="coreshop-team-list">
                     <view v-if="list.length">
-                        <view class="team-children x-f" v-for="children in list" :key="children.id">
+                        <view class="coreshop-team-children coreshop-flex coreshop-align-center" v-for="children in list" :key="children.id">
                             <image class="head-img" :src="children.avatarImage" mode=""></image>
                             <view class="head-info">
-                                <view class="name-box x-bc">
+                                <view class="name-box u-flex u-row-between">
                                     <view class="name-text">{{ children.nickName }}</view>
-                                    <view class="x-f">
+                                    <view class="coreshop-flex coreshop-align-center">
                                         <text class="cu-tag bg-grey sm radius">{{  children.mobile }}</text>
                                     </view>
                                 </view>
-                                <view class="x-bc">
+                                <view class="u-flex u-row-between">
                                     <view class="head-time">{{ $u.timeFormat(children.createTime, 'yyyy年mm月dd日') }}</view>
                                     <view class="child-num u-margin-left-30">下级成员：{{ children.childNum || 0 }}人</view>
                                 </view>
@@ -86,7 +74,7 @@
 
                     <!-- 无数据时默认显示 -->
                     <view class="coreshop-emptybox" v-else>
-                        <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无邀请列表" mode="list"></u-empty>
+                        <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无邀请列表" mode="list"></u-empty>
                     </view>
 
                 </view>
@@ -100,13 +88,6 @@
     export default {
         data() {
             return {
-                emptyData: {
-                    show: false,
-                    img: this.$IMG_URL + '/imgs/empty/no_team.png',
-                    tip: '暂无团队人员',
-                    path: '',
-                    pathText: ''
-                },
                 userInfo: {
                     count: 0,
                     first: 0,
@@ -165,8 +146,6 @@
                     }).exec()
                 }
             });
-
-
         },
         onReachBottom() {
             if (this.loadStatus === 'loadmore') {
@@ -228,33 +207,6 @@
     };
 </script>
 
-<style lang="scss">
-    .referrer-box { font-size: 28rpx; font-weight: 500; color: #ffffff; margin-top: 10rpx; }
-        .referrer-box .referrer-avatarImage { width: 34rpx; height: 34rpx; border-radius: 50%; }
-
-    .refresh-btn { width: 100%; line-height: 100rpx; background: #ffffff; border-radius: 25rpx; font-size: 22rpx; font-weight: 500; color: #999999; white-space: nowrap; }
-        .refresh-btn .cuIcon-refresh { color: #dbdbdb; margin-right: 12rpx; font-size: 32rpx; }
-
-    .refresh-active { transform: rotate(360deg); transition: all linear 0.5s; }
-
-    .head_box { background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; background-size: 100% auto; position: relative; }
-        .head_box::after { content: ""; position: absolute; z-index: -1; background-color: inherit; width: 100%; height: 100%; left: 0; bottom: -10%; border-radius: 10upx; opacity: 0.2; transform: scale(0.9, 0.9); }
-        .head_box .cu-back { color: #fff; font-size: 40rpx; }
-        .head_box .head-title { font-size: 38rpx; color: #fff; }
-
-    .team-data-box { margin: 30rpx 20rpx; }
-        .team-data-box .data-card { width: 340rpx; background: #ffffff; border-radius: 20rpx; padding: 20rpx; }
-            .team-data-box .data-card .item-title { font-size: 22rpx; font-weight: 500; color: #999999; line-height: 30rpx; margin-bottom: 10rpx; }
-            .team-data-box .data-card .total-item { margin-bottom: 20rpx; }
-            .team-data-box .data-card .total-num { font-size: 38rpx; font-weight: 500; color: #333333; }
-            .team-data-box .data-card .category-num { font-size: 26rpx; font-weight: 500; color: #333333; }
-
-    .filter-box { width: 750rpx; height: 95rpx; background: #ffffff; }
-        .filter-box .filter-item { height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; }
-            .filter-box .filter-item .filter-title { color: #666; font-weight: 500; font-size: 28rpx; line-height: 90rpx; }
-            .filter-box .filter-item .cuIcon-unfold { font-size: 24rpx; color: #c4c4c4; margin-left: 10rpx; transition: all linear 0.3s; }
-            .filter-box .filter-item .icon-active { transform: rotate(180deg); transform-origin: center center; transition: all linear 0.3s; }
-            .filter-box .filter-item .title-active { color: #333; }
-            .filter-box .filter-item .underline { display: block; width: 68rpx; height: 4rpx; background: #fff; border-radius: 2rpx; }
-            .filter-box .filter-item .underline-active { background: #5e49c3; display: block; width: 68rpx; height: 4rpx; border-radius: 2rpx; }
+<style lang="scss" scoped>
+    @import "team.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/history/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/history/index.scss
new file mode 100644
index 0000000000000000000000000000000000000000..fe5cfe360dad6ba0563a5e30c43defb963452298
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/history/index.scss
@@ -0,0 +1,2 @@
+.title {font-size: 28rpx; color: $core-content-color; }
+.desc { font-size: 24rpx; color: $core-content-color; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/history/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/history/index.vue
index 6ff92679ed2cac2b575694094aa9dece7120a0d7..54bd45fb721966324f35f3a355b6d3bf85a402a4 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/history/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/history/index.vue
@@ -2,17 +2,25 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="我的足迹"></u-navbar>
-        <u-swipe-action :show="item.show" :index="index" v-for="(item, index) in list" :key="item.id" @click="click" @open="open" :options="options">
-            <view class="item u-border-bottom" @click="goGoodsDetail(item.goodsId)">
-                <image mode="aspectFill" :src="item.goodImage" />
-                <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
-                <view class="title-wrap">
-                    <text class="title u-line-2">{{ item.goodsName }}</text>
-                    <text class="title u-line-1">{{ item.createTime }}</text>
+        <view v-if="list.length">
+            <u-swipe-action :show="item.show" :index="index" v-for="(item, index) in list" :key="item.id" @click="click" @open="open" :options="options">
+                <view class="u-padding-10 u-border-bottom coreshop-display-flex" @click="goGoodsDetail(item.goodsId)">
+                    <u-avatar :src="item.goodImage" mode="square" size="120" class="u-margin-10"></u-avatar>
+                    <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
+                    <view class="title-wrap">
+                        <text class="u-text-left title  u-line-2">{{ item.goodsName }}</text>
+                        <view class="u-margin-top-10">
+                            <u-icon name="clock" class="u-margin-right-6"></u-icon><text class="u-text-left desc u-line-1">{{ item.createTime }}</text>
+                        </view>
+                    </view>
                 </view>
-            </view>
-        </u-swipe-action>
-        <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
+            </u-swipe-action>
+            <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
+        </view>
+        <!-- 无数据时默认显示 -->
+        <view class="coreshop-emptybox" v-else>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/collect.png'" icon-size="300" text="暂无足迹" mode="list"></u-empty>
+        </view>
     </view>
 
 </template>
@@ -29,19 +37,18 @@
                 list: [], // 商品浏览足迹
                 loadStatus: 'more',
                 options: [
-
+                    {
+                        text: '收藏',
+                        style: {
+                            backgroundColor: '#007aff'
+                        }
+                    },
                     {
                         text: '删除',
                         style: {
                             backgroundColor: '#dd524d'
                         }
                     }
-                    //,{
-                    //    text: '收藏',
-                    //    style: {
-                    //        backgroundColor: '#007aff'
-                    //    }
-                    //}
                 ],
                 status: 'loadmore',
                 iconType: 'flower',
@@ -92,10 +99,15 @@
                     let data = {
                         id: _this.list[index].goodsId
                     }
-                    _this.$u.api.delGoodsBrowsing(data).then(res => {
+                    _this.$u.api.goodsCollection(data).then(res => {
                         if (res.status) {
-                            _this.list.splice(index, 1)
-                            _this.$refs.uToast.show({ title: res.msg, type: 'success' })
+                            _this.$refs.uToast.show({
+                                title: res.msg, type: 'success', callback: function () {
+                                    _this.$nextTick(() => {
+                                        _this.list[index].isCollection = !this.list[index].isCollection
+                                    })
+                                }
+                            })
                         } else {
                             _this.$u.toast(res.msg)
                         }
@@ -104,19 +116,15 @@
                     let data = {
                         id: _this.list[index].goodsId
                     }
-                    _this.$u.api.goodsCollection(data).then(res => {
+                    _this.$u.api.delGoodsBrowsing(data).then(res => {
                         if (res.status) {
-                            _this.$refs.uToast.show({
-                                title: res.msg, type: 'success', callback: function () {
-                                    _this.$nextTick(() => {
-                                        _this.list[index].isCollection = !this.list[index].isCollection
-                                    })
-                                }
-                            })
+                            _this.list.splice(index, 1)
+                            _this.$refs.uToast.show({ title: res.msg, type: 'success' })
                         } else {
                             _this.$u.toast(res.msg)
                         }
                     })
+
                 }
             },
             // 如果打开一个的时候，不需要关闭其他，则无需实现本方法
@@ -131,7 +139,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .item { display: flex; padding: 20rpx; }
-    image { width: 120rpx; flex: 0 0 120rpx; height: 120rpx; margin-right: 20rpx; border-radius: 12rpx; }
-    .title { text-align: left; font-size: 28rpx; color: $u-content-color; }
+    @import "index.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/integral/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/integral/index.scss
new file mode 100644
index 0000000000000000000000000000000000000000..5612c90190eaa51947755b6e6703ffb9856080c8
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/integral/index.scss
@@ -0,0 +1,2 @@
+page { background-color: #fff; }
+.integral-top { width: 690rpx; height: 301rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; text-align: center; width: 698rpx; margin: 10rpx auto 20rpx; border-radius: 12rpx; padding: 40rpx 0; box-shadow: 1rpx 5rpx 16rpx 0px rgba(229,77,66, 0.81); }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/integral/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/integral/index.vue
index f7e082bdb0eb9b9e9d713c1a854c78e47fca148f..e18653ac59746eebc676c7c6f5a4362efe9ff6b6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/integral/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/integral/index.vue
@@ -2,49 +2,43 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="我的积分"></u-navbar>
-        <view class="content">
-            <view class="integral-top bg-red">
+        <u-sticky offset-top="180">
+            <view class="integral-top coreshop-bg-red">
                 <view class="u-font-md text-white  u-margin-bottom-20">
                     可用积分
                 </view>
-                <view class="text-xxl  text-white u-margin-bottom-20">
+                <view class="u-font-xl coreshop-text-white u-margin-bottom-20">
                     {{ pointList.length ? pointList[0].balance : 0}}
                 </view>
-                <view class="u-font-xs text-gray">
+                <view class="u-font-xs coreshop-text-gray">
                     截止{{ nowDate }}可用积分
                 </view>
             </view>
-            
-            <view class="item-box">
-                <!-- 积分记录列表 -->
-                <view v-if="pointList.length>0">
-                    <view class="log-item x-bc" v-for="item in pointList" :key="item.id">
-                        <view class="item-left x-f">
-                            <!--<image class="log-img" :src="item.buyer.avatar" mode=""></image>-->
-                            <view class="y-start">
-                                <view class="log-name text-black">{{ item.typeName }}</view>
-                                <view class="log-notice text-grey">{{ item.remarks }}</view>
-                            </view>
-                        </view>
-                        <view class="item-right y-end">
-                            <view class="log-num text-red">{{ item.num > 0 ? '+' + item.num : item.num }}</view>
-                            <view class="log-date text-grey">{{ $u.timeFormat(item.createTime, 'yyyy.mm.dd') }}</view>
-
-                        </view>
+        </u-sticky>
+        <!-- 积分记录列表 -->
+        <view v-if="pointList.length>0">
+            <view class="coreshop-log-item u-flex u-row-between" v-for="item in pointList" :key="item.id">
+                <view class="item-left coreshop-flex coreshop-align-center">
+                    <!--<image class="log-img" :src="item.buyer.avatar" mode=""></image>-->
+                    <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
+                        <view class="log-name coreshop-text-black">{{ item.typeName }}</view>
+                        <view class="log-notice coreshop-text-grey">{{ item.remarks }}</view>
                     </view>
-                    <!-- 更多 -->
-                    <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
                 </view>
-
-                <!-- 无数据时默认显示 -->
-                <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无积分记录" mode="list"></u-empty>
+                <view class="item-right coreshop-flex coreshop-flex-direction coreshop-align-end">
+                    <view class="log-num coreshop-text-red">{{ item.num > 0 ? '+' + item.num : item.num }}</view>
+                    <view class="log-date coreshop-text-grey">{{ $u.timeFormat(item.createTime, 'yyyy.mm.dd') }}</view>
                 </view>
             </view>
+            <!-- 更多 -->
+            <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
+        </view>
 
+        <!-- 无数据时默认显示 -->
+        <view class="coreshop-emptybox" v-else>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无积分记录" mode="list"></u-empty>
         </view>
     </view>
-
 </template>
 <script>
     export default {
@@ -106,7 +100,5 @@
     }
 </script>
 <style lang="scss">
-    page { background-color: #fff; }
-    .integral-top { width: 690rpx; height: 301rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; text-align: center; width: 698rpx; margin: 10rpx auto 20rpx; border-radius: 12rpx; padding: 40rpx 0; box-shadow: 1rpx 5rpx 16rpx 0px rgba(229,77,66, 0.81); }
-
+    @import "index.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.scss
new file mode 100644
index 0000000000000000000000000000000000000000..78efa6ddc2779f51c9f037a425e9500886f4407a
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.scss
@@ -0,0 +1,22 @@
+.invite { width: 100%; background: linear-gradient(to right, #4c21d2, #4864f8); height: 100vh;
+    .invite-bg { position: absolute; width: 750rpx; height: 683rpx; z-index: 66; }
+    .invite-c { position: absolute; z-index: 67; width: 750rpx; padding: 0 30rpx; top: 668rpx; background: linear-gradient(to right, #4c21d2, #4864f8);
+        .invite-w { background-color: #fff; width: 690rpx; text-align: center; padding: 40rpx 100rpx; box-sizing: border-box; border-radius: 30rpx; margin-bottom: 70rpx; position: relative; top: -148rpx;
+            .invite-w-t { width: 70%; margin: 0 auto; color: #fff; border-radius: 50rpx; font-size: 30rpx; box-sizing: border-box; padding: 10rpx; display: block; background: linear-gradient(to right, #5f2ef6, #b945dd); }
+            .invite-w-num { color: #5f2ef6; display: block; font-size: 36rpx; margin-top: 20rpx; }
+            .invite-w-detail { color: #666; font-size: 24rpx; line-height: 1.5; margin-top: 20rpx; }
+            .invite-w-bot { margin: 20rpx 0 50rpx; }
+            .invite-w-bot > view { width: 49%; display: inline-block; }
+            .invite-w-bot-ic { width: 48rpx; height: 48rpx; }
+            .invite-w-bot-red { font-size: 24rpx; color: #ca0400; display: block; }
+            .invite-w-bot-gray { font-size: 24rpx; color: #acacac; display: block; }
+            .invite-w-t-blue { color: #348dfc; font-size: 30rpx; margin-bottom: 50rpx; display: block; }
+            .invite-w-input { font-size: 30rpx; border-bottom: 1px solid #dadada; margin-bottom: 50rpx; color: #999; }
+            .invite-w-btn { background: linear-gradient(to right, #4a6af9, #28c4ff); color: #fff; width: 50%; margin: 0 auto; border-radius: 50rpx; font-size: 30rpx; padding: 10rpx 0; }
+        }
+    }
+    .invite-btn { position: absolute; bottom: 10rpx; text-align: center; width: 690rpx;
+        image { width: 98rpx; height: 98rpx; }
+        .share { background-color: none; position: relative; width: 98rpx; height: 98rpx; display: inline-block; border-radius: 50%; padding: 0; margin: 0 40rpx 40rpx; }
+    }
+}
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 6efcc1b72f42822e7b8127da10f6f6bd5099473d..6e8d75cad8e67e45430d0232e9c5dbad012d1376 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue
@@ -2,7 +2,7 @@
     <view class="invite">
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="邀请好友"></u-navbar>
-        <image class="invite-bg" :src="$apiFilesUrl+'/static/images/my/invite-bg.png'" mode=""></image>
+        <image class="invite-bg" :src="$globalConstVars.apiFilesUrl+'/static/images/my/invite-bg.png'" mode=""></image>
         <view class="invite-c">
             <view class="invite-w">
                 <view class='invite-w-t'>我的专属邀请码</view>
@@ -10,12 +10,12 @@
                 <view class='invite-w-detail'>快去分享您的邀请码吧，让更多的好友加入到【{{appTitle}}】，您也可以获得丰厚的奖励！</view>
                 <view class='invite-w-bot'>
                     <view bindtap='commission' @click="toMoney">
-                        <text class="cuIcon-coin text-red" style="font-size: 44rpx;"></text>
+                        <text class="cuIcon-coin coreshop-text-red" style="font-size: 44rpx;"></text>
                         <text class='invite-w-bot-red'>￥{{money}}元</text>
                         <text class='invite-w-bot-gray'>邀请收益</text>
                     </view>
                     <view bindtap='recommendUserList' @click="toList">
-                        <text class="cuIcon-friend text-red" style="font-size: 44rpx;"></text>
+                        <text class="cuIcon-friend coreshop-text-red" style="font-size: 44rpx;"></text>
                         <text class='invite-w-bot-red'>{{number}}人</text>
                         <text class='invite-w-bot-gray'>邀请人数</text>
                     </view>
@@ -88,7 +88,7 @@
             },
             //去佣金明细
             toMoney() {
-                this.$u.route('/pages/member/balance/details?status=5');
+                this.$u.route('/pages/member/balance/details/details?status=5');
             },
             //去邀请列表
             toList() {
@@ -220,22 +220,5 @@
     }
 </script>
 <style lang="scss">
-    .invite { width: 100%; /* height: calc(100vh - 100px);*/ background: linear-gradient(to right, #4c21d2, #4864f8); height: 100vh }
-    .invite-bg { position: absolute; width: 750rpx; height: 683rpx; z-index: 66; }
-    .invite-c { position: absolute; z-index: 67; width: 750rpx; padding: 0 30rpx; top: 668rpx; background: linear-gradient(to right, #4c21d2, #4864f8); }
-    .invite-w { background-color: #fff; width: 690rpx; text-align: center; padding: 40rpx 100rpx; box-sizing: border-box; border-radius: 30rpx; margin-bottom: 70rpx; position: relative; top: -148rpx; }
-    .invite-w-t { width: 70%; margin: 0 auto; color: #fff; border-radius: 50rpx; font-size: 30rpx; box-sizing: border-box; padding: 10rpx; display: block; background: linear-gradient(to right, #5f2ef6, #b945dd); }
-    .invite-w-num { color: #5f2ef6; display: block; font-size: 36rpx; margin-top: 20rpx; }
-    .invite-w-detail { color: #666; font-size: 24rpx; line-height: 1.5; margin-top: 20rpx; }
-    .invite-w-bot { margin: 20rpx 0 50rpx; }
-        .invite-w-bot > view { width: 49%; display: inline-block; }
-    .invite-w-bot-ic { width: 48rpx; height: 48rpx; }
-    .invite-w-bot-red { font-size: 24rpx; color: #ca0400; display: block; }
-    .invite-w-bot-gray { font-size: 24rpx; color: #acacac; display: block; }
-    .invite-w-t-blue { color: #348dfc; font-size: 30rpx; margin-bottom: 50rpx; display: block; }
-    .invite-w-input { font-size: 30rpx; border-bottom: 1px solid #dadada; margin-bottom: 50rpx; color: #999; }
-    .invite-w-btn { background: linear-gradient(to right, #4a6af9, #28c4ff); color: #fff; width: 50%; margin: 0 auto; border-radius: 50rpx; font-size: 30rpx; padding: 10rpx 0; }
-    .invite-btn { position: absolute; bottom: 10rpx; text-align: center; width: 690rpx; }
-    .share { background-color: none; position: relative; width: 98rpx; height: 98rpx; display: inline-block; border-radius: 50%; padding: 0; margin: 0 40rpx 40rpx; }
-    .invite-btn image { width: 98rpx; height: 98rpx; }
+    @import "index.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/list.vue
index e0878aa99c2aa8e84b9c5c75d0b545e9d35c4e5f..1a2f911cf1bd186e997b152285ebf98d215da5b0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/list.vue
@@ -3,19 +3,19 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="邀请列表"></u-navbar>
         <!-- 邀请列表 -->
-        <view class="team-box">
-            <view class="team-list">
+        <view class="coreshop-team-box">
+            <view class="coreshop-team-list">
                 <view v-if="list.length">
-                    <view class="team-children x-f" v-for="children in list" :key="children.id">
+                    <view class="coreshop-team-children coreshop-flex coreshop-align-center" v-for="children in list" :key="children.id">
                         <image class="head-img" :src="children.avatarImage" mode=""></image>
                         <view class="head-info">
-                            <view class="name-box x-bc">
+                            <view class="name-box u-flex u-row-between">
                                 <view class="name-text">{{ children.nickName }}</view>
-                                <view class="x-f">
+                                <view class="coreshop-flex coreshop-align-center">
                                     <text class="cu-tag bg-grey sm radius">{{  children.mobile }}</text>
                                 </view>
                             </view>
-                            <view class="x-bc">
+                            <view class="u-flex u-row-between">
                                 <view class="head-time">{{ $u.timeFormat(children.createTime, 'yyyy年mm月dd日') }}</view>
                                 <view class="child-num u-margin-left-30">下级成员：{{ childNum || 0 }}人</view>
                             </view>
@@ -27,7 +27,7 @@
 
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无邀请列表" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无邀请列表" mode="list"></u-empty>
                 </view>
 
             </view>
@@ -41,7 +41,7 @@
             return {
                 list: [],
                 page: 1, //当前页
-                limit: 10, //每页显示几条
+                limit: 20, //每页显示几条
                 status: 'loadmore',
                 iconType: 'flower',
                 loadText: {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/invoice/index.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/invoice/index.scss
new file mode 100644
index 0000000000000000000000000000000000000000..f07b32ade1dc2da7792b62d041b29fce8b3704ce
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/invoice/index.scss
@@ -0,0 +1,15 @@
+.invoiceBox { margin: 30rpx 20rpx; margin-bottom: 20rpx; background-color: #ffffff; padding: 30rpx; border-radius: 10rpx; box-shadow: 0 0 10rpx #eeeeee; overflow: auto;
+    .invoiceLeft { height: 90rpx; width: 90rpx; overflow: hidden; float: left;
+        .leftIco { height: 100%; width: 100%; }
+    }
+    .invoiceRight { width: calc(100% - 120rpx); float: right;
+        .invoiceAmount { font-size: 32rpx; margin-bottom: 20rpx;
+            .status_no { margin-left: 20rpx; font-size: 24rpx; color: #F44336; }
+            .status_yes { margin-left: 20rpx; font-size: 24rpx; color: #0d9e13; }
+        }
+        .invoiceTitle { font-size: 24rpx; color: #888888; }
+        .invoiceTaxNumber { font-size: 24rpx; color: #888888; }
+        .invoiceTime { border-top: 2rpx #eeeeee dashed; margin-top: 20rpx; padding-top: 20rpx; font-size: 24rpx; color: #F44336; }
+    }
+}
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/invoice/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/invoice/index.vue
index 411a9445635200254f5dc5f9d361e32a8e201605..4771d39592575b5ff99bd1bb7fdc402ba545037d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/invoice/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/invoice/index.vue
@@ -2,27 +2,25 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="我的发票"></u-navbar>
-        <view class="content">
-            <view v-if="listData.length > 0">
-                <view class="invoiceBox" v-for="(item, index) in listData" :key="index">
-                    <view class="invoiceLeft">
-                        <image src="/static/images/common/invoice.png" class="leftIco"></image>
-                    </view>
-                    <view class="invoiceRight">
-                        <view class="invoiceAmount x-bc"><text class="text-price text-red">{{item.amount}}</text> <text :class="item.status == 1?'status_no':'status_yes'">{{item.statusName || ''}}</text></view>
-                        <view class="invoiceTitle">发票抬头：{{item.title || ''}}</view>
-                        <view class="invoiceTaxNumber" v-if="item.taxNumber">发票税号：{{item.taxNumber}}</view>
-                        <view class="invoiceTitle">开票备注：{{item.remarks || ''}}</view>
+        <view v-if="listData.length > 0">
+            <view class="invoiceBox" v-for="(item, index) in listData" :key="index">
+                <view class="invoiceLeft">
+                    <image src="/static/images/common/invoice.png" class="leftIco"></image>
+                </view>
+                <view class="invoiceRight">
+                    <view class="invoiceAmount u-flex u-row-between"><text class="coreshop-text-price coreshop-text-red">{{item.amount}}</text> <text :class="item.status == 1?'status_no':'status_yes'">{{item.statusName || ''}}</text></view>
+                    <view class="invoiceTitle">发票抬头：{{item.title || ''}}</view>
+                    <view class="invoiceTaxNumber" v-if="item.taxNumber">发票税号：{{item.taxNumber}}</view>
+                    <view class="invoiceTitle">开票备注：{{item.remarks || ''}}</view>
 
-                        <view class="invoiceTime  x-bc">{{item.createTime}} <text class="text-grey">{{item.typeName || ''}}</text></view>
-                    </view>
+                    <view class="invoiceTime  u-flex u-row-between">{{item.createTime}} <text class="coreshop-text-grey">{{item.typeName || ''}}</text></view>
                 </view>
-                <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
-            </view>
-            <!-- 无数据时默认显示 -->
-            <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/coupon.png'" icon-size="300" text="暂无发票明细" mode="list"></u-empty>
             </view>
+            <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
+        </view>
+        <!-- 无数据时默认显示 -->
+        <view class="coreshop-emptybox" v-else>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/coupon.png'" icon-size="300" text="暂无发票明细" mode="list"></u-empty>
         </view>
     </view>
 
@@ -88,16 +86,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .invoiceBox { margin: 30rpx 20rpx; margin-bottom: 20rpx; background-color: #ffffff; padding: 30rpx; border-radius: 10rpx; box-shadow: 0 0 10rpx #eeeeee; overflow: auto; }
-    .invoiceLeft { height: 90rpx; width: 90rpx; overflow: hidden; float: left; }
-    .leftIco { height: 100%; width: 100%; }
-    .invoiceRight { width: calc(100% - 120rpx); float: right; }
-    .invoiceAmount { font-size: 32rpx; margin-bottom: 20rpx; }
-    .invoiceTitle { font-size: 24rpx; color: #888888; }
-    .invoiceTaxNumber { font-size: 24rpx; color: #888888; }
-    .invoiceTime { border-top: 2rpx #eeeeee dashed; margin-top: 20rpx; padding-top: 20rpx; font-size: 24rpx; color: #F44336; }
-    .status_no { margin-left: 20rpx; font-size: 24rpx; color: #F44336; }
-    .status_yes { margin-left: 20rpx; font-size: 24rpx; color: #0d9e13; }
-    .invoice-none { text-align: center; padding: 200rpx 0; }
-    .invoice-none-img { width: 274rpx; height: 274rpx; }
+    @import "index.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.scss
new file mode 100644
index 0000000000000000000000000000000000000000..06fd4d9f2dd6f4b705dd373c4028536aa0996ecd
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.scss
@@ -0,0 +1,2 @@
+.cu-steps .coreshop-list-item.select .icon-view { border: 7.27rpx solid #19be6b; }
+.cu-steps .coreshop-list-item.select:before { border-color: #19be6b; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue
index 0f09658f21eeecbf5ec90889d9c7dbc3728d1bc0..4045af4fba6a2d19bdb3fdd0aacdda8437ea389a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue
@@ -4,45 +4,32 @@
         <u-navbar title="订单详情"></u-navbar>
 
         <!--步骤条区域-->
-        <view class="bg-white padding solid-top" v-if="basics < 9">
+        <view class="coreshop-bg-white u-padding-right-20 u-padding-left-20 u-padding-top-30 coreshop-solid-top" v-if="basics < 9">
             <!--步骤条-->
-            <view class="cu-steps" v-if="basics < 5">
-                <block v-for="(item,index) in basicsList" :key="index">
-                    <view class="cu-item" :class="index>basics?'':'select'">
-                        <view class="icon-view" v-if="index>basics">
-                            <text class="coreshop-text-green" :class="'cuIcon-' + item.cuIcon"></text>
-                        </view>
-                        <view class="coreshop-bg-green icon-view" v-else>
-                            <text :class="'cuIcon-' + item.cuIcon"></text>
-                        </view>
-                        <view class="text-sm text-black" v-if="index>basics">{{item.name}}</view>
-                        <view class="text-sm text-black" v-else>{{item.name_s}}</view>
-                    </view>
-                </block>
-            </view>
+            <u-steps :list="basicsList" :current="basics+1"  mode="number" v-if="basics < 5"></u-steps>
             <!--状态图标-->
-            <view class="bg-white padding solid-top text-center coreshop-status-img-view u-margin-top-20" v-if="basics == 7">
+            <view class="coreshop-bg-white padding coreshop-solid-top u-text-center coreshop-status-img-view u-margin-top-20" v-if="basics == 7">
                 <view class="are-img-view">
                     <image class="are-img" src="/static/images/common/arg.png" mode="widthFix" />
                 </view>
-                <view class="text-sm text-black">订单已取消</view>
+                <view class="u-font-sm coreshop-text-black">订单已取消</view>
             </view>
         </view>
 
         <!-- 团购分享拼单 -->
-        <view class="bg-white coreshop-card-box" v-if="orderInfo.orderType==2 && orderInfo.status != 3 && orderInfo.payStatus!=1">
+        <view class="coreshop-bg-white coreshop-card-box" v-if="orderInfo.orderType==2 && orderInfo.status != 3 && orderInfo.payStatus!=1">
             <view class="coreshop-card-view coreshop-address-view">
-                <view v-if="teamInfo.status==1" class="text-lg text-bold text-black">待拼团，还差{{ teamInfo.teamNums || ''}}人</view>
-                <view v-else-if="teamInfo.status==2" class="text-lg text-bold text-black">拼团成功，待发货</view>
-                <view v-else-if="teamInfo.status==3" class="text-lg text-bold text-black">拼团失败</view>
-                <view class="solid-line"></view>
-                <view class="cell-group margin-cell-group">
+                <view v-if="teamInfo.status==1" class="u-font-lg coreshop-text-bold coreshop-text-black">待拼团，还差{{ teamInfo.teamNums || ''}}人</view>
+                <view v-else-if="teamInfo.status==2" class="u-font-lg coreshop-text-bold coreshop-text-black">拼团成功，待发货</view>
+                <view v-else-if="teamInfo.status==3" class="u-font-lg coreshop-text-bold coreshop-text-black">拼团失败</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                <view class="coreshop-cell-group u-margin-top-20 u-margin-bottom-20">
                     <view class="group-swiper">
-                        <view class='cell-item' v-if="teamInfo.currentCount">
-                            <view class='cell-item-hd'>
+                        <view class='coreshop-cell-item' v-if="teamInfo.currentCount">
+                            <view class='coreshop-cell-item-hd'>
                                 <view class="user-head-img-c" v-for="(item, index) in teamInfo.list" :key="index">
                                     <view class="user-head-img-tip" v-if="item.recordId == teamInfo.teamId">拼主</view>
-                                    <image class="user-head-img cell-hd-icon have-none" :src='item.userAvatar' mode=""></image>
+                                    <image class="user-head-img coreshop-head-icon " :src='item.userAvatar' mode=""></image>
                                 </view>
                                 <view v-if="teamInfo.teamNums > 3">
                                     <view class="uhihn" v-for="n in 3" :key="n">?</view>
@@ -59,39 +46,43 @@
         </view>
 
         <!--物流信息-->
-        <view class="bg-white coreshop-card-box" v-if="basics != 0 && !orderInfo.store">
+        <view class="coreshop-bg-white coreshop-card-box" v-if="basics != 0 && !orderInfo.store">
             <view class="coreshop-card-view coreshop-address-view">
-                <view class="text-lg text-bold text-black">物流信息</view>
-                <view class="solid-line"></view>
-                <view class="cu-list menu-avatar">
-                    <view class="cu-item">
-                        <view class="bg-grey icon-view">
-                            <text class="cuIcon-locationfill" />
-                        </view>
-                        <view class="content">
-                            <view class="text-black">
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black flex justify-between">
+                    物流信息
+                    <text class="u-font-sm">已发货，请注意查收</text>
+                </view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                <view class="wrap">
+                    <u-row gutter="16">
+                        <u-col span="1">
+                            <u-icon name="map-fill" size="38"></u-icon>
+                        </u-col>
+                        <u-col span="11">
+                            <view class="coreshop-text-black">
                                 <text>收货人：</text>
                                 <text>{{ orderInfo.shipName || ''}}</text>
-                                <text class="margin-left">{{ orderInfo.shipMobile || ''}}</text>
+                                <text class="u-margin-left-10 u-margin-right-10">{{  orderInfo.shipMobile || '' }}</text>
+                                <u-tag text="复制" type="success" mode="dark" @click="doCopyData(orderInfo.shipName + ' - ' + orderInfo.shipMobile + ' - ' + orderInfo.shipAreaName + orderInfo.shipAddress)"  />
                             </view>
-                            <view class="text-gray text-sm flex">
-                                <view class="text-cut">{{ orderInfo.shipAreaName|| ''}} {{orderInfo.shipAddress || ''}}</view>
+                            <view class="coreshop-text-gray u-font-sm flex">
+                                <view class="u-line-2">{{ orderInfo.shipAreaName|| ''}} {{orderInfo.shipAddress || ''}}</view>
                             </view>
-                        </view>
-                    </view>
+                        </u-col>
+                    </u-row>
                 </view>
                 <view class="solid-line" v-if="isDelivery"></view>
                 <view class="delivery" v-if="isDelivery">
-                    <view class='cell-item add-title-item' v-for="(v, k) in orderInfo.delivery" :key="k" @click="logistics(k)">
-                        <view class='cell-item-bd'>
-                            <view class="cell-bd-view">
-                                <text class="cell-bd-text">{{v.logiName|| ''}} : {{v.logiNo|| ''}}</text>
+                    <view class='coreshop-cell-item add-title-item' v-for="(v, k) in orderInfo.delivery" :key="k" @click="logistics(k)">
+                        <view class='coreshop-cell-item-bd'>
+                            <view class="coreshop-cell-bd-view">
+                                <text class="coreshop-cell-bd-text">{{v.logiName|| ''}} : {{v.logiNo|| ''}}</text>
                             </view>
 
                         </view>
-                        <view class="cell-item-ft">
-                            <view class="cell-ft-view"> {{ v.createTime || ''}}</view>
-                            <text class="cuIcon-right icon" />
+                        <view class="coreshop-cell-item-ft">
+                            <view class="coreshop-cell-ft-view"> {{ v.createTime || ''}}</view>
+                            <u-icon name="arrow-right-double"></u-icon>
                         </view>
                     </view>
                 </view>
@@ -101,34 +92,34 @@
 
 
         <!--提货信息-->
-        <view class="bg-white coreshop-card-box" v-if="orderInfo.store">
+        <view class="coreshop-bg-white coreshop-card-box" v-if="orderInfo.store">
             <view class="coreshop-card-view coreshop-order-view">
-                <view class="text-lg text-bold text-black">提货信息</view>
-                <view class="solid-line"></view>
-                <view class="text-black text-bold title-left-view u-margin-buttom-20">
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black">提货信息</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                <view class="coreshop-text-black coreshop-text-bold title-left-view u-margin-bottom-20">
                     <text>{{orderInfo.store.storeName|| ''}}</text>
                 </view>
 
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">门店电话</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{orderInfo.store.mobile|| '无'}}</text>
                     </view>
-                </view> <view class="text-black title-view">
+                </view> <view class="coreshop-text-black title-view">
                     <view class="title">门店地址</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text> {{orderInfo.store.address|| '无'}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">提货人信息</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{orderInfo.shipName|| ''}} - {{orderInfo.shipMobile|| ''}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="lading.status">
+                <view class="coreshop-text-black title-view" v-if="lading.status">
                     <view class="title">提货码：</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text class="red-price">{{lading.code|| ''}}</text>
                     </view>
                 </view>
@@ -137,21 +128,24 @@
         </view>
 
         <!--商品信息-->
-        <view class="bg-white coreshop-card-box">
+        <!--商品信息-->
+        <view class="coreshop-bg-white coreshop-card-box">
             <view class="coreshop-card-view coreshop-shop-view">
-
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black">商品信息</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
                 <view class="goods-list-view" v-for="item in orderInfo.items" :key="item.id">
-                    <view class="cu-avatar radius" :style="[{backgroundImage:'url('+ item.imageUrl +')'}]" />
+                    <image class="coreshop-avatar radius" :src="item.imageUrl" mode="aspectFill"></image>
                     <view class="goods-info-view">
-                        <view class="text-black u-line-2" @click="goGoodsDetail(item.goodsId)" v-if="orderInfo.orderType == 1">{{ item.name }}</view>
-                        <view class="text-black u-line-2" @click="goPinTuanDetail(item.goodsId)" v-else-if="orderInfo.orderType == 2">{{ item.name }}</view>
-                        <view class="text-gray text-sm text-cut introduce" v-if="item.addon !== null">{{ item.addon || ''}}</view>
-                        <view class="text-cut tag-view">
-                            <!--<text class="cu-tag sm line-blue radius" v-if="item.promotionObj">{{ item.promotionObj.name}}</text>-->
-                            <text class="cu-tag line-blue sm radius" v-for="(v, k) in item.promotionList" :key="k"> {{ v.name || ''}}</text>
+                        <view class="coreshop-text-black u-line-2" @click="goGoodsDetail(item.goodsId)" v-if="orderInfo.orderType == 1">{{ item.name }}</view>
+                        <view class="coreshop-text-black u-line-2" @click="goPinTuanDetail(item.goodsId)" v-else-if="orderInfo.orderType == 2">{{ item.name }}</view>
+                        <view class="coreshop-text-gray u-font-sm u-line-1 introduce" v-if="item.addon">{{ item.addon}}</view>
+                        <view class="u-line-1 tag-view">
+                            <u-tag :text="v.name" type="success" shape="circle" v-for="(v, k) in item.promotionList" :key="k" />
+                        </view>
+                        <view class="u-flex u-row-between coreshop-order-priceBox">
+                            <view class="coreshop-text-red coreshop-text-price u-font-lg">{{ item.price }}</view>
+                            <view class="coreshop-text-black u-font-sm coreshop-order-nums">数量：{{ item.nums }}</view>
                         </view>
-                        <view class="text-price text-red text-lg priceBox">{{ item.price }} <view class="text-black text-sm nums">× {{ item.nums }}</view></view>
-
                     </view>
                 </view>
 
@@ -159,22 +153,21 @@
         </view>
 
 
-
         <!--发票信息-->
-        <view class="bg-white coreshop-card-box" v-if="orderInfo.invoice && orderInfo.invoice.type != 1">
+        <view class="coreshop-bg-white coreshop-card-box" v-if="orderInfo.invoice && orderInfo.invoice.type != 1">
             <view class="coreshop-card-view coreshop-order-view">
-                <view class="text-lg text-bold text-black">发票信息</view>
-                <view class="solid-line"></view>
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black">发票信息</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
 
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">发票抬头</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text> {{orderInfo.invoice.title|| '无'}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">发票税号</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{orderInfo.invoice.taxNumber|| '无'}}</text>
                     </view>
                 </view>
@@ -184,161 +177,145 @@
 
 
         <!--商品金额-->
-        <view class="bg-white coreshop-card-box">
+        <view class="coreshop-bg-white coreshop-card-box">
             <view class="coreshop-card-view coreshop-price-view">
-                <view class="text-lg text-bold text-black">费用信息</view>
-                <view class="solid-line"></view>
-                <view class="text-black title-view" v-if="orderInfo.promotionObj && orderInfo.promotionObj.length > 0">
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black">费用信息</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                <view class="coreshop-text-black title-view" v-if="orderInfo.promotionObj && orderInfo.promotionObj.length > 0">
                     <view class="title">订单优惠</view>
-                    <view class="text-right">
-                        <text class="text-price" v-for="(item, key) in orderInfo.promotionObj" :key="key" v-show="item.type == 2">{{ item.name}}</text>
+                    <view class="u-text-right">
+                        <text class="coreshop-text-price" v-for="(item, key) in orderInfo.promotionObj" :key="key" v-show="item.type == 2">{{ item.name}}</text>
                     </view>
                 </view>
 
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">商品总额</view>
-                    <view class="text-right">
-                        <text class="text-price">{{ orderInfo.goodsAmount}}</text>
+                    <view class="u-text-right">
+                        <text class="coreshop-text-price">{{ orderInfo.goodsAmount}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">运费</view>
-                    <view class="text-right">
-                        <text class="margin-right-xs">+</text>
-                        <text class="text-price">{{ orderInfo.costFreight}}</text>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">+</text>
+                        <text class="coreshop-text-price">{{ orderInfo.costFreight}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.goodsDiscountAmount > 0">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.goodsDiscountAmount > 0">
                     <view class="title">商品优惠</view>
-                    <view class="text-right">
-                        <text class="margin-right-xs">-</text>
-                        <text class="text-price">{{ orderInfo.goodsDiscountAmount }}</text>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">-</text>
+                        <text class="coreshop-text-price">{{ orderInfo.goodsDiscountAmount }}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.pointMoney > 0">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.pointMoney > 0">
                     <view class="title">积分优惠</view>
-                    <view class="text-right">
-                        <text class="margin-right-xs">-</text>
-                        <text class="text-price">{{ orderInfo.pointMoney }}</text>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">-</text>
+                        <text class="coreshop-text-price">{{ orderInfo.pointMoney }}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.orderDiscountAmount > 0">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.orderDiscountAmount > 0">
                     <view class="title">订单优惠</view>
-                    <view class="text-right">
-                        <text class="margin-right-xs">-</text>
-                        <text class="text-price">{{ orderInfo.orderDiscountAmount }}</text>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">-</text>
+                        <text class="coreshop-text-price">{{ orderInfo.orderDiscountAmount }}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.couponDiscountAmount > 0">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.couponDiscountAmount > 0">
                     <view class="title">优惠券优惠</view>
-                    <view class="text-right">
-                        <text class="margin-right-xs">-</text>
-                        <text class="text-price">{{ orderInfo.couponDiscountAmount }}</text>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">-</text>
+                        <text class="coreshop-text-price">{{ orderInfo.couponDiscountAmount }}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.payStatus > 1">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.payStatus > 1">
                     <view class="title">支付方式</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.paymentName }}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.payStatus > 1">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.payStatus > 1">
                     <view class="title">支付时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.paymentTime}}</text>
                     </view>
                 </view>
-                <view class="text-black text-bold title-right-view">
-                    <text class="margin-right-xs">应付款：</text>
-                    <text class="text-price">{{ orderInfo.orderAmount}}</text>
+                <view class="coreshop-text-black coreshop-text-bold title-right-view">
+                    <text class="u-margin-right-20">应付款：</text>
+                    <text class="coreshop-text-price">{{ orderInfo.orderAmount}}</text>
                 </view>
             </view>
         </view>
 
         <!--订单信息-->
-        <view class="bg-white coreshop-card-box">
+        <view class="coreshop-bg-white coreshop-card-box">
             <view class="coreshop-card-view coreshop-order-view">
-                <view class="text-lg text-bold text-black">订单信息（{{ orderInfo.globalStatusText || ''}}）</view>
-                <view class="solid-line"></view>
-                <view class="text-black title-view">
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black">订单信息（{{ orderInfo.globalStatusText || ''}}）</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0"/>
+                <view class="coreshop-text-black title-view">
                     <view class="title">订单编号</view>
-                    <view class="text-right" hover-class="btn-hover" @click="doCopyData(orderInfo.orderId)">
-                        <text class="margin-right-xs">{{ orderInfo.orderId || ''}}</text>
-                        <button class="cu-btn sm line-black">复制</button>
+                    <view class="u-text-right"  @click="doCopyData(orderInfo.orderId)">
+                        <text class="u-margin-right-20">{{ orderInfo.orderId || ''}}</text>
+                        <u-tag text="复制" type="success" mode="dark" @click="doCopyData(orderInfo.orderId)" />
                     </view>
                 </view>
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">订单类型</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>
                             {{ orderInfo.typeText || ''}}
                         </text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.paymentName && orderInfo.payStatus > 1">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.paymentName && orderInfo.payStatus > 1">
                     <view class="title">支付方式</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.paymentName || ''}} </text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.createTime">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.createTime">
                     <view class="title">下单时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.createTime || ''}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="basics > 0 && orderInfo.paymentTime">
+                <view class="coreshop-text-black title-view" v-if="basics > 0 && orderInfo.paymentTime">
                     <view class="title">支付时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.paymentTime || ''}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="basics > 1 && delivery && delivery.createTime">
+                <view class="coreshop-text-black title-view" v-if="basics > 1 && delivery && delivery.createTime">
                     <view class="title">发货时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ delivery.createTime || ''}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="basics > 2 && orderInfo.confirmTime">
+                <view class="coreshop-text-black title-view" v-if="basics > 2 && orderInfo.confirmTime">
                     <view class="title">确认时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.confirmTime || ''}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="basics > 3 && orderInfo.updateTime">
+                <view class="coreshop-text-black title-view" v-if="basics > 3 && orderInfo.updateTime">
                     <view class="title" v-if="basics >= 7">取消时间</view>
                     <view class="title" v-else>完成时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.updateTime || ''}}</text>
                     </view>
                 </view>
             </view>
         </view>
 
-        <view class="bg-white coreshop-card-hight-box" />
-
-        <!--为您推荐-->
-        <view class="coreshop-title-view" v-if="otherData.length>0">
-            <view class="flex flex-wrap">
-                <view class="basis-sm text-right">
-                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
-                </view>
-                <view class="basis-xs text-center">
-                    <text class="text-black text-lg">为您推荐</text>
-                </view>
-                <view class="basis-sm text-left">
-                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
-                </view>
-            </view>
-        </view>
-
-       
+        <view class="coreshop-bg-white coreshop-card-hight-box" />
 
+        
         <!--底部-->
-        <!--<view class="foot-hight-view" />
-        <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom" v-if="orderInfo.status == 1 && !isDelivery">
-            <button class='cu-btn coreshop-bg-green' style="width: inherit;" hover-class="btn-hover" @click="tackDeliery(orderInfo.orderId)">立即发货</button>
-        </view>-->
+        <view class="coreshop-foot-hight-view" />
+        <view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom u-text-center u-padding-20" v-if="orderInfo.status == 1 && !isDelivery">
+            <u-button class='coreshop-bg-red' type="success" size="default"  @click="tackDeliery(orderInfo.orderId)">立即发货</u-button>
+        </view>
 
     </view>
 </template>
@@ -350,11 +327,11 @@
             return {
                 basics: 0,
                 basicsList: [
-                    { cuIcon: 'cartfill', name: '未拍下', name_s: '已拍下', nameId: 0 },
-                    { cuIcon: 'card', name: '待付款', name_s: '已付款', nameId: 1 },
-                    { cuIcon: 'deliver_fill', name: '待发货', name_s: '已发货', nameId: 2 },
-                    { cuIcon: 'formfill', name: '待收货', name_s: '已收货', nameId: 3 },
-                    { cuIcon: 'presentfill', name: '待评价', name_s: '已评价', nameId: 4 }
+                    { name: '下单' },
+                    { name: '付款' },
+                    { name: '发货' },
+                    { name: '收货' },
+                    { name: '评价' }
                 ],
                 delivery: {},//发货信息
                 orderId: 0,
@@ -493,8 +470,5 @@
     }
 </script>
 <style lang="scss" scoped>
-    @import '../../../../static/style/orderDetails.scss';
-
-    .cu-steps .cu-item.select .icon-view { border: 7.27rpx solid #19be6b; }
-    .cu-steps .cu-item.select:before { border-color: #19be6b; }
+    @import "detail.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/merchant.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.scss
similarity index 88%
rename from CoreCms.Net.Uni-App/CoreShop/static/style/merchant.scss
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.scss
index dab5689960c837651df97867d3d1a729e6074275..9ca1d19e8754113b4fcb63a9c3d50027eb65938a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/merchant.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.scss
@@ -38,7 +38,9 @@
         &:first-child {
             &::after { content: ''; height: 30rpx; width: 2rpx; background-color: #bdbdbd; display: inline-block; }
         }
-
+        &:nth-child(2) {
+            &::after { content: ''; height: 30rpx; width: 2rpx; background-color: #bdbdbd; display: inline-block; }
+        }
         .item-title { font-size: 30rpx; font-family: PingFang SC; font-weight: 400; color: #666; line-height: 100rpx; }
         .cuIcon-triangleupfill { color: #666; transition: all linear 0.2s; }
         .icon-active { transition: all linear 0.2s; transform: rotate(180deg); color: #4cb89d; }
@@ -59,7 +61,7 @@
 .hide-drop-down { top: 0; width: 750rpx; transform: scaleY(0); opacity: 0; transform-origin: top; transition: all linear 0.1s; }
 // 销量
 .sales-volume-box { background-color: #fff; padding: 30rpx;
-    .sales-volume { width: 338rpx; height: 72rpx; background: rgba(76, 184, 157, 0.06); border: 1rpx solid rgba(185, 227, 217, 1); border-radius: 10rpx; font-size: 24rpx; font-family: PingFang SC; font-weight: 400; color: rgba(76, 184, 157, 1); }
+    .sales-volume { width: 338rpx; height: 72rpx; background: rgba(76, 184, 157, 0.06); border: 1rpx solid rgba(185, 227, 217, 1); border-radius: 10rpx; font-size: 24rpx; font-family: PingFang SC; font-weight: 400; color: rgba(76, 184, 157, 1); text-align: center; line-height: 72rpx }
 }
 // 输码弹窗
 .modal-box { background: #fff; width: 610rpx; margin: 0 auto; border-radius: 20rpx;
@@ -91,21 +93,6 @@
 
 
 
-
-
-/*门店列表*/
-.store-item { padding: 0 30rpx; height: 180rpx; background-color: #fff; border-bottom: 1rpx solid rgba(223, 223, 223, 0.6); width: 100%;
-    .img-box { width: 100rpx; height: 100rpx; border-radius: 6rpx; overflow: hidden; margin-right: 20rpx;
-        .store-img { width: 100rpx; height: 100rpx; border-radius: 6rpx; }
-    }
-    .store-title { font-size: 30rpx; font-family: PingFang SC; font-weight: 600; color: rgba(52, 52, 52, 1); margin-bottom: 10rpx; }
-    .store-content { font-size: 24rpx; font-family: PingFang SC; font-weight: 400; color: rgba(102, 102, 102, 1); }
-}
-.foot_box { height: 100rpx; background: rgba(255, 255, 255, 1); padding: 0 20rpx;
-    .save-btn { width: 710rpx; height: 80rpx; background: linear-gradient(90deg, #2eae9c, #6cc29f); border: 1rpx solid rgba(238, 238, 238, 1); font-size: 30rpx; font-family: PingFang SC; font-weight: 500; color: rgba(255, 255, 255, 1); padding: 0; border-radius: 40rpx; }
-}
-
-
 /*商品展示*/
 .goods-box { position: relative;
     .goods-img { height: 180rpx; width: 180rpx; background-color: #ccc; margin-right: 25rpx; }
@@ -162,3 +149,8 @@
         }
     }
 }
+
+
+.coreshop-tools-list-box {
+    .grid-text { font-size: 24rpx; margin-top: 10rpx; color: $core-type-info; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.vue
index a573834d7527b03f0f77b59550a3f74ec37a98f5..7db79bcbac8bb3bad0e73260d59d18f3467d96e3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/index/index.vue
@@ -12,13 +12,14 @@
                     <!-- #ifdef H5 -->
                     <view class="status-H5bar"></view>
                     <!-- #endif -->
-                    <text class="nav-title x-f">商家中心</text>
+                    <text class="nav-title coreshop-flex coreshop-align-center">商家中心</text>
                 </view>
-                <view class="user-head x-bc">
+                <view class="user-head u-flex u-row-between">
                     <view class="shop-info">
-                        <view class="x-f u-m-b-30" @tap="goStoreList">
+                        <view class="coreshop-flex coreshop-align-center u-m-b-30" @tap="goStoreList">
                             <text class="shop-title">{{ storeDetail.storeName }}</text>
-                            <text class="cuIcon-roundrightfill"></text>
+                            <!--<text class="cuIcon-roundrightfill"></text>-->
+                            <u-icon name="arrow-down" color="#FFF" size="28" class="u-margin-left-20"></u-icon>
                         </view>
                         <view class="shop-address" @tap="goMapDetails(storeDetail.id, storeDetail.latitude, storeDetail.longitude)">
                             {{ storeDetail.address || '' }}
@@ -31,25 +32,36 @@
 
         <!--业务列表-->
         <view class="coreshop-tools-list-box">
-            <view class="cu-list grid col-4 no-border">
-                <block v v-for="(item,i) in icons" :key="i">
-                    <view class="cu-item" @click="goRoute(item.router)">
-                        <view class="text-black" :class="item.icon" />
-                        <text>{{item.name}}</text>
-                    </view>
-                </block>
-            </view>
+
+            <u-grid :col="4">
+		        <u-grid-item @click="goRoute('/pages/member/merchant/takeDelivery/list')">
+			        <u-icon name="order" :size="46"></u-icon>
+			        <view class="grid-text">提货单列表</view>
+		        </u-grid-item>
+		        <u-grid-item @click="goRoute('/pages/member/merchant/takeDelivery/index')">
+			        <u-icon name="fingerprint" :size="46"></u-icon>
+			        <view class="grid-text">提货单核销</view>
+		        </u-grid-item>
+		        <u-grid-item @click="goRoute('/pages/member/merchant/serviceVerification/list')">
+			        <u-icon name="coupon" :size="46"></u-icon>
+			        <view class="grid-text">服务券列表</view>
+		        </u-grid-item>
+                <u-grid-item @click="goRoute('/pages/member/merchant/serviceVerification/index')">
+			        <u-icon name="grid" :size="46"></u-icon>
+			        <view class="grid-text">核验服务券</view>
+		        </u-grid-item>
+	        </u-grid>
         </view>
 
         <!-- 统计及切换信息 -->
         <view class="statistics-box">
-            <view class="statistics-nav x-f">
-                <view class="nav-item x-f" v-for="nav in cancelTypeList" :key="nav.id" @tap="onNav(nav.type)">
-                    <view class="y-f" style="width: 100%;">
-                        <view class="item-title x-f" :class="{ 'title-active': cancelType === nav.type }">
-                            <text class="u-font-13">{{ nav.title }}</text>
+            <view class="statistics-nav coreshop-flex coreshop-align-center">
+                <view class="nav-item coreshop-flex coreshop-align-center" v-for="nav in cancelTypeList" :key="nav.id" @tap="onNav(nav.type)">
+                    <view class="coreshop-flex coreshop-flex-direction coreshop-align-center w100">
+                        <view class="item-title coreshop-flex coreshop-align-center" :class="{ 'title-active': cancelType === nav.type }">
+                            <text class="u-font-13 u-margin-right-10">{{ nav.title }}</text>
                             <view :class="{ 'icon-active': cancelType === nav.type }">
-                                <text class="cuIcon-triangledownfill" :class="{ 'icon-active': cancelType === nav.type }"></text>
+                                <u-icon name="arrow-down-fill" size="22"></u-icon>
                             </view>
                         </view>
                         <text class="nav-line" :class="{ 'line-active': cancelType === nav.type }"></text>
@@ -57,39 +69,45 @@
                 </view>
                 <!-- 下拉窗 -->
                 <view class="drop-down-box">
-                    <view class="drop-down-item x-bc" v-for="(item, index) in dropDown[cancelType]" :key="index" @tap="onFilter(item.value, item.title)">
+                    <view class="drop-down-item u-flex u-row-between" v-for="(item, index) in dropDown[cancelType]" :key="index" @tap="onFilter(item.value, item.title)">
                         <text class="item-title">{{ item.title }}</text>
                         <text class="cuIcon-check" v-if="filter[cancelType] == item.value"></text>
                     </view>
                 </view>
             </view>
             <!-- 销量 -->
-            <view class="sales-volume-box x-bc pa30">
+            <view class="sales-volume-box u-flex u-row-between pa30">
                 <view class="sales-volume x-c">订单量(单)：{{ orderTotalCount || 0 }}</view>
                 <view class="sales-volume x-c">交易额(元)：{{ orderTotalMoney || 0 }}</view>
             </view>
         </view>
         <!-- 订单列表 -->
         <view class="order-list" v-for="order in storeOrderList" :key="order.orderId" @tap.stop="goOrderDetail(order.orderId)">
-            <view class="order-head x-bc">
-                <text class="no">订单编号：{{ order.orderId }}</text>
+            <view class="order-head u-flex u-row-between">
+                
+                <text class="no">
+                    编号：{{ order.orderId }}
+                </text>
                 <text class="state">{{ order.shipStatusText }}</text>
+                <u-button type="primary" size="mini" v-if="order.receiptType==1">物流快递</u-button>
+                <u-button type="success" size="mini" v-if="order.receiptType==2">同城配送</u-button>
+                <u-button type="warning" size="mini" v-if="order.receiptType==3">门店自提</u-button>
             </view>
             <view class="goods-order" v-for="item in order.items" :key="item.id">
                 <view class="order-content">
-                    <view class="goods-box x-start">
+                    <view class="goods-box coreshop-flex coreshop-align-start">
                         <view class="order-goods__tag">
                             <image v-if="detail.activity_type" class="tag-img" :src="orderStatus[detail.activity_type]" mode=""></image>
                             <image v-if="orderType === 'score'" class="tag-img" :src="orderStatus[orderType]" mode=""></image>
                         </view>
                         <image class="goods-img" :src="item.imageUrl || ''" mode="aspectFill"></image>
-                        <view class="y-start order-right">
+                        <view class="coreshop-flex coreshop-flex-direction coreshop-align-start">
                             <view class="goods-title more-t u-line-2">{{ item.name || '' }}</view>
                             <view class="order-tip one-t">
                                 <text class="order-num">数量:{{ item.nums || 0 }};</text>
                                 {{ item.addon ? item.addon : '' }}
                             </view>
-                            <view class="order-goods x-f ">
+                            <view class="order-goods coreshop-flex coreshop-align-center ">
                                 <text class="order-price">￥{{ item.amount || 0 }}</text>
                                 <!--<button class="cu-btn status-btn" v-if="detail.status_name">{{ item.status_name }}</button>-->
                             </view>
@@ -98,7 +116,7 @@
                 </view>
             </view>
 
-            <view class="order-bottom x-bc u-border-bottom">
+            <view class="order-bottom u-flex u-row-between u-border-bottom">
                 <view>
                     <text class="u-font-24 tips-color">{{$u.timeFormat(order.createTime, 'yyyy-mm-dd hh:MM:ss')}}</text>
                 </view>
@@ -107,7 +125,7 @@
                 </view>
             </view>
 
-            <view class="order-bottom x-bc">
+            <view class="order-bottom u-flex u-row-between">
                 <view v-if="order.status === 1">
                     <u-button type="success" size="mini">订单正常</u-button>
                 </view>
@@ -132,7 +150,7 @@
 
         <!-- 无数据时默认显示 -->
         <view class="coreshop-emptybox" v-if="storeOrderList.length<=0">
-            <u-empty :src="$apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="当前时间暂无订单数据" mode="list"></u-empty>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="当前时间暂无订单数据" mode="list"></u-empty>
         </view>
 
         <!-- 更多 -->
@@ -175,6 +193,11 @@
                         id: 1,
                         title: '全部',
                         type: 'status'
+                    },
+                    {
+                        id: 2,
+                        title: '全部',
+                        type: 'receiptType'
                     }
                 ],
                 showCalendar: false, //日期选择
@@ -188,6 +211,7 @@
                 filter: {
                     date: 'all',
                     status: '0',
+                    receiptType: '0',
                     custom: []
                 },
                 dropDown: {
@@ -203,37 +227,21 @@
                         { title: '全部', value: '0', isChecked: false },
                         { title: '待付款', value: '1', isChecked: false },
                         { title: '待发货', value: '2', isChecked: false },
-                        { title: '待收货', value: '3', isChecked: true },
-                        { title: '待评价', value: '4', isChecked: true },
-                        { title: '已完成', value: '6', isChecked: true },
-                        { title: '已取消', value: '7', isChecked: true }
+                        { title: '待收货', value: '3', isChecked: false },
+                        { title: '待评价', value: '4', isChecked: false },
+                        { title: '已完成', value: '6', isChecked: false },
+                        { title: '已取消', value: '7', isChecked: false }
+                    ],
+                    receiptType: [
+                        { title: '全部', value: '0', isChecked: false },
+                        { title: '物流快递', value: '1', isChecked: false },
+                        { title: '同城配送', value: '2', isChecked: false },
+                        { title: '门店自提', value: '3', isChecked: true },
                     ]
                 },
                 loadStatus: 'loadmore', //loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
                 currentPage: 1,
                 lastPage: 1,
-                icons: [{
-                    name: '提货单列表',
-                    icon: 'cuIcon-pick text-red',
-                    router: '/pages/member/merchant/takeDelivery/list'
-
-                },
-                {
-                    name: '提货单核销',
-                    icon: 'cuIcon-qr_code text-orange',
-                    router: '/pages/member/merchant/takeDelivery/index'
-                },
-                {
-                    name: '服务券列表',
-                    icon: 'cuIcon-list text-yellow',
-                    router: '/pages/member/merchant/serviceVerification/list'
-
-                },
-                {
-                    name: '核验服务券',
-                    icon: 'cuIcon-qr_code text-green',
-                    router: '/pages/member/merchant/serviceVerification/index'
-                }],
             };
         },
         computed: {},
@@ -310,6 +318,7 @@
                     dateType: that.filter.date,
                     date: that.filter.custom,
                     status: that.filter.status,
+                    receiptType: that.filter.receiptType,
                     page: that.currentPage,
                     limit: 10,
                     storeId: that.storeId
@@ -362,6 +371,9 @@
                 if (this.cancelType == 'status') {
                     this.cancelTypeList[1].title = title;
                 }
+                if (this.cancelType == 'receiptType') {
+                    this.cancelTypeList[2].title = title;
+                }
                 this.filter[this.cancelType] = val;
                 this.storeOrderList = [];
                 this.currentPage = 1;
@@ -373,5 +385,5 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../../../static/style/merchant.scss';
+    @import 'index.scss';
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/index.vue
index 742436e0157fe733d5efdb537618c9ecbf2bdf39..23c00504fe6ee9e51c6d75280ccc9726b9867d2b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/index.vue
@@ -3,20 +3,16 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="核销服务码"></u-navbar>
         <view class="content">
-
-            <view class="u-padding-15 u-margin-bottom-15 bg-white u-border-bottom">
+            <view class="u-padding-15 u-margin-bottom-15 coreshop-bg-white u-border-bottom">
                 <u-search placeholder="请输入完整服务券核销码" v-model="key" :show-action="true" action-text="搜索" :animation="false" @search="search" @custom="search"></u-search>
             </view>
-
             <button class="floatingButton" hover-class="none" @click="Qrcode">
                 <u-icon name="scan" color="#e54d42" size="60"></u-icon>
             </button>
-
             <view v-if="isShow">
                 <checkbox-group @change="checkboxChange">
 
-
-                    <view class="order" :class="ticket.status>0?' grayscale':''">
+                    <view class="orderList" :class="ticket.status>0?' grayscale':''">
                         <view class="top">
                             <view class="left">
                                 <u-icon name="order" :size="30" color="rgb(94,94,94)"></u-icon>
@@ -39,12 +35,12 @@
                                 <view class="delivery-time">服务券状态：{{ ticket.statusStr }}</view>
                             </view>
                         </view>
-                        <view class="bottom" v-if="ticket.validityStartTime && ticket.validityEndTime">
+                        <view class="bottom u-margin-0" v-if="ticket.validityStartTime && ticket.validityEndTime">
                             <view class="u-font-xs">
                                 可核销时间：{{ticket.validityStartTime}} 至 {{ticket.validityEndTime}}
                             </view>
                         </view>
-                        <view class="bottom">
+                        <view class="bottom u-margin-0">
                             <view class="more u-font-xs" v-if="ticket.createTime && ticket.status>0">
                                 下单时间：{{ $u.timeFormat(ticket.createTime, 'mm-dd hh:MM:ss') }}
                             </view>
@@ -65,7 +61,7 @@
             </view>
             <!-- 无数据时默认显示 -->
             <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="未查询到数据" mode="list"></u-empty>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="未查询到数据" mode="list"></u-empty>
             </view>
 
             <view class="coreshop-bottomBox" v-if="isShow">
@@ -179,7 +175,7 @@
             //去核销
             write() {
                 let _this = this;
-                this.$common.modelShow('提示', '您确认核销吗？', function (res) {
+                this.$common.modelShow('提示', '您确认核销吗？', res => {
                     //去核销
                     let data = {
                         id: _this.checkedIds.join()
@@ -214,5 +210,4 @@
 
 
 <style scoped lang="scss">
-    .order .bottom { margin-top: 20rpx; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/list.vue
index 97889b97eaa429886b794ca6c5ab55f096b19db7..1f0c72fea69ff86f6877125da5a4aa7ed0986e13 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/list.vue
@@ -3,14 +3,14 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="已核销服务码"></u-navbar>
         <view v-if="logs.length>0">
-            <view class="order" v-for="(item, key) in logs" :key="key">
+            <view class="orderList" v-for="(item, key) in logs" :key="key">
                 <view class="top">
                     <view class="left">
                         <u-icon name="order" :size="30" color="rgb(94,94,94)"></u-icon>
-                        <view class="store">订单编号：{{item.ticket.serviceOrderId}}</view>
+                        <view class="u-margin-left-20 u-margin-right-20 u-font-md">订单编号：{{item.ticket.serviceOrderId}}</view>
                     </view>
                     <view class="right">
-                        <button class="cu-btn sm line-black" @click="doCopyData(item.ticket.redeemCode)">复制核销码</button>
+                        <u-tag text="复制核销码" type="success" size="mini" @click="doCopyData(item.ticket.redeemCode)" />
                     </view>
                 </view>
                 <view class="item" v-if="item.service">
@@ -18,15 +18,15 @@
                     <view class="content">
                         <view class="title u-line-2">{{item.service.title}}</view>
                         <view class="type u-line-2">{{item.service.description}}</view>
-                        <view class="delivery-time">核销时间：{{item.ticket.verificationTime}}</view>
-                        <view class="delivery-time">核销码：{{item.ticket.redeemCode}}</view>
+                        <view class="success u-font-24 u-margin-top-10  u-margin-bottom-10 coreshop-text-yellow">核销时间：{{item.ticket.verificationTime}}</view>
+                        <view class="success u-font-24 u-margin-top-10  u-margin-bottom-10 coreshop-text-yellow">核销码：{{item.ticket.redeemCode}}</view>
                     </view>
                 </view>
-                <view class="bottom">
+                <view class="bottom u-margin-0">
                     <view class="more">
                         下单时间：{{ $u.timeFormat(item.ticket.createTime, 'mm-dd hh:MM:ss') }}
                     </view>
-                    <view class='logistics coreshop-btn' hover-class="btn-hover" @click="logsDel(item.id)">删除</view>
+                    <view class='logistics coreshop-btn' @click="logsDel(item.id)">删除</view>
                 </view>
             </view>
             <!-- 更多 -->
@@ -34,7 +34,7 @@
         </view>
         <!-- 无数据时默认显示 -->
         <view class="coreshop-emptybox" v-else>
-            <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="暂无已核销服务码记录" mode="list"></u-empty>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="暂无已核销服务码记录" mode="list"></u-empty>
         </view>
 
     </view>
@@ -90,7 +90,7 @@
             //删除
             logsDel(id) {
                 let _this = this
-                _this.$common.modelShow('提示', '删除核验单后将无法找回！').then(res => {
+                _this.$common.modelShow('提示', '删除核验单后将无法找回！', res => {
                     let data = {
                         'id': id
                     }
@@ -115,7 +115,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .order .top .left .store { margin: 0 10rpx; font-size: 28rpx; font-weight: bold; }
-    .order .item .content .delivery-time { color: #e5d001; font-size: 24rpx; margin: 10rpx 0; }
-    .order .bottom { margin-top: 0; }
+
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/storeList/storeList.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/storeList/storeList.scss
new file mode 100644
index 0000000000000000000000000000000000000000..b1146f5e7ae12a1f47ef9a1ba6efaaed6dad12cf
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/storeList/storeList.scss
@@ -0,0 +1,11 @@
+/*门店列表*/
+.store-item { padding: 0 30rpx; height: 180rpx; background-color: #fff; border-bottom: 1rpx solid rgba(223, 223, 223, 0.6); width: 100%;
+    .img-box { width: 100rpx; height: 100rpx; border-radius: 6rpx; overflow: hidden; margin-right: 20rpx;
+        .store-img { width: 100rpx; height: 100rpx; border-radius: 6rpx; }
+    }
+    .store-title { font-size: 30rpx; font-family: PingFang SC; font-weight: 600; color: rgba(52, 52, 52, 1); margin-bottom: 10rpx; }
+    .store-content { font-size: 24rpx; font-family: PingFang SC; font-weight: 400; color: rgba(102, 102, 102, 1); }
+}
+.foot_box { height: 100rpx; background: rgba(255, 255, 255, 1); padding: 0 20rpx;
+    .save-btn { width: 710rpx; height: 80rpx; background: linear-gradient(90deg, #2eae9c, #6cc29f); border: 1rpx solid rgba(238, 238, 238, 1); font-size: 30rpx; font-family: PingFang SC; font-weight: 500; color: rgba(255, 255, 255, 1); padding: 0; border-radius: 40rpx; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/storeList/storeList.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/storeList/storeList.vue
index 86c53e9e368366230503a18acfd71f86af6eb718..567db044ec1872bca03457b3676fcf092b40d5e1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/storeList/storeList.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/storeList/storeList.vue
@@ -1,24 +1,30 @@
 <!-- 门店列表 -->
 <template>
-    <view class="page_box store-list-wrap">
+    <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="选择门店"></u-navbar>
-        <view class="content_box">
-            <label v-for="store in storeList" :key="store.id" @tap="selStore(store.id)">
-                <view class="store-item x-bc">
-                    <view class="x-f">
-                        <view class="img-box"><image class="store-img" :src="store.logoImage" mode="aspectFill" lazy-load></image></view>
-                        <view class="item-left y-start">
-                            <text class="store-title">{{ store.storeName }}</text>
-                            <text class="store-content">{{ store.address }}</text>
-                        </view>
+        <label v-for="store in storeList" :key="store.id" @tap="selStore(store.id)">
+            <view class="store-item u-flex u-row-between">
+                <view class="coreshop-flex coreshop-align-center">
+                    <view class="img-box"><image class="store-img" :src="store.logoImage" mode="aspectFill" lazy-load></image></view>
+                    <view class="item-left coreshop-flex coreshop-flex-direction coreshop-align-start">
+                        <text class="store-title">{{ store.storeName }}</text>
+                        <text class="store-content">{{ store.address }}</text>
                     </view>
-
-                    <radio style="transform: scale(0.7);" class="orange" :checked="storeId == store.id" :class="{ checked: storeId == store.id }"></radio>
                 </view>
-            </label>
+
+                <radio style="transform: scale(0.7);" class="orange" :checked="storeId == store.id" :class="{ checked: storeId == store.id }"></radio>
+            </view>
+        </label>
+
+        <view class="coreshop-bg-white coreshop-card-hight-box" />
+
+        <!--底部-->
+        <view class="coreshop-foot-hight-view" />
+        <view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom u-text-center u-padding-20">
+            <u-button class='coreshop-bg-red' type="success" size="default"  @click="saveStore">确认</u-button>
         </view>
-        <view class="foot_box x-c"><button class="cu-btn save-btn" @tap="saveStore">确认</button></view>
+
     </view>
 </template>
 
@@ -81,5 +87,5 @@
 
 
 <style lang="scss" scoped>
-    @import '../../../../static/style/merchant.scss';
+    @import "storeList.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue
index e618fbc582aa4829e9574aabfb925f0ec09cb871..6cb58556c78d62ab85d0b9bdf40d63018b3b54f0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/index.vue
@@ -1,10 +1,10 @@
 <template>
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar title="提货核销"></u-navbar>
+        <u-navbar title="提货单核销"></u-navbar>
         <view class="content">
 
-            <view class="u-padding-15 u-margin-bottom-15 bg-white u-border-bottom">
+            <view class="u-padding-15 u-margin-bottom-15 coreshop-bg-white u-border-bottom">
                 <u-search placeholder="请输入完整提货单号、订单号、提货手机号" v-model="key" :show-action="true" action-text="搜索" :animation="false" @search="search" @custom="search"></u-search>
             </view>
 
@@ -14,12 +14,12 @@
 
             <view v-if="allData.length">
                 <checkbox-group @change="checkboxChange">
-                    <view class="order" :class="item.status?' grayscale':''" v-for="(item, index) in allData" :key="index">
+                    <view class="orderList" :class="item.status?' grayscale':''" v-for="(item, index) in allData" :key="index">
                         <view class="top">
                             <view class="left">
                                 <u-icon name="order" :size="30" color="rgb(94,94,94)"></u-icon>
                                 <view class="store">订单号：{{item.orderId}}</view>
-                                <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
+                                <!--<u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>-->
                             </view>
                             <view class="right">{{item.statusName}}</view>
                         </view>
@@ -36,7 +36,7 @@
                                 <view class="number">x{{ v.nums }}</view>
                             </view>
                         </view>
-                        <view class="bottom">
+                        <view class="bottom u-margin-top-20">
                             <view class="more u-font-xs" v-if="item.status">
                                 下单时间：{{ $u.timeFormat(item.createTime, 'mm-dd hh:MM:ss') }}
                             </view>
@@ -57,7 +57,7 @@
             </view>
             <!-- 无数据时默认显示 -->
             <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="未查询到数据" mode="list"></u-empty>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="未查询到数据" mode="list"></u-empty>
             </view>
 
             <view class="coreshop-bottomBox" v-if="allData.length">
@@ -228,5 +228,4 @@
 </script>
 
 <style scoped lang="scss">
-    .order .bottom { margin-top: 20rpx; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue
index b8715fc34492eafbeb393a2044f391fceac5021d..1ab1bfa2369dfea87b0e9320e6b176a0626c3a3b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/takeDelivery/list.vue
@@ -1,15 +1,14 @@
 <template>
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <u-navbar title="已核销提货单"></u-navbar>
+        <u-navbar title="提货单列表"></u-navbar>
         <view v-if="ladingList.length>0">
-            <view class="order" :class="item.status?' grayscale':''" v-for="(item, orderIndex) in ladingList" :key="orderIndex">
+            <view class="orderList" :class="item.status?' grayscale':''" v-for="(item, orderIndex) in ladingList" :key="orderIndex">
                 <view class="top">
                     <view class="left" @click="doCopyData(item.id)">
                         <u-icon name="tags" :size="30" color="rgb(94,94,94)"></u-icon>
-                        <view class="store">提货码：{{item.id}}</view>
-                        <button class="cu-btn sm line-black">复制</button>
-                        <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
+                        <view class="u-margin-left-20 u-margin-right-20 u-font-md ">提货码：{{item.id}}</view>
+                        <u-tag text="复制" type="success" size="mini" />
                     </view>
                     <view class="right">{{item.statusName}}</view>
                 </view>
@@ -18,19 +17,19 @@
                     <view class="content">
                         <view class="title u-line-2">{{v.name}}</view>
                         <view class="type u-line-2">{{v.addon}}</view>
-                        <view class="delivery-time">订单号：{{v.orderId}}</view>
+                        <view class="success u-font-24 u-margin-top-10  u-margin-bottom-10 coreshop-text-yellow">订单号：{{v.orderId}}</view>
                     </view>
                     <view class="right">
                         <view class="price">￥{{ v.price }}</view>
                         <view class="number">x{{ v.nums }}</view>
                     </view>
                 </view>
-                <view class="bottom">
+                <view class="bottom u-margin-0">
                     <view class="more">
                         下单时间：{{ $u.timeFormat(item.createTime, 'mm-dd hh:MM:ss') }}
                     </view>
-                    <view class='logistics coreshop-btn' hover-class="btn-hover" v-if="item.status == true" @click="ladingDel(item.id)">删除</view>
-                    <view class='evaluate coreshop-btn' hover-class="btn-hover" v-if="item.status == false" @click="ladingWrite(item.id)">提货单核销</view>
+                    <view class='logistics coreshop-btn' v-if="item.status == true" @click="ladingDel(item.id)">删除</view>
+                    <view class='evaluate coreshop-btn' v-if="item.status == false" @click="ladingWrite(item.id)">提货单核销</view>
                 </view>
             </view>
             <!-- 更多 -->
@@ -38,7 +37,7 @@
         </view>
         <!-- 无数据时默认显示 -->
         <view class="coreshop-emptybox" v-else>
-            <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="暂无已核销提货单记录" mode="list"></u-empty>
+            <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="暂无已核销提货单记录" mode="list"></u-empty>
         </view>
 
     </view>
@@ -95,18 +94,20 @@
             },
             //提货单核销
             ladingWrite(id) {
-                this.$u.route('/pages/member/takeDelivery/index?id=' + id);
+                this.$u.route('/pages/member/merchant/takeDelivery/index?id=' + id);
             },
             //删除
             ladingDel(id) {
                 let _this = this
-                this.$common.modelShow('提示', '删除提货单后将无法找回！').then(res => {
+                this.$common.modelShow('提示', '删除提货单后将无法找回！', res => {
                     let data = {
                         'id': id
                     }
                     _this.$u.api.ladingDel(data).then(res => {
                         _this.$refs.uToast.show({
                             title: res.msg, type: 'success', callback: function () {
+                                _this.page = 1;
+                                _this.ladingList = [];
                                 _this.getLadingList();
                             }
                         })
@@ -125,8 +126,4 @@
 </script>
 
 <style lang="scss" scoped>
-    .cu-btn.sm { padding: 0 10rpx; font-size: 20rpx; height: 38rpx; }
-    .order .top .left .store { margin: 0 10rpx; font-size: 28rpx; font-weight: bold; }
-    .order .item .content .delivery-time { color: #e5d001; font-size: 24rpx; margin: 10rpx 0; }
-    .order .bottom { margin-top: 0; }
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.scss
new file mode 100644
index 0000000000000000000000000000000000000000..d3fbdc14b99778613f70549934e5f77fe834df6a
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.scss
@@ -0,0 +1,2 @@
+.delivery-box { padding: 20rpx 0rpx 20rpx 0rpx; }
+.coreshop-cell-group .coreshop-cell-item .coreshop-cell-item-ft .coreshop-cell-ft-view { position: relative; overflow: hidden; color: #666; font-size: 24rpx; text-align: left; white-space: nowrap; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/orderdetail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
similarity index 52%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/order/orderdetail.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
index 18242874c116fe472a3b15e694b9e7e3646e74fc..aa2793eb52bd957d4859be21216846e13d6598aa 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/orderdetail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue
@@ -4,87 +4,72 @@
         <u-navbar title="订单详情"></u-navbar>
 
         <!--步骤条区域-->
-        <view class="bg-white padding solid-top" v-if="basics < 9">
+        <view class="coreshop-bg-white u-padding-20" v-if="basics < 9">
             <!--步骤条-->
-            <view class="cu-steps" v-if="basics < 5">
-                <block v-for="(item,index) in basicsList" :key="index">
-                    <view class="cu-item" :class="index>basics?'':'select'">
-                        <view class="icon-view" v-if="index>basics">
-                            <text class="text-red" :class="'cuIcon-' + item.cuIcon"></text>
-                        </view>
-                        <view class="bg-red icon-view" v-else>
-                            <text :class="'cuIcon-' + item.cuIcon"></text>
-                        </view>
-                        <view class="text-sm text-black" v-if="index>basics">{{item.name}}</view>
-                        <view class="text-sm text-black" v-else>{{item.name_s}}</view>
-                    </view>
-                </block>
-            </view>
+            <u-steps :list="numList" active-color="#fa3534" :current="basics" mode="number" v-if="basics < 5"></u-steps>
 
             <!--提示-->
-            <view class="text-sm text-center margin-top" v-if="basics == 0">
-                <view class="text-black">拍下成功，待买家支付。</view>
-                <view class="text-black">
-                    <text class="text-red">拍下{{orderCancelTime}}分后</text>
+            <view class="u-font-sm u-text-center u-margin-top-30" v-if="basics == 0">
+                <view class="coreshop-text-black">拍下成功，待买家支付。</view>
+                <view class="coreshop-text-black">
+                    <text class="coreshop-text-red">拍下{{orderCancelTime}}分后</text>
                     <text>未支付，自动取消订单。</text>
                 </view>
             </view>
-            <view class="text-sm text-center margin-top" v-if="basics == 1">
-                <view class="text-black">支付成功，待卖家发货.</view>
+            <view class="u-font-sm u-text-center u-margin-top-30" v-if="basics == 1">
+                <view class="coreshop-text-black">支付成功，待卖家发货.</view>
             </view>
-            <view class="text-sm text-center margin-top" v-if="basics == 2">
-                <view class="text-black">已发货，快递正在路上，务必在收到商品后再确认收货。</view>
-                <view class="text-black">
-                    <text class="text-red">发货20天</text>
+            <view class="u-font-sm u-text-center u-margin-top-30" v-if="basics == 2">
+                <view class="coreshop-text-black">已发货，快递正在路上，务必在收到商品后再确认收货。</view>
+                <view class="coreshop-text-black">
+                    <text class="coreshop-text-red">发货20天</text>
                     <text>后将自动确认收货</text>
                 </view>
             </view>
-            <view class="text-sm text-center margin-top" v-if="basics == 3">
-                <view class="text-black">已收货，请您对此次购物体检进行评价。</view>
-                <view class="text-black">
-                    <text class="text-red">收货30天</text>
+            <view class="u-font-sm u-text-center u-margin-top-30" v-if="basics == 3">
+                <view class="coreshop-text-black">已收货，请您对此次购物体检进行评价。</view>
+                <view class="coreshop-text-black">
+                    <text class="coreshop-text-red">收货30天</text>
                     <text>后将自动评价</text>
                 </view>
             </view>
             <!--状态图标-->
-            <view class="bg-white padding solid-top text-center coreshop-status-img-view u-margin-top-20" v-if="basics == 4">
+            <view class="coreshop-bg-white u-padding-20 u-text-center coreshop-status-img-view u-margin-top-20" v-if="basics == 4">
                 <view class="are-img-view">
                     <image class="are-img" src="/static/images/common/are.png" mode="widthFix" />
                 </view>
-                <view class="text-sm text-black">交易成功，感谢您的评价</view>
+                <view class="u-font-sm coreshop-text-black">交易成功，感谢您的评价</view>
             </view>
             <!--状态图标-->
-            <view class="bg-white padding solid-top text-center coreshop-status-img-view u-margin-top-20" v-if="basics == 6">
+            <view class="coreshop-bg-white u-padding-20 u-text-center coreshop-status-img-view u-margin-top-20" v-if="basics == 6">
                 <view class="are-img-view">
                     <image class="are-img" src="/static/images/common/are.png" mode="widthFix" />
                 </view>
-                <view class="text-sm text-black">交易成功.期待下次服务。</view>
+                <view class="u-font-sm coreshop-text-black">交易成功.期待下次服务。</view>
             </view>
             <!--状态图标-->
-            <view class="bg-white padding solid-top text-center coreshop-status-img-view u-margin-top-20" v-if="basics == 7">
+            <view class="coreshop-bg-white u-padding-20 u-text-center coreshop-status-img-view u-margin-top-20" v-if="basics == 7">
                 <view class="are-img-view">
                     <image class="are-img" src="/static/images/common/arg.png" mode="widthFix" />
                 </view>
-                <view class="text-sm text-black">订单已取消</view>
+                <view class="u-font-sm coreshop-text-black">订单已取消</view>
             </view>
         </view>
 
-
-
         <!-- 团购分享拼单 -->
-        <view class="bg-white coreshop-card-box" v-if="orderInfo.orderType==2 && orderInfo.status != 3 && orderInfo.payStatus!=1">
+        <view class="coreshop-bg-white coreshop-card-box" v-if="orderInfo.orderType==2 && orderInfo.status != 3 && orderInfo.payStatus!=1">
             <view class="coreshop-card-view coreshop-address-view">
-                <view v-if="teamInfo.status==1" class="text-lg text-bold text-black">待拼团，还差{{ teamInfo.teamNums || ''}}人</view>
-                <view v-else-if="teamInfo.status==2" class="text-lg text-bold text-black">拼团成功，待发货</view>
-                <view v-else-if="teamInfo.status==3" class="text-lg text-bold text-black">拼团失败</view>
-                <view class="solid-line"></view>
-                <view class="cell-group margin-cell-group">
+                <view v-if="teamInfo.status==1" class="u-font-lg coreshop-text-bold coreshop-text-black">待拼团，还差{{ teamInfo.teamNums || ''}}人</view>
+                <view v-else-if="teamInfo.status==2" class="u-font-lg coreshop-text-bold coreshop-text-black">拼团成功，待发货</view>
+                <view v-else-if="teamInfo.status==3" class="u-font-lg coreshop-text-bold coreshop-text-black">拼团失败</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
+                <view class="coreshop-cell-group u-margin-top-20 u-margin-bottom-20">
                     <view class="group-swiper">
-                        <view class='cell-item' v-if="teamInfo.currentCount">
-                            <view class='cell-item-hd'>
+                        <view class='coreshop-cell-item' v-if="teamInfo.currentCount">
+                            <view class='coreshop-cell-item-hd'>
                                 <view class="user-head-img-c" v-for="(item, index) in teamInfo.list" :key="index">
                                     <view class="user-head-img-tip" v-if="item.recordId == teamInfo.teamId">拼主</view>
-                                    <image class="user-head-img cell-hd-icon have-none" :src='item.userAvatar' mode=""></image>
+                                    <image class="user-head-img coreshop-head-icon" :src='item.userAvatar' mode=""></image>
                                 </view>
                                 <view v-if="teamInfo.teamNums > 3">
                                     <view class="uhihn" v-for="n in 3" :key="n">?</view>
@@ -94,8 +79,8 @@
                                     <view class="uhihn" v-for="n in teamInfo.teamNums" :key="n">?</view>
                                 </view>
                             </view>
-                            <view class="cell-item-ft" v-if="teamInfo.status==1">
-                                <button class="cu-btn round bg-yellow sm" @click="goInvition()">邀请拼单</button>
+                            <view class="coreshop-cell-item-ft" v-if="teamInfo.status==1">
+                                <u-button type="success" size="mini"  @click="goInvition()">邀请拼单</u-button>
                             </view>
                         </view>
                     </view>
@@ -103,48 +88,48 @@
             </view>
         </view>
 
-
-
-
         <!--物流信息-->
-        <view class="bg-white coreshop-card-box" v-if="basics != 0 && !orderInfo.store">
+        <view class="coreshop-bg-white coreshop-card-box" v-if="basics != 0 && !orderInfo.store">
             <view class="coreshop-card-view coreshop-address-view">
-                <view class="text-lg text-bold text-black">物流信息</view>
-                <view class="solid-line"></view>
-                <view class="cu-list menu-avatar">
-                    <view class="cu-item">
-                        <view class="bg-grey icon-view">
-                            <text class="cuIcon-locationfill" />
-                        </view>
-                        <view class="content">
-                            <view class="text-black">
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black flex justify-between">
+                    物流信息
+                    <text class="u-font-sm">已发货，请注意查收</text>
+                </view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
+                <view class="wrap">
+                    <u-row gutter="16">
+                        <u-col span="1">
+                            <u-icon name="map-fill" size="38"></u-icon>
+                        </u-col>
+                        <u-col span="11">
+                            <view class="coreshop-text-black">
                                 <text>收货人：</text>
                                 <text>{{ orderInfo.shipName || ''}}</text>
-                                <text class="margin-left">{{ orderInfo.shipMobile || ''}}</text>
+                                <text class="u-margin-left-10 u-margin-right-10">{{  orderInfo.shipMobile || '' }}</text>
+                                <u-tag text="复制" type="success" mode="dark" @click="doCopyData(orderInfo.shipName + ' - ' + orderInfo.shipMobile + ' - ' + orderInfo.shipAreaName + orderInfo.shipAddress)" />
                             </view>
-                            <view class="text-gray text-sm flex">
-                                <view class="text-cut">{{ orderInfo.shipAreaName|| ''}} {{orderInfo.shipAddress || ''}}</view>
+                            <view class="coreshop-text-gray u-font-sm flex">
+                                <view class="u-line-2">{{ orderInfo.shipAreaName|| ''}} {{orderInfo.shipAddress || ''}}</view>
                             </view>
-                        </view>
-                    </view>
+                        </u-col>
+                    </u-row>
                 </view>
 
-                <view class="delivery" v-if="isDelivery">
-                    <view class="cell-item">
-                        <view class="cell-bd-view black-text">
-                            <text class="cell-bd-text">已发货，请注意查收</text>
+                <view class="coreshop-cell-group" v-if="isDelivery">
+                    <!--<view class="coreshop-cell-item">
+                        <view class="coreshop-cell-bd-view black-text">
+                            <text class="coreshop-cell-bd-text">已发货，请注意查收</text>
                         </view>
-                    </view>
-                    <view class='cell-item add-title-item' v-for="(v, k) in orderInfo.delivery" :key="k" @click="logistics(k)">
-                        <view class='cell-item-bd'>
-                            <view class="cell-bd-view">
-                                <text class="cell-bd-text">{{v.logiName|| ''}} : {{v.logiNo|| ''}}</text>
+                    </view>-->
+                    <view class='coreshop-cell-item delivery-box' v-for="(v, k) in orderInfo.delivery" :key="k" @click="logistics(k)">
+                        <view class='coreshop-cell-item-bd'>
+                            <view class="coreshop-cell-bd-view">
+                                <text class="coreshop-cell-bd-text">{{v.logiName|| ''}} : {{v.logiNo|| ''}}</text>
                             </view>
-
                         </view>
-                        <view class="cell-item-ft">
-                            <view class="cell-ft-view"> {{ v.createTime || ''}}</view>
-                            <text class="cuIcon-right icon" />
+                        <view class="coreshop-cell-item-ft">
+                            <view class="coreshop-cell-ft-view">{{ v.createTime || ''}}</view>
+                            <u-icon name="arrow-right-double u-margin-left-10"></u-icon>
                         </view>
                     </view>
                 </view>
@@ -152,59 +137,59 @@
             </view>
         </view>
 
-
         <!--提货信息-->
-        <view class="bg-white coreshop-card-box" v-if="orderInfo.store">
+        <view class="coreshop-bg-white coreshop-card-box" v-if="orderInfo.store">
             <view class="coreshop-card-view coreshop-order-view">
-                <view class="text-lg text-bold text-black">提货信息</view>
-                <view class="solid-line"></view>
-                <view class="text-black text-bold title-left-view u-margin-buttom-20">
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black">提货信息</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
+                <view class="coreshop-text-black coreshop-text-bold title-left-view u-margin-bottom-20">
                     <text>{{orderInfo.store.storeName|| ''}}</text>
                 </view>
 
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">门店电话</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{orderInfo.store.mobile|| '无'}}</text>
                     </view>
-                </view> <view class="text-black title-view">
+                </view> <view class="coreshop-text-black title-view">
                     <view class="title">门店地址</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text> {{orderInfo.store.address|| '无'}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">提货人信息</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{orderInfo.shipName|| ''}} - {{orderInfo.shipMobile|| ''}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="lading.status">
+                <view class="coreshop-text-black title-view" v-if="lading.status">
                     <view class="title">提货码：</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text class="red-price">{{lading.code|| ''}}</text>
                     </view>
                 </view>
-
             </view>
         </view>
 
         <!--商品信息-->
-        <view class="bg-white coreshop-card-box">
+        <view class="coreshop-bg-white coreshop-card-box">
             <view class="coreshop-card-view coreshop-shop-view">
-
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black">商品信息</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
                 <view class="goods-list-view" v-for="item in orderInfo.items" :key="item.id">
-                    <view class="cu-avatar radius" :style="[{backgroundImage:'url('+ item.imageUrl +')'}]" />
+                    <image class="coreshop-avatar radius" :src="item.imageUrl" mode="aspectFill"></image>
                     <view class="goods-info-view">
-                        <view class="text-black u-line-2" @click="goGoodsDetail(item.goodsId)" v-if="orderInfo.orderType == 1">{{ item.name }}</view>
-                        <view class="text-black u-line-2" @click="goPinTuanDetail(item.goodsId)" v-else-if="orderInfo.orderType == 2">{{ item.name }}</view>
-                        <view class="text-gray text-sm text-cut introduce" v-if="item.addon !== null">{{ item.addon || ''}}</view>
-                        <view class="text-cut tag-view">
-                            <!--<text class="cu-tag sm line-blue radius" v-if="item.promotionObj">{{ item.promotionObj.name}}</text>-->
-                            <text class="cu-tag line-blue sm radius" v-for="(v, k) in item.promotionList" :key="k"> {{ v.name || ''}}</text>
+                        <view class="coreshop-text-black u-line-2" @click="goGoodsDetail(item.goodsId)" v-if="orderInfo.orderType == 1">{{ item.name }}</view>
+                        <view class="coreshop-text-black u-line-2" @click="goPinTuanDetail(item.goodsId)" v-else-if="orderInfo.orderType == 2">{{ item.name }}</view>
+                        <view class="coreshop-text-gray u-font-sm u-line-1 introduce" v-if="item.addon">{{ item.addon}}</view>
+                        <view class="u-line-1 tag-view">
+                            <u-tag :text="v.name" type="success" size="mini" shape="circle" v-for="(v, k) in item.promotionList" :key="k" />
+                        </view>
+                        <view class="u-flex u-row-between coreshop-order-priceBox">
+                            <view class="coreshop-text-red coreshop-text-price u-font-lg">{{ item.price }}</view>
+                            <view class="coreshop-text-black u-font-sm coreshop-order-nums">数量：{{ item.nums }}</view>
                         </view>
-                        <view class="text-price text-red text-lg priceBox">{{ item.price }} <view class="text-black text-sm nums">× {{ item.nums }}</view></view>
-
                     </view>
                 </view>
 
@@ -214,20 +199,20 @@
 
 
         <!--发票信息-->
-        <view class="bg-white coreshop-card-box" v-if="orderInfo.invoice && orderInfo.invoice.type != 1">
+        <view class="coreshop-bg-white coreshop-card-box" v-if="orderInfo.invoice && orderInfo.invoice.type != 1">
             <view class="coreshop-card-view coreshop-order-view">
-                <view class="text-lg text-bold text-black">发票信息</view>
-                <view class="solid-line"></view>
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black">发票信息</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
 
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">发票抬头</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text> {{orderInfo.invoice.title|| '无'}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">发票税号</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{orderInfo.invoice.taxNumber|| '无'}}</text>
                     </view>
                 </view>
@@ -236,207 +221,206 @@
         </view>
 
 
-        <!--商品金额-->
-        <view class="bg-white coreshop-card-box">
+        <!--费用信息-->
+        <view class="coreshop-bg-white coreshop-card-box">
             <view class="coreshop-card-view coreshop-price-view">
-
-                <view class="text-black title-view" v-if="orderInfo.promotionObj && orderInfo.promotionObj.length > 0">
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black">费用信息</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
+                <view class="coreshop-text-black title-view" v-if="orderInfo.promotionObj && orderInfo.promotionObj.length > 0">
                     <view class="title">订单优惠</view>
-                    <view class="text-right">
-                        <text class="text-price" v-for="(item, key) in orderInfo.promotionObj" :key="key" v-show="item.type == 2">{{ item.name}}</text>
+                    <view class="u-text-right">
+                        <text class="coreshop-text-price" v-for="(item, key) in orderInfo.promotionObj" :key="key" v-show="item.type == 2">{{ item.name}}</text>
                     </view>
                 </view>
-
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">商品总额</view>
-                    <view class="text-right">
-                        <text class="text-price">{{ orderInfo.goodsAmount}}</text>
+                    <view class="u-text-right">
+                        <text class="coreshop-text-price">{{ orderInfo.goodsAmount}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">运费</view>
-                    <view class="text-right">
-                        <text class="margin-right-xs">+</text>
-                        <text class="text-price">{{ orderInfo.costFreight}}</text>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">+</text>
+                        <text class="coreshop-text-price">{{ orderInfo.costFreight}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.goodsDiscountAmount > 0">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.goodsDiscountAmount > 0">
                     <view class="title">商品优惠</view>
-                    <view class="text-right">
-                        <text class="margin-right-xs">-</text>
-                        <text class="text-price">{{ orderInfo.goodsDiscountAmount }}</text>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">-</text>
+                        <text class="coreshop-text-price">{{ orderInfo.goodsDiscountAmount }}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.pointMoney > 0">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.pointMoney > 0">
                     <view class="title">积分优惠</view>
-                    <view class="text-right">
-                        <text class="margin-right-xs">-</text>
-                        <text class="text-price">{{ orderInfo.pointMoney }}</text>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">-</text>
+                        <text class="coreshop-text-price">{{ orderInfo.pointMoney }}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.orderDiscountAmount > 0">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.orderDiscountAmount > 0">
                     <view class="title">订单优惠</view>
-                    <view class="text-right">
-                        <text class="margin-right-xs">-</text>
-                        <text class="text-price">{{ orderInfo.orderDiscountAmount }}</text>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">-</text>
+                        <text class="coreshop-text-price">{{ orderInfo.orderDiscountAmount }}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.couponDiscountAmount > 0">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.couponDiscountAmount > 0">
                     <view class="title">优惠券优惠</view>
-                    <view class="text-right">
-                        <text class="margin-right-xs">-</text>
-                        <text class="text-price">{{ orderInfo.couponDiscountAmount }}</text>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">-</text>
+                        <text class="coreshop-text-price">{{ orderInfo.couponDiscountAmount }}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.payStatus > 1">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.payStatus > 1">
                     <view class="title">支付方式</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.paymentName }}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.payStatus > 1">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.payStatus > 1">
                     <view class="title">支付时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.paymentTime}}</text>
                     </view>
                 </view>
-                <view class="text-black text-bold title-right-view">
-                    <text class="margin-right-xs">应付款：</text>
-                    <text class="text-price">{{ orderInfo.orderAmount}}</text>
+                <view class="coreshop-text-black coreshop-text-bold title-right-view">
+                    <text class="u-margin-right-20">应付款：</text>
+                    <text class="coreshop-text-price">{{ orderInfo.orderAmount}}</text>
                 </view>
 
-                <view class="solid-line"></view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
 
-                <button class="text-center text-black"  hover-class="none" open-type="contact" bindcontact="showChat" :session-from="kefupara">联系客服</button>
+                <view class="u-text-center coreshop-text-black">联系客服</view>
             </view>
         </view>
 
         <!--订单信息-->
-        <view class="bg-white coreshop-card-box">
+        <view class="coreshop-bg-white coreshop-card-box">
             <view class="coreshop-card-view coreshop-order-view">
-                <view class="text-lg text-bold text-black">订单信息（{{ orderInfo.globalStatusText || ''}}）</view>
-                <view class="solid-line"></view>
-                <view class="text-black title-view">
+                <view class="u-font-lg coreshop-text-bold coreshop-text-black">订单信息（{{ orderInfo.globalStatusText || ''}}）</view>
+                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
+                <view class="coreshop-text-black title-view">
                     <view class="title">订单编号</view>
-                    <view class="text-right" hover-class="btn-hover" @click="doCopyData(orderInfo.orderId)">
-                        <text class="margin-right-xs">{{ orderInfo.orderId || ''}}</text>
-                        <button class="cu-btn sm line-black">复制</button>
+                    <view class="u-text-right">
+                        <text class="u-margin-right-20">{{ orderInfo.orderId || ''}}</text>
+                        <u-tag text="复制" type="success" mode="dark" @click="doCopyData(orderInfo.orderId)" />
                     </view>
                 </view>
-                <view class="text-black title-view">
+                <view class="coreshop-text-black title-view">
                     <view class="title">订单类型</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>
                             {{ orderInfo.typeText || ''}}
                         </text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.paymentName && orderInfo.payStatus > 1">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.paymentName && orderInfo.payStatus > 1">
                     <view class="title">支付方式</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.paymentName || ''}} </text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="orderInfo.createTime">
+                <view class="coreshop-text-black title-view" v-if="orderInfo.createTime">
                     <view class="title">下单时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.createTime || ''}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="basics > 0 && orderInfo.paymentTime">
+                <view class="coreshop-text-black title-view" v-if="basics > 0 && orderInfo.paymentTime">
                     <view class="title">支付时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.paymentTime || ''}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="basics > 1 && delivery && delivery.createTime">
+                <view class="coreshop-text-black title-view" v-if="basics > 1 && delivery && delivery.createTime">
                     <view class="title">发货时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ delivery.createTime || ''}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="basics > 2 && orderInfo.confirmTime">
+                <view class="coreshop-text-black title-view" v-if="basics > 2 && orderInfo.confirmTime">
                     <view class="title">确认时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.confirmTime || ''}}</text>
                     </view>
                 </view>
-                <view class="text-black title-view" v-if="basics > 3 && orderInfo.updateTime">
+                <view class="coreshop-text-black title-view" v-if="basics > 3 && orderInfo.updateTime">
                     <view class="title" v-if="basics >= 7">取消时间</view>
                     <view class="title" v-else>完成时间</view>
-                    <view class="text-right">
+                    <view class="u-text-right">
                         <text>{{ orderInfo.updateTime || ''}}</text>
                     </view>
                 </view>
             </view>
         </view>
 
-        <view class="bg-white coreshop-card-hight-box" />
+        <view class="coreshop-bg-white coreshop-card-hight-box" />
 
         <!--为您推荐-->
-        <view class="coreshop-title-view" v-if="otherData.length>0">
-            <view class="flex flex-wrap">
-                <view class="basis-sm text-right">
+        <view class="coreshop-recommended-title-view" v-if="otherData.length>0">
+            <view class="u-flex u-flex-wrap">
+                <view class="u-flex-4 u-text-right">
                     <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
-                <view class="basis-xs text-center">
-                    <text class="text-black text-lg">为您推荐</text>
+                <view class="u-flex-4 u-text-center">
+                    <text class="coreshop-text-black u-font-lg">为您推荐</text>
                 </view>
-                <view class="basis-sm text-left">
+                <view class="u-flex-4 u-text-left">
                     <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
             </view>
         </view>
 
         <!--推荐列表-->
-        <view class="coreshop-recommend-goods-list-view" v-if="otherData.length>0">
-            <view class="flex flex-wrap">
-                <view class="basis-df padding-sm padding-right-xs" v-for="(item, index) in otherData" :key="index" @click="goGoodsDetail(item.id)">
-                    <view class="bg-white margin-bottom-sm list-itme">
-                        <view class="cu-avatar" :style="[{backgroundImage:'url('+ item.image +')'}]" />
-                        <view class="goods-info-view">
-                            <view class="text-cut text-black">{{item.name}}</view>
-                            <view class="text-price text-red text-lg">{{item.price}}</view>
-                            <view class="foot-box">
-                                <view class="text-gray text-sm address">{{item.buyCount}}人购买</view>
-                                <text class="cu-tag line-red sm radius">找相似</text>
-                            </view>
+        <view class="coreshop-goods-group" v-if="otherData.length>0">
+            <u-grid col="2" :border="false" :align="center">
+                <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in otherData" :key="index" @click="goGoodsDetail(item.id)">
+                    <view class="good_box">
+                        <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
+                        <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
+                        <view class="good_title u-line-2">
+                            {{item.name}}
+                        </view>
+                        <view class="good-price">
+                            {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
+                        </view>
+                        <view class="good-tag-recommend" v-if="item.isRecommend">
+                            推荐
+                        </view>
+                        <view class="good-tag-hot" v-if="item.isHot">
+                            热门
                         </view>
                     </view>
-                </view>
-
-            </view>
+                </u-grid-item>
+            </u-grid>
         </view>
 
-        <!--底部-->
-        <view class="foot-hight-view" />
 
-        <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom" v-if="orderInfo.status == 1 || orderInfo.status == 2">
-            <button class='cu-btn line-black radius' hover-class="btn-hover" v-if="orderInfo.status == 1 && orderInfo.payStatus == 1 && orderInfo.shipStatus == 1" @click="cancelOrder(orderInfo.orderId)">取消订单</button>
-            <button class='cu-btn bg-red' hover-class="btn-hover" v-if="orderInfo.status == 1 && orderInfo.payStatus == 1" @click="goToPay(orderInfo.orderId)">立即支付</button>
-            <button class='cu-btn bg-red' hover-class="btn-hover" v-if="orderInfo.status == 1 && orderInfo.payStatus >= 2 && orderInfo.shipStatus >= 3 && orderInfo.confirmStatus == 1" @click="tackDeliery(orderInfo.orderId)">确认收货</button>
-            <button class='cu-btn bg-red' hover-class="btn-hover" v-if="orderInfo.status === 1 && orderInfo.payStatus >= 2 && orderInfo.shipStatus >= 3 && orderInfo.confirmStatus >= 2 && orderInfo.isComment == false" @click="toEvaluate(orderInfo.orderId)">立即评价</button>
-            <button class='cu-btn bg-red' hover-class="btn-hover" @click="customerService(orderInfo.orderId)" v-if="orderInfo.addAftersalesStatus">申请售后</button>
-            <button class='cu-btn bg-red' hover-class="btn-hover" @click="showCustomerService(orderInfo)" v-if="orderInfo.billAftersalesId && orderInfo.billAftersalesId != false">查看售后</button>
+        <!--底部-->
+        <view class="coreshop-foot-hight-view" />
+
+        <view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom u-text-center u-padding-top-10" v-if="orderInfo.status == 1 || orderInfo.status == 2">
+            <u-button class='u-margin-left-10 u-margin-right-10' type="warning" size="mini" v-if="orderInfo.status == 1 && orderInfo.payStatus == 1 && orderInfo.shipStatus == 1" @click="cancelOrder(orderInfo.orderId)">取消订单</u-button>
+            <u-button class='u-margin-left-10 u-margin-right-10' type="primary" size="mini" v-if="orderInfo.status == 1 && orderInfo.payStatus == 1" @click="goToPay(orderInfo.orderId)">立即支付</u-button>
+            <u-button class='u-margin-left-10 u-margin-right-10' type="success" size="mini" v-if="orderInfo.status == 1 && orderInfo.payStatus >= 2 && orderInfo.shipStatus >= 3 && orderInfo.confirmStatus == 1" @click="tackDeliery(orderInfo.orderId)">确认收货</u-button>
+            <u-button class='u-margin-left-10 u-margin-right-10' type="success" size="mini" v-if="orderInfo.status === 1 && orderInfo.payStatus >= 2 && orderInfo.shipStatus >= 3 && orderInfo.confirmStatus >= 2 && orderInfo.isComment == false" @click="toEvaluate(orderInfo.orderId)">立即评价</u-button>
+            <u-button class='u-margin-left-10 u-margin-right-10' type="default" size="mini" @click="customerService(orderInfo.orderId)" v-if="orderInfo.addAftersalesStatus">申请售后</u-button>
+            <u-button class='coreshop-bg-red u-margin-left-10 u-margin-right-10' size="mini" @click="showCustomerService(orderInfo)" v-if="orderInfo.billAftersalesId && orderInfo.billAftersalesId != false">查看售后</u-button>
         </view>
 
     </view>
 
 </template>
 <script>
-    import { orders, goods, tools } from '@/common/mixins/mixinsHelper.js'
+    import { orders, goods, tools } from '@/common/mixins/mixinsHelper.js';
     export default {
         mixins: [orders, goods, tools],
         data() {
             return {
+                numList: [{ name: '下单' }, { name: '付款' }, { name: '发货' }, { name: '收货' }, { name: '评价' }],
                 basics: 0,
-                basicsList: [
-                    { cuIcon: 'cartfill', name: '未拍下', name_s: '已拍下', nameId: 0 },
-                    { cuIcon: 'card', name: '待付款', name_s: '已付款', nameId: 1 },
-                    { cuIcon: 'deliver_fill', name: '待发货', name_s: '已发货', nameId: 2 },
-                    { cuIcon: 'formfill', name: '待收货', name_s: '已收货', nameId: 3 },
-                    { cuIcon: 'presentfill', name: '待评价', name_s: '已评价', nameId: 4 }
-                ],
                 delivery: {},//发货信息
                 orderId: 0,
                 orderInfo: {}, // 订单详情
@@ -591,7 +575,7 @@
                                     // 更改订单列表页的订单状态
                                     let pages = getCurrentPages(); // 当前页
                                     let beforePage = pages[pages.length - 2]; // 上个页面
-                                    if (beforePage !== undefined && beforePage.route === 'pages/member/order/orderlist') {
+                                    if (beforePage !== undefined && beforePage.route === 'pages/member/order/index/index') {
                                         // #ifdef MP-WEIXIN
                                         beforePage.$vm.isReload = true
                                         // #endif
@@ -613,7 +597,7 @@
             },
             // 申请售后
             customerService(id) {
-                this.$u.route('/pages/member/afterSales/index?orderId=' + id);
+                this.$u.route('/pages/member/afterSales/submit/submit?orderId=' + id);
             },
             //快递信息
             logistics(key) {
@@ -625,15 +609,15 @@
             //查看售后
             showCustomerService(info) {
                 if (info.aftersalesItem.length == 1) {
-                    this.$u.route('/pages/member/afterSales/detail?aftersalesId=' + info.billAftersalesId);
+                    this.$u.route('/pages/member/afterSales/detail/detail?aftersalesId=' + info.billAftersalesId);
                 } else if (info.aftersalesItem.length > 1) {
-                    this.$u.route('/pages/member/afterSales/list?orderId=' + info.orderId);
+                    this.$u.route('/pages/member/afterSales/list/list?orderId=' + info.orderId);
                 }
             },
             //邀请拼单
             goInvition() {
                 uni.navigateTo({
-                    url: '/pages/member/order/invitationGroup?orderId=' + this.orderInfo.orderId + '&closeTime=' + this.teamInfo.closeTime
+                    url: '/pages/member/order/invitationGroup/invitationGroup?orderId=' + this.orderInfo.orderId + '&closeTime=' + this.teamInfo.closeTime
                 })
             },
             //拼团信息
@@ -665,55 +649,10 @@
                         url: '/pages/member/invoice/index?id=' + this.orderInfo.invoice.id
                     });
                 }
-            },
-            //在线客服,只有手机号的，请自己替换为手机号
-            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
             }
         }
     }
 </script>
 <style lang="scss" scoped>
-    @import '../../../static/style/orderDetails.scss';
-
+    @import "detail.scss";
 </style>
\ No newline at end of file
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
new file mode 100644
index 0000000000000000000000000000000000000000..9eb9eac4bbd89d2e383df8f74422eb94defc8b0d
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.scss
@@ -0,0 +1,19 @@
+/*page { background: #fff; }*/
+.orderList { width: auto; }
+
+.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; }
+.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%; }
+.del { width: 30rpx !important; height: 30rpx !important; position: absolute; right: 0; top: 0; z-index: 999; }
+.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 */ }
+
+
+.coreshop-card-box { padding: 0; box-shadow: 0 0 14.54rpx #f1f1f1; }
+.coreshop-card-view { padding: 18.18rpx; box-shadow: none; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue
similarity index 75%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue
index 17b53c0da1e93f97ed2cbd6b56b090723e10d7b6..bb113d81352931f8210cfb6cf7869d87c0c66876 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/evaluate/evaluate.vue
@@ -3,14 +3,14 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="订单评价"></u-navbar>
         <view class="content">
-            <view class="content-top">
+            <view class="coreshop-content-top">
                 <view class='img-list'>
                     <view v-for="item in info.items" :key="item.id">
-                        <view class="bg-white coreshop-card-box u-margin-20">
+                        <view class="coreshop-bg-white coreshop-card-box u-margin-20">
                             <view class="coreshop-card-view coreshop-order-view">
-                                <view class="text-df text-bold text-black">商品信息</view>
-                                <view class="solid-line"></view>
-                                <view class="order">
+                                <view class="u-font-md coreshop-text-bold coreshop-text-black">商品信息</view>
+                                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
+                                <view class="orderList">
                                     <view class="item" @click="goGoodsDetail(item.goodsId)">
                                         <view class="left"><image :src="item.imageUrl && item.imageUrl!='null' ?  item.imageUrl : '/static/images/common/empty-banner.png'" mode="aspectFill"></image></view>
                                         <view class="content">
@@ -20,24 +20,22 @@
                                 </view>
                             </view>
                             <view class="coreshop-card-view coreshop-order-view">
-                                <view class="text-df text-bold text-black">商品评分</view>
-                                <view class="solid-line"></view>
+                                <view class="u-font-md coreshop-text-bold coreshop-text-black">商品评分</view>
+                                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
                                 <view>
                                     <u-rate v-model="score[item.id]" @change="changeScore"></u-rate>
                                 </view>
                             </view>
-
                             <view class="coreshop-card-view coreshop-order-view">
-                                <view class="text-df text-bold text-black">评价内容</view>
-                                <view class="solid-line"></view>
+                                <view class="u-font-md coreshop-text-bold coreshop-text-black">评价内容</view>
+                                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
                                 <view class="evaluate-c-t">
                                     <textarea v-model="textarea[item.id]" placeholder="宝贝满足你的期待吗? 说说你的使用心得" />
                                 </view>
                             </view>
-
                             <view class="coreshop-card-view coreshop-order-view">
-                                <view class="text-df text-bold text-black">上传图片（可上传{{maxUploadImg}}张）</view>
-                                <view class="solid-line"></view>
+                                <view class="u-font-md coreshop-text-bold coreshop-text-black">上传图片（可上传{{maxUploadImg}}张）</view>
+                                <u-line color="#eee" border-style="dashed" margin="20rpx 0" />
                                 <view class="evaluate-c-b">
                                     <view class="goods-img-item" v-if="images[item.id].length" v-for="(img, key) in images[item.id]" :key="key">
                                         <image class="del" src="/static/images/common/del.png" mode="" @click="removeImg(item.id, key)"></image>
@@ -53,18 +51,12 @@
                     </view>
                 </view>
             </view>
-
-            <view class="foot-hight-view" />
-
-            <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
-                <view class="flex padding-sm flex-direction">
-                    <button class="cu-btn bg-red" @click="toEvaluate" :disabled='submitStatus' :loading='submitStatus'>提交评论</button>
+            <view class="coreshop-foot-hight-view" />
+            <view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
+                <view class="u-padding-20">
+                    <u-button :custom-style="customStyle" type="error" size="medium" @click="toEvaluate" :disabled='submitStatus' :loading='submitStatus'>提交评论</u-button>
                 </view>
             </view>
-
-            <!--<view class="coreshop-bottomBox">
-                <button class="coreshop-btn coreshop-btn-square coreshop-btn-b" hover-class="btn-hover" @click="toEvaluate" :disabled='submitStatus' :loading='submitStatus'>提交评论</button>
-            </view>-->
         </view>
     </view>
 </template>
@@ -75,6 +67,9 @@
         mixins: [goods],
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 orderId: 0,
                 info: {}, // 订单详情
                 images: [],
@@ -108,21 +103,17 @@
                 this.$u.api.orderDetail(data).then(res => {
                     if (res.status && res.data.payStatus >= 2 && res.data.shipStatus >= 3 && res.data.confirmStatus >= 2 && res.data.isComment === false) {
                         const _info = res.data
-
                         let images = []
                         let textarea = []
                         let upload = []
                         let score = []
-
                         _info.items.forEach(item => {
                             images[item.id] = []
                             textarea[item.id] = ''
                             upload[item.id] = true
                             score[item.id] = 5
                         })
-
                         this.info = _info
-
                         this.images = images
                         this.textarea = textarea
                         this.score = score
@@ -186,30 +177,26 @@
                                 let pages = getCurrentPages(); // 当前页
                                 let beforePage = pages[pages.length - 2]; // 上个页面
 
-                                if (beforePage !== undefined && beforePage.route === 'pages/member/order/orderlist') {
+                                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/orderlist') {
+                                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
@@ -240,28 +227,6 @@
     }
 </script>
 
-<style lang="scss">
-
-    @import '../../../static/style/orderDetails.scss';
-
-
-    page { background: #fff; }
-    .order { width: auto; padding: 0; }
-        .order .item { margin: 0; }
-    .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; }
-    .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%; }
-    .del { width: 30rpx !important; height: 30rpx !important; position: absolute; right: 0; top: 0; z-index: 999; }
-    .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 */ }
-
-
-    .coreshop-card-box { padding: 0; box-shadow: 0 0 14.54rpx #f1f1f1; }
-    .coreshop-card-view { padding: 18.18rpx; box-shadow: none; }
+<style lang="scss" scoped>
+    @import "evaluate.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/expressDelivery/expressDelivery.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/expressDelivery/expressDelivery.scss
new file mode 100644
index 0000000000000000000000000000000000000000..7623253640427dec5e0429e39d4f50b8e58aaac4
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/expressDelivery/expressDelivery.scss
@@ -0,0 +1,6 @@
+.wrap { padding: 24rpx 24rpx 24rpx 40rpx;
+    .u-order-title { color: #333333; font-weight: bold; font-size: 32rpx; }
+    .u-order-title.unacive { color: rgb(150, 150, 150); }
+    .u-order-desc { color: rgb(150, 150, 150); font-size: 28rpx; margin-bottom: 6rpx; }
+    .u-order-time { color: rgb(200, 200, 200); font-size: 26rpx; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/expressDelivery.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/expressDelivery/expressDelivery.vue
similarity index 82%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/order/expressDelivery.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/order/expressDelivery/expressDelivery.vue
index e01c569f60c968349855b49f5c6f19db2b45bbc7..bea65c19c26008c8ba82f8fc86fc5d6ea4a45ee0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/expressDelivery.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/expressDelivery/expressDelivery.vue
@@ -75,11 +75,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .wrap { padding: 24rpx 24rpx 24rpx 40rpx; }
-    .u-node { width: 44rpx; height: 44rpx; border-radius: 100rpx; display: flex; justify-content: center; align-items: center; background: #d0d0d0; }
-    .u-order-title { color: #333333; font-weight: bold; font-size: 32rpx; }
-        .u-order-title.unacive { color: rgb(150, 150, 150); }
-    .u-order-desc { color: rgb(150, 150, 150); font-size: 28rpx; margin-bottom: 6rpx; }
-    .u-order-time { color: rgb(200, 200, 200); font-size: 26rpx; }
-    .tel { color: $u-type-primary; }
+    @import "expressDelivery.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/orderlist.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
similarity index 71%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/order/orderlist.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
index 2f745e4a98749711d82e715370668e1db0246e71..cbefd884dc2c3b953f597cdc4b1ded610fe31141 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/orderlist.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/index/index.vue
@@ -2,13 +2,13 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="订单列表"></u-navbar>
-        <view class="wrap">
+        <view class="orderWrap">
             <view class="u-padding-0">
                 <u-subsection :list="tabs" :current="current" :animation="true" @change="onClickItem" active-color="#ff9900" mode="button"></u-subsection>
             </view>
 
             <view class="page-box" v-if="listData.length > 0">
-                <view class="order" v-for="(order, orderIndex) in listData" :key="orderIndex">
+                <view class="orderList" v-for="(order, orderIndex) in listData" :key="orderIndex">
                     <view class="top" @click="goOrderDetail(order.orderId)">
                         <view class="left">
                             <u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
@@ -41,12 +41,11 @@
                         <view class="more">
                             <u-tag :text="order.typeText" mode="light" />
                         </view>
-
-                        <view>
-                            <view class='logistics coreshop-btn' hover-class="btn-hover" @click="goOrderDetail(order.orderId)">查看详情</view>
-                            <view class='coreshop-btn exchange' hover-class="btn-hover" v-if="order.status === 1 && order.payStatus === 1" @click="goToPay(order.orderId)">立即支付</view>
-                            <view class='coreshop-btn exchange' hover-class="btn-hover" v-if="order.status === 1 && order.payStatus >= 2 && order.shipStatus >= 3 && order.confirmStatus === 1" @click="tackDelivery(current,orderIndex)">确认收货</view>
-                            <view class='evaluate coreshop-btn' hover-class="btn-hover" v-if="order.status === 1 && order.payStatus >= 2 && order.shipStatus >= 3 && order.confirmStatus >= 2 && order.isComment === false" @click="toEvaluate(order.orderId)">立即评价</view>
+                        <view class="u-flex">
+                            <view class='logistics coreshop-btn'  @click="goOrderDetail(order.orderId)">查看详情</view>
+                            <view class='coreshop-btn exchange'  v-if="order.status === 1 && order.payStatus === 1" @click="goToPay(order.orderId)">立即支付</view>
+                            <view class='coreshop-btn exchange'  v-if="order.status === 1 && order.payStatus >= 2 && order.shipStatus >= 3 && order.confirmStatus === 1" @click="tackDelivery(current,orderIndex)">确认收货</view>
+                            <view class='evaluate coreshop-btn'  v-if="order.status === 1 && order.payStatus >= 2 && order.shipStatus >= 3 && order.confirmStatus >= 2 && order.isComment === false" @click="toEvaluate(order.orderId)">立即评价</view>
                         </view>
                     </view>
                 </view>
@@ -54,16 +53,13 @@
             </view>
 
 
-            <!-- 空数据 -->
-            <view class="page-box" v-else>
-                <view>
-                    <view class="centre">
-                        <u-empty :src="$apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" mode="order" text="您还没有相关类别的订单"></u-empty>
-                        <navigator class="coreshop-btn" url="/pages/category/index/index" hover-class="btn-hover" open-type="switchTab">随便逛逛</navigator>
-                    </view>
-                </view>
+            <!-- 无数据时默认显示 -->
+            <view class="coreshop-emptybox" v-else>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="您还没有相关类别的订单" mode="list"></u-empty>
+                <navigator class="coreshop-btn" url="/pages/category/index/index"  open-type="switchTab">随便逛逛</navigator>
             </view>
 
+
         </view>
     </view>
 
@@ -231,32 +227,4 @@
     /* #ifndef H5 */
     page { height: 100%; background-color: #f2f2f2; }
     /* #endif */
-    .u-tabs { width: 100%; transition-property: background-color, color; }
-    .empty-view { width: 280rpx; height: 280rpx; border-radius: 280rpx; background-color: #F6F7F8; margin-top: 30rpx; }
-    .empty-img { width: 220rpx; height: 200rpx; margin: 40rpx; border-radius: 200rpx; }
-
-    .grace-order { background-color: #FFFFFF; padding: 20rpx; margin: 0 25rpx; border-radius: 10rpx; margin-top: 30rpx; width: 660rpx; }
-    .grace-shop { line-height: 60rpx; font-size: 28rpx; font-weight: bold; color: #333333; }
-    .grace-order-goods { font-size: 0; overflow: hidden; width: 660rpx; display: flex; flex-direction: row; flex-wrap: nowrap; align-items: center; padding-bottom: 20rpx; }
-    .grace-order-goods-img { width: 100rpx; height: 100rpx; }
-    .grace-order-goods-name { line-height: 40rpx; width: 100rpx; flex: auto; overflow: hidden; font-size: 26rpx; margin: 0 20rpx; color: #333333; }
-    .grace-order-goods-price { font-size: 30rpx; line-height: 50rpx; color: #333333; padding-left: 10rpx; font-weight: bold; }
-    .grace-order-goods-num { font-size: 22rpx; color: #999999; margin-left: 10rpx; }
-    .icon-close { font-size: 28rpx; color: #999999; margin-left: 30rpx; }
-    .grace-order-footer { margin-top: 2px; }
-    .grace-order-number { line-height: 50rpx; color: #999999; font-size: 26rpx; width: 100rpx; flex: auto; }
-    .grace-order-status { line-height: 50rpx; color: #999999; font-size: 26rpx; width: 100rpx; flex: auto; text-align: center; }
-    .grace-order-btn { display: block; width: 150rpx; height: 50rpx; line-height: 50rpx; color: #999999; font-size: 22rpx; text-align: center; border-radius: 60rpx; border: 1px solid #999999; margin-left: 20rpx; }
-    .grace-order-btn-red { border-color: #FF0036; color: #FF0036; }
-
-    .centre { text-align: center; margin: 200rpx auto; font-size: 32rpx; }
-        .centre image { width: 164rpx; height: 164rpx; border-radius: 50%; margin-bottom: 20rpx; }
-        .centre .tips { font-size: 24rpx; color: #999999; margin-top: 20rpx; }
-        .centre .coreshop-btn { margin: 80rpx auto; width: 200rpx; border-radius: 32rpx; line-height: 64rpx; color: #ffffff; font-size: 26rpx; background: linear-gradient(270deg, rgba(249, 116, 90, 1) 0%, rgba(255, 158, 1, 1) 100%); }
-    .wrap { display: flex; flex-direction: column; height: calc(100vh - var(--window-top)); width: 100%; }
-    .swiper-box { flex: 1; }
-    .swiper-item { height: 100%; }
-
-    .order .bottom { padding: 0; }
-        .order .bottom .coreshop-btn { margin: 0 10rpx; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.scss
new file mode 100644
index 0000000000000000000000000000000000000000..a9f68336dcade71c3d461b18171dacc2f7d05449
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.scss
@@ -0,0 +1,17 @@
+.ig-top-t {
+    & > view { display: inline-block; padding: 0 10upx; color: #999; }
+}
+.user-head-img-c { position: relative; width: 80upx; height: 80upx; border-radius: 50%; margin-right: 20upx; box-sizing: border-box; display: inline-block; border: 1px solid #f3f3f3;
+    .user-head-img { width: 100%; height: 100%; border-radius: 50%; }
+    &:first-child { border: 1px solid #ff7159; }
+    .user-head-img-tip { position: absolute; top: -6upx; left: -10upx; display: inline-block; background-color: #ff7159; color: #fff; font-size: 22upx; z-index: 98; padding: 0 10upx; border-radius: 10upx; transform: scale(.8); }
+}
+
+.no-head-icon { width: 80upx; height: 80upx; border-radius: 50%; display: inline-block; border: 2upx dashed #e1e1e1; text-align: center; color: #d1d1d1; font-size: 40upx; box-sizing: border-box; position: relative;
+    & > text { position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); }
+}
+
+.coreshop-cell-ft-text { max-width: 520upx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.group-notice {
+    .coreshop-cell-ft-text { color: #999; margin-left: 20upx; font-size: 26upx; }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue
similarity index 53%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue
index 3e687866e3a05da86d5e49a9e63ccdc4c914dee4..e1a4763b8e34cdf2980497208b550ddfe186ced2 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue
@@ -3,86 +3,86 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="邀请拼单"></u-navbar>
         <view class="content">
-            <view class="ig-top">
-                <view class="ig-top-t">
-                    <view class="">
-                        剩余： <u-count-down :timestamp="item.lastTime" separator="zh" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true" font-size="24" separator-size="24" @end="end(key)"></u-count-down>
-                    </view>
+            <view class="u-text-center coreshop-bg-white u-padding-20 u-flex u-flex-wrap">
+                <view class="ig-top-t u-margin-bottom-20 w100">
+                    剩余： <u-count-down :timestamp="teamInfo.lastTime" separator="zh" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true" font-size="24" separator-size="24" @end="end(key)"></u-count-down>
                 </view>
-                <view class="ig-top-m">
+                <view class="u-margin-bottom-20 w100 u-text-center u-flex u-flex-nowrap u-row-center">
                     <view class="user-head-img-c" v-for="(item, index) in teamInfo.list" :key="index">
                         <view class="user-head-img-tip" v-if="item.recordId == teamInfo.teamId">拼主</view>
-                        <image class="user-head-img cell-hd-icon have-none" :src='item.userAvatar' mode=""></image>
+                        <image class="user-head-img coreshop-head-icon" :src='item.userAvatar' mode=""></image>
                     </view>
-                    <view class="user-head-img-c uhihn" v-if="teamInfo.teamNums" v-for="n in teamInfo.teamNums" :key="n"><text>?</text></view>
+                    <view class="user-head-img-c no-head-icon" v-if="teamInfo.teamNums" v-for="n in teamInfo.teamNums" :key="n"><text>?</text></view>
                 </view>
-                <view class="ig-top-b">
-                    <view class="igtb-top">
-                        还差<text class="red-price">{{ teamInfo.teamNums }}</text>人，赶快邀请好友来拼单吧
+                <view class="u-margin-bottom-20 w100">
+                    <view class="u-font-32 coreshop-text-black u-margin-bottom-20">
+                        还差<text class="coreshop-text-red">{{ teamInfo.teamNums }}</text>人，赶快邀请好友来拼单吧
                     </view>
-                    <view class="igtb-mid">
-                        <button class="coreshop-btn" @click="goShare()">邀请好友拼单</button>
+                    <view class="u-margin-bottom-20">
+                        <u-button :custom-style="customStyle" type="success" size="medium" @click="goShare">邀请好友拼单</u-button>
                     </view>
-                    <view class="igtb-bot">
+                    <view class="u-font-24 coreshop-text-gray">
                         分享好友越多，成团越快
                     </view>
                 </view>
             </view>
-            <!-- 弹出层 -->
-            <lvv-popup position="bottom" 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 -->
+            <!-- 弹出层 -->
+            <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>
 
-            </lvv-popup>
-            <view class="cell-group margin-cell-group">
-                <view class='cell-item'>
-                    <view class='cell-item-hd'>
-                        <view class='cell-hd-title'>商品名称</view>
+            <view class="coreshop-cell-group u-margin-top-20 u-margin-bottom-20">
+                <view class='coreshop-cell-item'>
+                    <view class='coreshop-cell-item-hd'>
+                        <view class='coreshop-cell-hd-title'>商品名称</view>
                     </view>
-                    <view class='cell-item-ft'>
-                        <text class="cell-ft-text">{{ goodsInfo.name }}</text>
+                    <view class='coreshop-cell-item-ft'>
+                        <text class="coreshop-cell-ft-text">{{ goodsInfo.name }}</text>
                     </view>
                 </view>
-                <view class='cell-item'>
-                    <view class='cell-item-hd'>
-                        <view class='cell-hd-title'>拼单时间</view>
+                <view class='coreshop-cell-item'>
+                    <view class='coreshop-cell-item-hd'>
+                        <view class='coreshop-cell-hd-title'>拼单时间</view>
                     </view>
-                    <view class='cell-item-ft'>
-                        <text class="cell-ft-text">{{ orderInfo.createTime }}</text>
+                    <view class='coreshop-cell-item-ft'>
+                        <text class="coreshop-cell-ft-text">{{ orderInfo.createTime }}</text>
                     </view>
                 </view>
-                <view class='cell-item'>
-                    <view class='cell-item-hd'>
-                        <view class='cell-hd-title'>拼单须知</view>
+                <view class='coreshop-cell-item'>
+                    <view class='coreshop-cell-item-hd'>
+                        <view class='coreshop-cell-hd-title'>拼单须知</view>
                     </view>
-                    <view class='cell-item-ft group-notice'>
-                        <text class="cell-ft-text">* 好友拼单 </text>
-                        <text class="cell-ft-text">* 人满发货 </text>
-                        <text class="cell-ft-text">* 人不满退款 </text>
+                    <view class='coreshop-cell-item-ft group-notice'>
+                        <text class="coreshop-cell-ft-text">* 好友拼单 </text>
+                        <text class="coreshop-cell-ft-text">* 人满发货 </text>
+                        <text class="coreshop-cell-ft-text">* 人不满退款 </text>
                     </view>
                 </view>
             </view>
@@ -91,28 +91,24 @@
 </template>
 
 <script>
-    import lvvPopup from '@/components/corecms-lvv-popup/corecms-lvv-popup.vue';
-    import { get } from '@/common/utils/dbHelper.js';
-    import { apiBaseUrl } from '@/common/setting/constVarsHelper.js';
     // #ifdef H5
-    import shareByH5 from '@/components/corecms-share/shareByh5.vue'
+    import shareByH5 from '@/components/coreshop-share/shareByh5.vue'
     // #endif
     // #ifdef MP-WEIXIN
-    import shareByWx from '@/components/corecms-share/shareByWx.vue'
+    import shareByWx from '@/components/coreshop-share/shareByWx.vue'
     // #endif
     // #ifdef MP-ALIPAY
-    import shareByAli from '@/components/corecms-share/shareByAli.vue'
+    import shareByAli from '@/components/coreshop-share/shareByAli.vue'
     // #endif
     // #ifdef MP-TOUTIAO
-    import shareByTt from '@/components/corecms-share/shareByTt.vue'
+    import shareByTt from '@/components/coreshop-share/shareByTt.vue'
     // #endif
     // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import shareByApp from '@/components/corecms-share/shareByApp.vue'
+    import shareByApp from '@/components/coreshop-share/shareByApp.vue'
     // #endif
 
     export default {
         components: {
-            lvvPopup,
             // #ifdef H5
             shareByH5,
             // #endif
@@ -132,23 +128,18 @@
         },
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 shareType: 3,
                 goodsInfo: [],
                 teamInfo: [],
-
                 query: '', // query参数登录跳转回来使用
-
-                lasttime: {
-                    day: 0,
-                    hour: 0,
-                    minute: 0,
-                    second: 0
-                }, //购买倒计时
                 userToken: 0,
-                time: 0,
                 orderId: '',//订单号
                 orderInfo: {},
-                shareUrl: '/pages/share/jump/jump'
+                shareUrl: '/pages/share/jump/jump',
+                shareBox: false,
             }
         },
         onLoad(options) {
@@ -190,11 +181,11 @@
                 let pages = getCurrentPages()
                 let page = pages[pages.length - 1]
                 // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO
-                return apiBaseUrl + 'wap/' + page.route + '?scene=' + this.query;
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?scene=' + this.query;
                 // #endif
 
                 // #ifdef MP-ALIPAY
-                return apiBaseUrl + 'wap/' + page.__proto__.route + '?scene=' + this.query;
+                return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?scene=' + this.query;
                 // #endif
             }
         },
@@ -213,7 +204,8 @@
                             id: res.data.id, //拼团id
                             teamId: res.data.teamId, //拼团团队id
                             ruleId: res.data.ruleId,
-                            status: res.data.status
+                            status: res.data.status,
+                            lastTime: res.data.lastTime
                         };
                     } else {
                         this.$u.toast(res.msg)
@@ -268,10 +260,10 @@
             },
             // 跳转到h5分享页面
             goShare() {
-                this.$refs.share.show();
+                this.shareBox = true;
             },
             closeShare() {
-                this.$refs.share.close();
+                this.shareBox = false;
             },
             //获取分享URL
             getShareUrl() {
@@ -327,20 +319,5 @@
 </script>
 
 <style lang="scss" scoped>
-    .ig-top { text-align: center; background-color: #fff; padding: 20upx 26upx; }
-    .ig-top-t,
-    .ig-top-m { margin-bottom: 20upx; }
-        .ig-top-t > view { display: inline-block; padding: 0 10upx; color: #999; }
-    .user-head-img-c { position: relative; width: 80upx; height: 80upx; border-radius: 50%; margin-right: 20upx; box-sizing: border-box; display: inline-block; border: 1px solid #f3f3f3; }
-    .user-head-img-tip { position: absolute; top: -6upx; left: -10upx; display: inline-block; background-color: #FF7159; color: #fff; font-size: 22upx; z-index: 98; padding: 0 10upx; border-radius: 10upx; transform: scale(.8); }
-    .user-head-img-c .user-head-img { width: 100%; height: 100%; border-radius: 50%; }
-    .user-head-img-c:first-child { border: 1px solid #FF7159; }
-    .uhihn { width: 80upx; height: 80upx; border-radius: 50%; display: inline-block; border: 2upx dashed #e1e1e1; text-align: center; color: #d1d1d1; font-size: 40upx; box-sizing: border-box; position: relative; }
-        .uhihn > text { position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); }
-    .igtb-top { font-size: 32upx; color: #333; margin-bottom: 16upx; }
-    .igtb-mid { margin-bottom: 16upx; }
-        .igtb-mid .coreshop-btn { width: 100%; background-color: #FF7159; color: #fff; }
-    .igtb-bot { font-size: 24upx; color: #666; }
-    .cell-ft-text { max-width: 520upx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-    .group-notice .cell-ft-text { color: #999; margin-left: 20upx; font-size: 26upx; }
+    @import "invitationGroup.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.scss
new file mode 100644
index 0000000000000000000000000000000000000000..040359119e35436f5c761796cb06f7a37fa1a9bf
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.scss
@@ -0,0 +1,23 @@
+page { background: #f4f4f4; }
+.coreshop-list {
+    &.menu-avatar {
+        & > .coreshop-list-item { height: 180rpx; }
+    }
+}
+.taobao { background: white; padding: 30rpx 20rpx 30rpx 20rpx;
+    .ticket { display: flex; margin-top: 20rpx;
+        .left { width: 75%; padding: 30rpx 20rpx; background-color: #fff5f4; border-radius: 20rpx; border-right: dashed 2rpx #e0d7d3; display: flex;
+            .picture { width: 172rpx; border-radius: 20rpx; }
+            .introduce { margin-left: 10rpx;
+                .top { color: #ff9900; font-size: 28rpx;
+                    .big { font-size: 50rpx; font-weight: bold; margin-right: 10rpx; }
+                }
+                .type { font-size: 28rpx; color: #82848a; }
+                .date { margin-top: 10rpx; font-size: 20rpx; color: #82848a; }
+            }
+        }
+        .right { width: 25%; padding: 40rpx 10rpx; background-color: #fff5f4; border-radius: 20rpx; display: flex; align-items: center;
+            .use { height: auto; padding: 0 20rpx; font-size: 24rpx; border-radius: 40rpx; color: #ffffff !important; background-color: #ff9900 !important; line-height: 40rpx; color: #758ea5; margin: 0 auto; }
+        }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue
similarity index 64%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue
index 37452f46d2b73a314ec5d6abae73af4d58bd734f..c9c6a848f8952f25b0162f45a640546dc42a104c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue
@@ -2,33 +2,40 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="服务核销码"></u-navbar>
-        <view class="cu-list menu-avatar">
-            <view class="cu-item">
-                <view class="cu-avatar radius lg">
+        <view class="coreshop-list menu-avatar">
+            <view class="coreshop-bg-white u-padding-20 coreshop-solid-bottom">
+                <view class="u-line-1">{{ info.title }}</view>
+            </view>
+            <view class="coreshop-list-item">
+                <view class="coreshop-avatar radius lg">
                     <image class='services-img' :src="info.thumbnail" mode="widthFix"></image>
                 </view>
                 <view class="content">
                     <view>
-                        <view class="text-cut">{{ info.title }}</view>
-                    </view>
-                    <view class="text-gray text-sm flex">
-                        <view class="text-cut">{{ info.description }}</view>
                     </view>
-                    <view class="text-gray u-font-xs flex">
-                        兑换级别：
-                        <view v-if="info.allowedMemberships && info.allowedMemberships.length>0">
-                            <view class="cu-tag round bg-olive light sm" v-for="(item, index) in info.allowedMemberships" :key="index">{{item}}</view>
-                        </view>
-                    </view>
-                    <view class="text-gray u-font-xs flex">
-                        兑换门店：
-                        <view v-if="info.consumableStores && info.consumableStores.length>0">
-                            <view class="cu-tag round bg-orange light sm" v-for="(item, index) in info.consumableStores" :key="index">{{item}}</view>
-                        </view>
+                    <view class="coreshop-text-gray u-font-sm u-flex u-flex-nowrap">
+                        <view class="u-line-3">{{ info.description }}</view>
                     </view>
                 </view>
                 <view class="action" @click="goServicesDetail(info.id)">
-                    <view class="cu-tag round bg-blue light">服务详情</view>
+                    <u-button  size="mini">说明</u-button>
+                </view>
+            </view>
+            <view class="coreshop-bg-white u-padding-20 coreshop-solid-bottom">
+                <view class="coreshop-text-gray u-font-xs u-flex u-flex-nowrap u-padding-10">
+                    订单编号：
+                </view>
+                <view class="coreshop-text-gray u-font-xs u-flex u-flex-nowrap u-padding-10">
+                    兑换级别：
+                    <view v-if="info.allowedMemberships && info.allowedMemberships.length>0">
+                        <u-tag :text="item" mode="light" size="mini" class="u-margin-right-5" v-for="(item, index) in info.allowedMemberships" :key="index"/>
+                    </view>
+                </view>
+                <view class="coreshop-text-gray u-font-xs u-flex u-flex-nowrap u-padding-10">
+                    兑换门店：
+                    <view v-if="info.consumableStores && info.consumableStores.length>0">
+                            <view class="coreshop-bg-orange light sm  u-padding-4 u-margin-right-5" v-for="(item, index) in info.consumableStores" :key="index">{{item}}</view>
+                    </view>
                 </view>
             </view>
         </view>
@@ -148,21 +155,5 @@
 </script>
 
 <style lang="scss" scoped>
-
-    page { background: #f4f4f4; }
-    .cu-list.menu-avatar > .cu-item .action { width: 150rpx; text-align: center; }
-    .cu-list.menu-avatar > .cu-item { height: 210rpx; }
-
-    .taobao { background: white; padding: 30rpx 20rpx 20rpx; }
-
-        .taobao .ticket { display: flex; margin-top: 20rpx; }
-            .taobao .ticket .left { width: 75%; padding: 30rpx 20rpx; background-color: #fff5f4; border-radius: 20rpx; border-right: dashed 2rpx #e0d7d3; display: flex; }
-                .taobao .ticket .left .picture { width: 172rpx; border-radius: 20rpx; }
-                .taobao .ticket .left .introduce { margin-left: 10rpx; }
-                    .taobao .ticket .left .introduce .top { color: #ff9900; font-size: 28rpx; }
-                        .taobao .ticket .left .introduce .top .big { font-size: 50rpx; font-weight: bold; margin-right: 10rpx; }
-                    .taobao .ticket .left .introduce .type { font-size: 28rpx; color: #82848a; }
-                    .taobao .ticket .left .introduce .date { margin-top: 10rpx; font-size: 20rpx; color: #82848a; }
-            .taobao .ticket .right { width: 25%; padding: 40rpx 10rpx; background-color: #fff5f4; border-radius: 20rpx; display: flex; align-items: center; }
-                .taobao .ticket .right .use { height: auto; padding: 0 20rpx; font-size: 24rpx; border-radius: 40rpx; color: #ffffff !important; background-color: #ff9900 !important; line-height: 40rpx; color: #758ea5; margin: 0 auto; }
+    @import "details.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/index/index.vue
similarity index 60%
rename from CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/index.vue
rename to CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/index/index.vue
index aea1b845d86008300393f7b1371eba1675465e33..4dbe2801aa3d7aff8ac93d3959ce478c5fc13711 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/index/index.vue
@@ -3,32 +3,37 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="我购买的服务"></u-navbar>
         <view>
-            <view class="cu-list menu-avatar" v-if="list.length>0">
-                <view class="cu-item" v-for="(item, index) in list" :key="index" @click="goServicesUserDetail(item.serviceOrderId)">
-                    <view class="cu-avatar radius lg">
-                        <image class='services-img' :src="item.service.thumbnail" mode="widthFix"></image>
+            <view class="page-box" v-if="list.length > 0">
+                <view class="orderList" v-for="(item, index) in list" :key="index">
+                    <view class="top" @click="goServicesUserDetail(item.serviceOrderId)">
+                        <view class="left">
+                            <view class="store">订单号 : {{item.serviceOrderId}}</view>
+                        </view>
+                        <view class="right">{{ item.statusStr }}</view>
                     </view>
-                    <view class="content">
-                        <view>
-                            <view class="text-cut">{{ item.service.title }}</view>
-                            <view class="cu-tag round bg-orange sm">{{ item.statusStr }}</view>
+                    <view class="item">
+                        <view class="left"><image :src="item.service.thumbnail && item.service.thumbnail!='null' ?  item.service.thumbnail : '/static/images/common/empty-banner.png'" mode="aspectFill"></image></view>
+                        <view class="content">
+                            <view class="title u-line-2">{{item.service.title}}</view>
+                            <view class="type">{{item.service.description}}</view>
+                            <view class="delivery-time">下单时间：{{ $u.timeFormat(item.payTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
                         </view>
-                        <view class="text-gray text-sm flex">
-                            <view class="text-cut">{{ item.service.description }}</view>
+                    </view>
+                    <view class="bottom">
+                        <view class="more">
+                            <u-tag :text="item.statusStr" mode="light" />
                         </view>
-                        <view class="text-gray text-sm flex">
-                            <view class="text-cut">购买于：{{item.payTime}}</view>
+
+                        <view class="u-flex">
+                            <view class='coreshop-btn exchange' @click="goServicesUserDetail(item.serviceOrderId)">立即使用</view>
                         </view>
                     </view>
-                    <view class="action">
-                        <view class="cu-tag round bg-blue light">立即使用</view>
-                    </view>
                 </view>
                 <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
             </view>
             <!-- 无数据时默认显示 -->
             <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="暂无服务明细" mode="list"></u-empty>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/order.png'" icon-size="300" text="暂无购买的服务" mode="list"></u-empty>
             </view>
         </view>
     </view>
@@ -95,7 +100,4 @@
 </script>
 
 <style lang="scss">
-    page { background: #f4f4f4; }
-    .cu-list.menu-avatar > .cu-item .action { width: 150rpx; text-align: center; }
-    .cu-list.menu-avatar > .cu-item { height: 170rpx; }
 </style>
\ No newline at end of file
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 c90844a9113a7606ca0ae1dce3036a6ecfec66ca..7ec78c17092751357349d73b152f0861724fcaaf 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
@@ -3,71 +3,38 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="设置"></u-navbar>
 
-        <view class="cu-list menu sm-border">
-            <view class="cu-item arrow" @click="navigateToHandle('/pages/member/setting/userInfo/index')">
-                <view class="content">
-                    <text class="cuIcon-settings text-pink"></text>
-                    <text class="text-grey">个人资料</text>
-                </view>
-            </view>
+        <u-cell-group>
+            <u-cell-item icon="setting" title="个人资料" @click="navigateToHandle('/pages/member/setting/userInfo/index')"></u-cell-item>
             <!-- #ifdef MP-WEIXIN  -->
-            <view class="cu-item arrow" @click="syncWeChatInfo()">
-                <view class="content">
-                    <text class="cuIcon-refresh text-pink"></text>
-                    <text class="text-grey">同步微信昵称头像</text>
-                </view>
-            </view>
+            <u-cell-item icon="reload" title="同步微信昵称头像" @click="syncWeChatInfo()"></u-cell-item>
             <!-- #endif  -->
-            <view class="cu-item arrow" @click="navigateToHandle('/pages/member/setting/userInfo/password')">
-                <view class="content">
-                    <text class="cuIcon-warn text-green"></text>
-                    <text class="text-grey">修改密码</text>
-                </view>
-            </view>
-            <view class="cu-item arrow" @click="goAboutUs()">
-                <view class="content">
-                    <text class="cuIcon-btn text-green"></text>
-                    <text class="text-grey">关于我们</text>
-                </view>
-            </view>
-            <view class="cu-item arrow" @click="goUserAgreementPage()">
-                <view class="content">
-                    <text class="cuIcon-emojiflashfill text-pink"></text>
-                    <text class="text-grey">用户协议</text>
-                </view>
-            </view>
-            <view class="cu-item arrow" @click="goUserPrivacyPolicy()">
-                <view class="content">
-                    <text class="cuIcon-tagfill text-red  margin-right-xs"></text>
-                    <text class="text-grey">隐私政策</text>
-                </view>
-            </view>
-            <view class="cu-item" @click="clearCache">
-                <view class="content">
-                    <text class="cuIcon-circlefill text-grey"></text>
-                    <text class="text-grey">清除缓存</text>
-                </view>
-                <view class="action">
-                    <text class="cuIcon-delete text-grey" />
-                </view>
-            </view>
-        </view>
-
+            <u-cell-item icon="warning" title="修改密码" @click="navigateToHandle('/pages/member/setting/userInfo/password')"></u-cell-item>
+            <u-cell-item icon="tags" title="关于我们" @click="goAboutUs()"></u-cell-item>
+            <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="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom" @click="logOff">
-            <view class="flex padding-sm flex-direction">
-                <button class="cu-btn bg-red">退出登录</button>
+        <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>
             </view>
         </view>
-
     </view>
-
 </template>
 
 <script>
     import { commonUse, articles } from '@/common/mixins/mixinsHelper.js';
     export default {
+        data() {
+            return {
+                customStyle: {
+                    width: '100%',
+                }
+            }
+        },
         mixins: [commonUse, articles],
         methods: {
             navigateToHandle(pageUrl) {
@@ -138,6 +105,13 @@
                         url: '/pages/index/default/default'
                     })
                 })
+            },
+            // 切换账号
+            changeAccount() {
+                this.$common.modelShow('切换', '确认切换登录账号吗?', () => {
+                    this.$db.del('userToken')
+                    this.$u.route({url: '/pages/login/loginBySMS/loginBySMS',});
+                })
             }
         }
     }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/subscription/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/subscription/index.vue
index 2e60ddff2813f68b7499824b6084977e3a0f727d..5d0e2da955093f858fd3ebf217160c64a0cdda4d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/subscription/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/subscription/index.vue
@@ -3,14 +3,14 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="消息订阅"></u-navbar>
         <view class="content">
-            <view class="content-top">
-                <view class='cell-group right-img'>
-                    <view class='cell-item' v-for="(item, i) in msgList" :key="i" v-if="item.status">
-                        <view class='cell-item-hd'>
-                            <view class='cell-hd-title'>{{item.name}}</view>
+            <view class="coreshop-content-top">
+                <view class='coreshop-cell-group right-img'>
+                    <view class='coreshop-cell-item' v-for="(item, i) in msgList" :key="i" v-if="item.status">
+                        <view class='coreshop-cell-item-hd'>
+                            <view class='coreshop-cell-hd-title'>{{item.name}}</view>
                             <view class='cell-hd-desc'>{{item.desc}}</view>
                         </view>
-                        <view class='cell-item-ft'>
+                        <view class='coreshop-cell-item-ft'>
                             <view v-if="!item.is" class='subscription-btn' @click="subscription(item.func, item.tmpl)">添加通知</view>
                             <view v-if="item.is" class='subscription-btn isTrue' @click="subscription(item.func, item.tmpl)">已加通知</view>
                         </view>
@@ -135,8 +135,7 @@
 <style lang="scss" scoped>
     view { box-sizing: border-box; }
     .agreement { position: fixed; bottom: 30rpx; width: 100%; margin: 20rpx 0; text-align: center; }
-    .color-o { margin: 0 10rpx; }
-    .cell-hd-title { font-size: 30rpx; /* color: #000000; */ display: block; width: 180rpx; }
+    .coreshop-cell-hd-title { font-size: 30rpx; /* color: #000000; */ display: block; width: 180rpx; }
     .cell-hd-desc { font-size: 24rpx; /* display: block; */ width: 200rpx; color: #888888; /* margin-top: 50rpx; */ }
     .subscription-btn { background-color: #333333; color: #ffffff; padding: 0 20rpx; line-height: 46rpx; margin-right: 20rpx; border: 1px solid #333333; }
     .isTrue { background-color: #ffffff; border: 1px solid #333333; color: #333333; line-height: 46rpx; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/userInfo/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/userInfo/index.vue
index 7af32abd53109e48670de54c81b264a2010e94a2..8e9627814daf9995a11273e27c20c7fd1d8debc9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/userInfo/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/userInfo/index.vue
@@ -3,17 +3,16 @@
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="个人信息"></u-navbar>
 
-
-        <view class="bg-white solid-top zaiui-head-box  margin-bottom">
-            <view class="text-center margin-bottom-sm">
-                <text class="text-black">完成</text>
-                <text class="text-orange text-xxl">100%</text>
-                <text class="text-black">，太棒啦！</text>
+        <view class="coreshop-bg-white coreshop-solid-top u-padding-left-80 u-padding-right-80 u-padding-top-45 u-padding-bottom-45 u-margin-bottom-20">
+            <view class="u-text-center u-margin-bottom-20">
+                <text class="coreshop-text-black">完成</text>
+                <text class="coreshop-text-orange u-font-40">100%</text>
+                <text class="coreshop-text-black">，太棒啦！</text>
             </view>
-            <progress class="zaiui-progress-radius" percent="100" active stroke-width="10" activeColor="#f37b1d" />
+            <progress percent="100" active stroke-width="10" activeColor="#f37b1d" />
         </view>
 
-        <view class="cu-list menu sm-border margin-top bg-white u-padding-30">
+        <view class="coreshop-list menu coreshop-bg-white u-padding-30">
             <u-form :model="model" :rules="rules" ref="uForm" :errorType="errorType">
                 <u-form-item label="头像：" label-width="150">
                     <u-avatar :src="model.avatar" @click="uploadAvatar" size="large"></u-avatar>
@@ -30,9 +29,9 @@
         </view>
         <u-calendar v-model="showCalendar" :mode="calendarMode" @change="calendarChange" safe-area-inset-bottom="true"></u-calendar>
         <!--按钮-->
-        <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
-            <view class="flex padding-sm flex-direction">
-                <button class="cu-btn bg-red" @tap="$u.debounce(submitHandler, 500)" :disabled='submitStatus' :loading='submitStatus'>保存</button>
+        <view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
+            <view class="u-padding-20 flex-direction">
+                <u-button :custom-style="customStyle" type="error" size="medium" @click="submitHandler()" :disabled='submitStatus' :loading='submitStatus'>保存</u-button>
             </view>
         </view>
         <u-action-sheet :list="actionSheetList" v-model="actionSheetShow" @click="actionSheetCallback"></u-action-sheet>
@@ -43,6 +42,9 @@
     export default {
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 model: {
                     birthday: '',
                     nickname: '',
@@ -219,10 +221,5 @@
     }
 </script>
 
-
 <style scoped lang="scss">
-    .agreement { display: flex; align-items: center; margin: 40rpx 0; }
-        .agreement .agreement-text { padding-left: 8rpx; color: $u-tips-color; }
-
-    .zaiui-head-box { position: relative; padding: 45.45rpx 90.9rpx; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/userInfo/password.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/userInfo/password.vue
index 6c7bd2d4d883278af6e84e72175c41dad99668b3..2e4ac00943c1a590b38c1aa9f92e256f67d39cbe 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/userInfo/password.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/setting/userInfo/password.vue
@@ -2,7 +2,7 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="设置密码"></u-navbar>
-        <view class="wrap bg-white">
+        <view class="u-padding-30 coreshop-bg-white">
             <u-form :model="model" :rules="rules" ref="uForm" :errorType="errorType">
                 <u-form-item label="旧密码" label-width="150" prop="password" v-if="oldpassWord">
                     <u-input :password-icon="true" type="password" v-model="model.pwd" placeholder="请输入密码"></u-input>
@@ -15,18 +15,22 @@
                 </u-form-item>
             </u-form>
         </view>
-        <view class="coreshop-bottomBox">
-            <button class="coreshop-btn coreshop-btn-square coreshop-btn-b" hover-class="btn-hover2" @tap="$u.throttle(submitHandler, 500)" :disabled='submitStatus' :loading='submitStatus'>
-                保存
-            </button>
+
+        <!--按钮-->
+        <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="submitHandler" :disabled='submitStatus' :loading='submitStatus'>保存</u-button>
+            </view>
         </view>
     </view>
-
 </template>
 <script>
     export default {
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 model: {
                     pwd: '',
                     newPwd: '',
@@ -136,6 +140,4 @@
 </script>
 
 <style lang="scss">
-    page { background: #fff; }
-    .wrap { padding: 30rpx; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.scss b/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.scss
new file mode 100644
index 0000000000000000000000000000000000000000..4db18673347e7e3dfb5b01cc448b8bca2a15d019
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.scss
@@ -0,0 +1,2 @@
+.coreshop-list.menu-avatar > .coreshop-list-item .content { position: absolute; left: 106rpx; width: calc(100% - 96rpx - 60rpx - 120rpx - 20rpx); line-height: 1.6em; }
+.coreshop-list.menu-avatar > .coreshop-list-item .action { width: auto; text-align: center; margin-right: 30rpx; }
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 721528c3f4efe79a48344ded57c8feb1ec420591..26151b9f78eac9442b1b14b220961615f44ebed1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue
@@ -2,93 +2,86 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="支付"></u-navbar>
-        <view class="cu-bar bg-white solid-bottom">
-            <view class="action">
-                <text class="cuIcon-title text-orange"></text> 支付信息
-            </view>
-            <view class="action">
-            </view>
+        <view class="coreshop-bg-white coreshop-solid-bottom u-padding-30">
+            <u-icon name="error-circle" size="28" class="coreshop-text-orange" label="支付信息"></u-icon>
         </view>
         <!--商品信息-->
-        <view class="cu-list menu">
-            <view class="cu-item">
+        <view class="coreshop-list menu">
+            <view class="coreshop-list-item">
                 <view class="content">
-                    <text class="text-grey">订单类型</text>
+                    <text class="coreshop-text-grey">订单类型</text>
                 </view>
                 <view class="action">
-                    <text class="text-sm text-gray" v-if="type == 1">商品订单</text>
-                    <text class="text-sm text-gray" v-if="type == 2" @click="toRecharge()">充值订单</text>
-                    <text class="text-sm text-gray" v-if="type == 3">表单订单</text>
-                    <text class="text-sm text-gray" v-if="type == 4">付款码</text>
-                    <text class="text-sm text-gray" v-if="type == 5">服务订单</text>
+                    <text class="u-font-sm coreshop-text-gray" v-if="type == 1">商品订单</text>
+                    <text class="u-font-sm coreshop-text-gray" v-if="type == 2" @click="toRecharge()">充值订单</text>
+                    <text class="u-font-sm coreshop-text-gray" v-if="type == 3">表单订单</text>
+                    <text class="u-font-sm coreshop-text-gray" v-if="type == 4">付款码</text>
+                    <text class="u-font-sm coreshop-text-gray" v-if="type == 5">服务订单</text>
                 </view>
             </view>
             <template v-if="type == 1">
-                <view class="cu-item">
+                <view class="coreshop-list-item">
                     <view class="content">
-                        <text class="text-grey">订单编号</text>
+                        <text class="coreshop-text-grey">订单编号</text>
                     </view>
                     <view class="action">
-                        <text class="text-grey text-sm" v-for="(item, index) in orderInfo.rel" :key="index" @click="goOrderDetail(item.sourceId)">{{ item.sourceId || '' }}</text>
+                        <text class="coreshop-text-grey u-font-sm" v-for="(item, index) in orderInfo.rel" :key="index" @click="goOrderDetail(item.sourceId)">{{ item.sourceId || '' }}</text>
                     </view>
                 </view>
-                <view class="cu-item">
+                <view class="coreshop-list-item">
                     <view class="content">
-                        <text class="text-grey">订单金额</text>
+                        <text class="coreshop-text-grey">订单金额</text>
                     </view>
                     <view class="action">
-                        <text class="text-price text-red text-lg">{{ orderInfo.money || '' }}</text>
+                        <text class="coreshop-text-price coreshop-text-red u-font-lg">{{ orderInfo.money || '' }}</text>
                     </view>
                 </view>
             </template>
             <template v-else-if="type == 2">
-                <view class="cu-item">
+                <view class="coreshop-list-item">
                     <view class="content">
-                        <text class="text-grey">充值金额</text>
+                        <text class="coreshop-text-grey">充值金额</text>
                     </view>
                     <view class="action">
-                        <text class="text-price text-red text-lg">{{ recharge || '' }}</text>
+                        <text class="coreshop-text-price coreshop-text-red u-font-lg">{{ recharge || '' }}</text>
                     </view>
                 </view>
             </template>
             <template v-else-if="type == 5">
-                <view class="cu-item">
+                <view class="coreshop-list-item">
                     <view class="content">
-                        <text class="text-grey">购买服务</text>
+                        <text class="coreshop-text-grey">购买服务</text>
                     </view>
                     <view class="action">
-                        <text class="text-sm text-gray">{{ serviceInfo.title || '' }}</text>
+                        <text class="u-font-sm coreshop-text-gray">{{ serviceInfo.title || '' }}</text>
                     </view>
                 </view>
-                <view class="cu-item">
+                <view class="coreshop-list-item">
                     <view class="content">
-                        <text class="text-grey">服务金额</text>
+                        <text class="coreshop-text-grey">服务金额</text>
                     </view>
                     <view class="action">
-                        <text class="text-price text-red text-lg">{{ serviceInfo.money || '' }}</text>
+                        <text class="coreshop-text-price coreshop-text-red u-font-lg">{{ serviceInfo.money || '' }}</text>
                     </view>
                 </view>
             </template>
             <template v-else>
-                <view class="cu-item">
+                <view class="coreshop-list-item">
                     <view class="content">
-                        <text class="text-grey">支付金额</text>
+                        <text class="coreshop-text-grey">支付金额</text>
                     </view>
                     <view class="action">
-                        <text class="text-price text-red text-lg">{{ recharge || '' }}</text>
+                        <text class="coreshop-text-price coreshop-text-red u-font-lg">{{ recharge || '' }}</text>
                     </view>
                 </view>
             </template>
 
         </view>
 
-        <view class="cu-bar bg-white solid-bottom margin-top">
-            <view class="action">
-                <text class="cuIcon-title text-orange"></text> 请点击选择以下支付方式
-            </view>
-            <view class="action">
-            </view>
+        <view class="coreshop-bg-white coreshop-solid-bottom u-padding-30  u-margin-top-30">
+            <u-icon name="checkmark-circle" size="28" class="coreshop-text-orange" label="请点击选择以下支付方式"></u-icon>
         </view>
+
         <!--支付方式-->
         <view class="content">
             <!-- #ifdef H5 -->
@@ -109,32 +102,32 @@
         </view>
 
         <!--提示信息-->
-        <view class="text-gray padding-sm text-sm">
+        <view class="coreshop-text-gray u-padding-20 u-font-sm">
             注：如果您在支付中选择的支付方式不适合或异常，请再次选择其他支付方式。
         </view>
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 <script>
     // #ifdef H5
-    import paymentsByH5 from '@/components/corecms-payments/corecms-paymentsByH5.vue';
+    import paymentsByH5 from '@/components/coreshop-payments/coreshop-paymentsByH5.vue';
     // #endif
 
     // #ifdef MP-WEIXIN
-    import paymentsByWx from '@/components/corecms-payments/corecms-paymentsByWx.vue';
+    import paymentsByWx from '@/components/coreshop-payments/coreshop-paymentsByWx.vue';
     // #endif
 
     // #ifdef MP-ALIPAY
-    import paymentsByAli from '@/components/corecms-payments/corecms-paymentsByAli.vue';
+    import paymentsByAli from '@/components/coreshop-payments/coreshop-paymentsByAli.vue';
     // #endif
 
     // #ifdef APP-PLUS || APP-PLUS-NVUE
-    import paymentsByApp from '@/components/corecms-payments/corecms-paymentsByApp.vue';
+    import paymentsByApp from '@/components/coreshop-payments/coreshop-paymentsByApp.vue';
     // #endif
 
     // #ifdef MP-TOUTIAO
-    import paymentsByTt from '@/components/corecms-payments/corecms-paymentsByTt.vue';
+    import paymentsByTt from '@/components/coreshop-payments/coreshop-paymentsByTt.vue';
     // #endif
 
     import { orders } from '@/common/mixins/mixinsHelper.js';
@@ -149,7 +142,7 @@
                 orderInfo: {}, // 订单详情
                 userInfo: {}, // 用户信息
                 serviceInfo: {}, // 服务信息
-                formId: 0
+                formId: 0,
             };
         },
         components: {
@@ -235,20 +228,11 @@
             },
             // 跳转我的余额页面
             toRecharge() {
-                this.$u.route('/pages/member/balance/index');
+                this.$u.route('/pages/member/balance/index/index');
             }
         }
     };
 </script>
-<style scoped lang="scss">
-    view { box-sizing: border-box; }
-    .margin-cell-group { margin-bottom: 20upx; }
-    .cell-hd-title { color: #999; }
-    .payment-method .cell-item-hd { min-width: 70upx; }
-    .payment-method .cell-hd-icon { width: 70upx; height: 70upx; }
-    .payment-method .cell-item-bd { border-left: 2upx solid #f0f0f0; padding-left: 30upx; }
-    .payment-method .cell-bd-text { font-size: 28upx; color: #666; }
-    .payment-method .address { font-size: 24upx; color: #999; }
-    .flex-item { display: flex; justify-content: space-between; align-items: center; }
-        .flex-item .cell-item-ft { position: relative; top: 0; transform: translateY(0); right: 0; }
+<style lang="scss">
+    @import "pay.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/payStatus.scss b/CoreCms.Net.Uni-App/CoreShop/pages/payment/result/result.scss
similarity index 100%
rename from CoreCms.Net.Uni-App/CoreShop/static/style/payStatus.scss
rename to CoreCms.Net.Uni-App/CoreShop/pages/payment/result/result.scss
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/result/result.vue b/CoreCms.Net.Uni-App/CoreShop/pages/payment/result/result.vue
index 21b0bc81b9e8034e0ecebd2362db49e7c1285e53..63eb42982b9d5bd0240515290138c8116eff0dff 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/result/result.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/result/result.vue
@@ -6,31 +6,31 @@
         <!--状态图标-->
         <view class="coreshop-status-view">
             <image class="status-img" src="/static/images/payments/pay.png" mode="widthFix" />
-            <view class="bg-red status-bg-view">
-                <text class="cuIcon-check icon" v-if="status && paymentInfo.status === 2"></text>
-                <text class="cuIcon-roundclosefill icon" v-else-if="status && paymentInfo.status === 1"></text>
+            <view class="coreshop-bg-red status-bg-view">
+                <u-icon name="checkmark" v-if="status && paymentInfo.status === 2"></u-icon>
+                <u-icon name="close" v-else-if="status && paymentInfo.status === 1"></u-icon>
             </view>
         </view>
         <!--状态标题-->
-        <view class="text-bold text-black text-xl text-center" v-if="status && paymentInfo.status === 2">支付成功</view>
-        <view class="text-bold text-black text-xl text-center" v-else-if="status && paymentInfo.status === 1">支付失败</view>
+        <view class="coreshop-text-bold coreshop-text-black u-font-xl u-text-center" v-if="status && paymentInfo.status === 2">支付成功</view>
+        <view class="coreshop-text-bold coreshop-text-black u-font-xl u-text-center" v-else-if="status && paymentInfo.status === 1">支付失败</view>
 
 
         <!--支付金额-->
-        <view class="text-bold text-black text-xl text-center chsop-pay-result-price">￥{{ paymentInfo.money || '' }}</view>
+        <view class="coreshop-text-bold coreshop-text-black u-font-xl u-text-center chsop-pay-result-price">￥{{ paymentInfo.money || '' }}</view>
 
         <!--状态说明-->
-        <view class="text-gray text-sm text-center coreshop-padding" v-if="status && paymentInfo.status === 2"> 平台已收到您的钱款，已通知卖家发货。平台会及时通知您的交易状态，请您关注。 </view>
-        <view class="text-gray text-sm text-center coreshop-padding" v-else-if="status && paymentInfo.status === 1"> 因为某些问题导致支付失败，请查看详情了解具体问题 </view>
+        <view class="coreshop-text-gray u-font-sm u-text-center coreshop-padding" v-if="status && paymentInfo.status === 2"> 平台已收到您的钱款，已通知卖家发货。平台会及时通知您的交易状态，请您关注。 </view>
+        <view class="coreshop-text-gray u-font-sm u-text-center coreshop-padding" v-else-if="status && paymentInfo.status === 1"> 因为某些问题导致支付失败，请查看详情了解具体问题 </view>
 
         <!--按钮-->
         <view class="coreshop-btn-view">
-            <button class="cu-btn radius line-red" @click="orderDetail()">查看详情</button>
+            <u-button type="primary"  size="medium" @click="orderDetail()">查看详情</u-button>
         </view>
 
 
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+		<coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 <script>
@@ -86,13 +86,13 @@
             },
             orderDetail() {
                 if (this.orderId && this.paymentInfo.type === 1) {
-                    this.$u.route({ type: 'redirectTo', url: '/pages/member/order/orderdetail?orderId=' + this.orderId });
+                    this.$u.route({ type: 'redirectTo', url: '/pages/member/order/detail/detail?orderId=' + this.orderId });
                 } else if (this.paymentInfo.type === 2) {
-                    this.$u.route({ type: 'redirectTo', url: '/pages/member/balance/details' });
+                    this.$u.route({ type: 'redirectTo', url: '/pages/member/balance/details/details' });
                 } else if (this.paymentInfo.type === 3 || this.paymentInfo.type === 4) {
                     this.$u.route({ type: 'switchTab', url: '/pages/index/default/default' });
                 } else if (this.paymentInfo.type === 5) {
-                    this.$u.route({ type: 'redirectTo', url: '/pages/member/serviceOrder/index' });
+                    this.$u.route({ type: 'redirectTo', url: '/pages/member/serviceOrder/index/index' });
                 }
             }
         }
@@ -100,5 +100,5 @@
 </script>
 
 <style lang="scss">
-    @import '../../../static/style/payStatus.scss';
+    @import 'result.scss';
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.scss b/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.scss
new file mode 100644
index 0000000000000000000000000000000000000000..296fe96543b496e20bc29b2f60c4617e12ebe6c3
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.scss
@@ -0,0 +1,6 @@
+.content { position: relative; height: 80vh;
+    .content-c { position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center;
+        .load-img { width: 100upx; height: 100upx; }
+        .load-text { font-size: 26upx; }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.vue b/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.vue
index 1168099f33506a4da7fd56c333220b912d262ea0..ff510f16040a299b38055680c248bea082c10415 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/waiting/waiting.vue
@@ -5,11 +5,11 @@
         <view class="content">
             <view class="content-c">
                 <image class="load-img" src="/static/images/loading.gif" mode=""></image>
-                <view class="load-text color-9">信息加载中.....</view>
+                <view class="load-text ">信息加载中.....</view>
             </view>
         </view>
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+		<coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
@@ -131,8 +131,4 @@
 </script>
 
 <style scoped lang="scss">
-    .content { position: relative; height: 80vh; }
-    .content-c { position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center; }
-    .load-img { width: 100upx; height: 100upx; }
-    .load-text { font-size: 26upx; }
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/placeOrder.scss b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.scss
similarity index 72%
rename from CoreCms.Net.Uni-App/CoreShop/static/style/placeOrder.scss
rename to CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.scss
index 6a9df527f1056a3358a96afebfe26c1ae956ffc8..488e592d61aa41ab699582a7d0b9917069a5e5cd 100644
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/placeOrder.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.scss
@@ -1,8 +1,8 @@
-.coreshop-view-box { position: relative; padding: 0 18.18rpx;
+.coreshop-common-view-box { position: relative; padding: 0 18.18rpx;
     .coreshop-card { position: relative; padding: 18.18rpx; border-radius: 9.09rpx; box-shadow: 0 0 10.9rpx #f7f7f7; }
 }
 .address-view {
-    .cu-list.menu-avatar > .cu-item { height: 55px;
+    .coreshop-list.menu-avatar > .coreshop-list-item { height: 55px;
         &:after { width: 0; height: 0; border-bottom: 0; }
         .icon-view { position: absolute; border-radius: 100%; text-align: center; line-height: 45.45rpx; height: 45.45rpx; width: 45.45rpx; left: 9.09rpx; top: 20rpx; }
         .content { left: 72.72rpx; width: calc(100% - 94.54rpx - 27.27rpx); }
@@ -12,13 +12,13 @@
 }
 .goods-view {
     .title-view { position: relative; line-height: 49.09rpx; height: 47.27rpx;
-        .cu-avatar { position: absolute; }
+        .coreshop-avatar { position: absolute; }
         .title-box { position: relative; padding-left: 63.63rpx;
             .cu-tag { position: relative; top: -3.63rpx; }
         }
     }
     .goods-info-view-box { position: relative; padding: 27.27rpx 18.18rpx;
-        .cu-avatar { position: absolute; height: 163.63rpx; width: 163.63rpx; left: 18.18rpx; }
+        .coreshop-avatar { position: absolute; height: 163.63rpx; width: 163.63rpx; left: 18.18rpx; }
         .goods-info-view { position: relative; padding-left: 181.81rpx; min-height: 163.63rpx; line-height: 1.4;
             .coreshop-tag-view { position: relative; }
             .goods-price-view { position: relative; line-height: 1.7; top: 9.09rpx;
@@ -26,21 +26,20 @@
             }
         }
     }
-    .solid-bottom::after { border-bottom: 2rpx solid rgba(0, 0, 0, 0.1); }
+    .coreshop-solid-bottom::after { border-bottom: 2rpx solid rgba(0, 0, 0, 0.1); }
     .coreshop-gift-list { position: relative;
         .title { padding-right: 181.81rpx; }
-        .text-right { position: absolute; right: 0; top: 0; }
+        .u-text-right { position: absolute; right: 0; top: 0; }
     }
     .coreshop-gift-list + .coreshop-gift-list { margin-top: 10px; }
     .checked-view { position: relative;
         .coreshop-checked { position: absolute; transform: scale(0.7); }
-        .text-black-view { padding-left: 63.63rpx; line-height: 47.27rpx; }
+        .coreshop-text-black-view { padding-left: 63.63rpx; line-height: 47.27rpx; }
     }
     .coreshop-service-view {
         .flex-sub { position: relative; text-align: center; line-height: 1.8; border: 2rpx solid #f7f5f5;
-            .cu-tag { position: relative; top: -4rpx; }
             .coreshop-corner-mark { position: absolute; right: 0; bottom: 0; width: 0; height: 0; border-bottom: 36.36rpx solid #eaeaea; border-left: 45.45rpx solid transparent; }
-            .check-icon { position: absolute; font-size: 20rpx; bottom: -3px; color: #FAFAFA; right: 2rpx; }
+            .check-icon { position: absolute; font-size: 20rpx; bottom: 0px; color: #FAFAFA; right: 2rpx; }
             .coreshop-corner-mark.check { border-bottom: 36.36rpx solid #e54d42; }
             .check-icon.check { color: #fff; }
         }
@@ -49,17 +48,17 @@
 
 .coreshop-card.pay-view { position: relative; padding: 10px 10px 0;
     .title-view { position: relative;
-        .text-right { position: absolute; right: 0; }
+        .u-text-right { position: absolute; right: 0; }
     }
     .tag-view-box { position: relative; padding: 0 0 27.27rpx; border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
         .cu-tag { margin-top: 18.18rpx; margin-right: 9.09rpx; }
         .cu-tag + .cu-tag { margin-left: 0; }
     }
-    .cu-list.menu > .cu-item { padding: 0; min-height: 90.9rpx;
+    .coreshop-list.menu > .coreshop-list-item { padding: 0; min-height: 90.9rpx;
         .content { font-size: 27.27rpx; }
         .action .cu-tag { position: relative; top: -3.63rpx; right: 9.09rpx; }
     }
-    .cu-list.menu > .cu-item.arrow { padding-right: 29.09rpx;
+    .coreshop-list.menu > .coreshop-list-item.arrow { padding-right: 29.09rpx;
         &:before { right: 0; color: #aaaaaa; }
     }
 }
@@ -67,14 +66,14 @@
 .coreshop-price-view { position: relative;
     .item-view { position: relative;
         .title { padding-right: 181.81rpx; }
-        .text-right { position: absolute; right: 0; top: 0; }
+        .u-text-right { position: absolute; right: 0; top: 0; }
     }
     .item-view + .item-view { margin-top: 18.18rpx; }
 }
 
 .agreement-checked-view { position: relative; padding: 18.18rpx 27.27rpx; display: flex; align-items: center; margin: 40rpx 0;
     .coreshop-checked { transform: scale(0.7); }
-    .text-black-view { line-height: 47.27rpx; }
+    .coreshop-text-black-view { line-height: 47.27rpx; }
 }
 
 .coreshop-footer-fixed { box-shadow: 0 -2rpx 9.09rpx 0 #ececec; z-index: 99999; display: flex; position: fixed; bottom: 0; margin-top: 120rpx; width: 100%; z-index: 99; border-top: solid 2rpx #f2f2f2; background-color: #ffffff;
@@ -83,8 +82,11 @@
         .btn-view { position: absolute; float: right; right: 29.09rpx; }
     }
 }
-.cu-form-group { padding: 1rpx 20rpx; }
-    .cu-form-group .title { text-align: justify; padding-right: 30rpx; font-size: 28rpx; position: relative; height: 40rpx; line-height: 40rpx; }
+.coreshop-form-group { background-color: #ffffff; padding: 1upx 20upx; display: flex; align-items: center; min-height: 100upx; justify-content: space-between;
+    .title { text-align: justify; padding-right: 30rpx; font-size: 28rpx; position: relative; height: 40rpx; line-height: 40rpx; }
+    input { flex: 1; font-size: 30upx; color: #555; padding-right: 20upx; }
+}
+    .coreshop-form-group + .coreshop-form-group { border-top: 1upx solid #eee; }
 
 .couponBox { width: 400rpx; }
 
@@ -95,7 +97,7 @@
     }
 }
 
-.memoBox { height: 3.6em; }
+.memoBox { height: 4em; padding: 10px; }
 
 
-.cell-item { width: auto; }
+.coreshop-cell-item { width: auto; }
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 f42819fedd6c60b28afcd7126946fa11bb74cf13..696400cdba366dadf81365984b51111bbed76daf 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
@@ -10,101 +10,96 @@
                 <view class="content">
                     <view v-show="typeCurrent === 0 || typeCurrent === 1">
                         <!-- 收货地址信息 -->
-                        <view class="margin-tb-sm coreshop-view-box" v-if="userShip && userShip.id" @click="showAddressList">
-                            <view class="bg-white coreshop-card address-view">
-                                <view class="cu-list menu-avatar">
-                                    <view class="cu-item">
-                                        <view class="bg-grey icon-view">
-                                            <text class="cuIcon-locationfill" />
+                        <view class="u-margin-top-20 u-margin-bottom-20 coreshop-common-view-box" v-if="userShip && userShip.id" @click="showAddressList">
+                            <view class="coreshop-bg-white coreshop-card address-view">
+                                <view class="coreshop-list menu-avatar">
+                                    <view class="coreshop-list-item">
+                                        <view class="coreshop-bg-grey icon-view">
+                                            <u-icon name="map"></u-icon>
                                         </view>
                                         <view class="content">
-                                            <view class="text-black">
+                                            <view class="coreshop-text-black">
                                                 <text>收货人：{{ userShip.name || '' }}</text>
-                                                <text class="margin-left">{{ userShip.mobile || ''}}</text>
+                                                <text class="u-margin-left-20">{{ userShip.mobile || ''}}</text>
                                             </view>
-                                            <view class="text-gray text-sm flex">
-                                                <view class="text-cut">{{ userShip.areaName || ''}} {{userShip.address || ''}}</view>
+                                            <view class="coreshop-text-gray u-font-sm flex">
+                                                <view class="u-line-1">{{ userShip.areaName || ''}} {{userShip.address || ''}}</view>
                                             </view>
                                         </view>
-                                        <view class="action">
-                                            <text class="text-gray cuIcon-right" @click="goAddress()" />
+                                        <view class="action coreshop-text-gray">
+                                            <u-icon name="arrow-right"  @click="goAddress()"></u-icon>
                                         </view>
                                     </view>
                                 </view>
                                 <view class="address-line" />
                             </view>
                         </view>
-
-                        <view class="margin-tb-sm coreshop-view-box" v-else>
-                            <view class="bg-white coreshop-card address-view text-center u-padding-bottom-30">
-                                <button class="cu-btn radius bg-red" @click="goAddress()">添加收货地址</button>
+                        <view class="u-margin-top-20 u-margin-bottom-20 coreshop-common-view-box" v-else>
+                            <view class="coreshop-bg-white coreshop-card address-view u-text-center u-padding-bottom-30">
+                                <u-button type="error" size="mini" @click="goAddress()">添加收货地址</u-button>
                                 <view class="address-line" />
                             </view>
-
                         </view>
-
                     </view>
                     <view v-show="typeCurrent === 2">
                         <!-- 门店信息 -->
-                        <view class="margin-tb-sm coreshop-view-box" v-if="store && store.id" @click="goStorelist()">
-                            <view class="bg-white coreshop-card address-view">
-                                <view class="cu-list menu-avatar">
-                                    <view class="cu-item">
-                                        <view class="bg-grey icon-view">
-                                            <text class="cuIcon-locationfill" />
+                        <view class="u-margin-top-20 u-margin-bottom-20 coreshop-common-view-box" v-if="store && store.id" @click="goStorelist()">
+                            <view class="coreshop-bg-white coreshop-card address-view">
+                                <view class="coreshop-list menu-avatar">
+                                    <view class="coreshop-list-item">
+                                        <view class="coreshop-bg-grey icon-view">
+                                            <u-icon name="map"></u-icon>
                                         </view>
                                         <view class="content">
-                                            <view class="text-black">
+                                            <view class="coreshop-text-black">
                                                 <text>{{store.name|| ''}}</text>
-                                                <text class="margin-left">{{store.mobile|| ''}}</text>
+                                                <text class="u-margin-left-20">{{store.mobile|| ''}}</text>
                                             </view>
-                                            <view class="text-gray text-sm flex">
-                                                <view class="text-cut">{{store.address|| ''}}</view>
+                                            <view class="coreshop-text-gray u-font-sm flex">
+                                                <view class="u-line-1">{{store.address|| ''}}</view>
                                             </view>
                                         </view>
-                                        <view class="action">
-                                            <text class="text-gray cuIcon-right" />
+                                        <view class="action coreshop-text-gray">
+                                            <u-icon name="arrow-right"  @click="goStorelist()"></u-icon>
                                         </view>
                                     </view>
                                 </view>
                                 <view class="address-line" />
                             </view>
                         </view>
-                        <view v-else class='margin-tb-sm coreshop-view-box' @click="goStorelist()">
-                            <view class="bg-white coreshop-card address-view">
-                                <view>
-                                    <view class='cell-item add-title-item right-img no-store cell-item-bd-block'>暂无门店</view>
-                                </view>
+                        <view v-else class='u-margin-top-20 u-margin-bottom-20 coreshop-common-view-box' @click="goStorelist()">
+                            <view class="coreshop-bg-white coreshop-card address-view">
+                                    <view class='u-padding-20 u-text-center'>暂无门店</view>
                                 <view class="address-line" />
                             </view>
                         </view>
                     </view>
                 </view>
-                <view class='margin-tb-sm coreshop-view-box' v-if="storeSwitch == 1 && typeCurrent === 2">
-                    <view class="cu-form-group">
+                <view class='u-margin-top-20 u-margin-bottom-20 coreshop-common-view-box' v-if="storeSwitch == 1 && typeCurrent === 2">
+                    <view class="coreshop-form-group">
                         <view class="title">姓名</view>
-                        <input class='cell-bd-input' placeholder='请输入提货人姓名' v-model="storePick.name" style="width: 100%;"></input>
+                        <input class='coreshop-cell-bd-input' placeholder='请输入提货人姓名' v-model="storePick.name" style="width: 100%;"></input>
                     </view>
-                    <view class="cu-form-group">
+                    <view class="coreshop-form-group">
                         <view class="title">电话</view>
-                        <input class='cell-bd-input' placeholder='请输入提货人电话' v-model="storePick.mobile" style="width: 100%;"></input>
+                        <input class='coreshop-cell-bd-input' placeholder='请输入提货人电话' v-model="storePick.mobile" style="width: 100%;"></input>
                     </view>
                 </view>
                 <!-- 商品列表信息 -->
                 <!--商品信息-->
-                <view class="margin-tb-sm coreshop-view-box">
-                    <view class="bg-white coreshop-card goods-view">
-                        <view class="goods-info-view-box solid-bottom" v-if="item.isSelect == true" v-for="(item, index) in products" :key="index">
-                            <view class="cu-avatar radius lg" :style="[{backgroundImage:'url('+ item.products.images+'?x-oss-process=image/resize,m_lfit,h_200,w_200' +')'}]" />
+                <view class="u-margin-top-20 u-margin-bottom-20 coreshop-common-view-box">
+                    <view class="coreshop-bg-white coreshop-card goods-view">
+                        <view class="goods-info-view-box coreshop-solid-bottom" v-if="item.isSelect == true" v-for="(item, index) in products" :key="index">
+                            <view class="coreshop-avatar radius lg" :style="[{backgroundImage:'url('+ item.products.images+'?x-oss-process=image/resize,m_lfit,h_200,w_200' +')'}]" />
                             <view class="goods-info-view">
-                                <view class="text-black u-line-2">{{ item.products.name || ''}}</view>
-                                <view class="text-sm text-gray" v-if="item.products.spesDesc !== null">{{ item.products.spesDesc || ''}}</view>
+                                <view class="coreshop-text-black u-line-2">{{ item.products.name || ''}}</view>
+                                <view class="u-font-sm coreshop-text-gray" v-if="item.products.spesDesc !== null">{{ item.products.spesDesc || ''}}</view>
                                 <view class="coreshop-tag-view" v-if="item.products.promotionList">
-                                    <text class="cu-tag line-blue sm radius" v-for="(v, k) in item.products.promotionList" :key="k"> {{ v.name || ''}}</text>
+                                    <u-tag :text="v.name" mode="light" size="mini" v-for="(v, k) in item.products.promotionList" :key="k"/>
                                 </view>
                                 <view class="goods-price-view">
-                                    <text class="text-price text-red text-lg">{{ item.products.price || ''}}</text>
-                                    <view class='text-right goods-num'>× {{ item.nums || ''}}</view>
+                                    <text class="coreshop-text-price coreshop-text-red u-font-lg">{{ item.products.price || ''}}</text>
+                                    <view class='u-text-right goods-num'>× {{ item.nums || ''}}</view>
                                 </view>
                             </view>
                         </view>
@@ -113,33 +108,30 @@
             </view>
 
             <!--商品信息-->
-            <view class="margin-tb-sm coreshop-view-box" v-if="userCoupons.length>0">
-                <view class="bg-white coreshop-card goods-view">
-
-                    <view class="text-black coreshop-gift-list">
-                        <view class="text-cut title">优惠券</view>
-                        <u-tag class="text-right" text="取消选择" closeable type="error" shape="circle" mode="dark" size="mini" @click="notUseCoupon()" v-if="usedCoupons.length>0" />
+            <view class="u-margin-top-20 u-margin-bottom-20 coreshop-common-view-box" v-if="userCoupons.length>0">
+                <view class="coreshop-bg-white coreshop-card goods-view">
+                    <view class="coreshop-text-black coreshop-gift-list">
+                        <view class="u-line-1 title">优惠券</view>
+                        <u-tag class="u-text-right" text="取消选择" closeable type="error" shape="circle" mode="dark" size="mini" @click="notUseCoupon()" v-if="usedCoupons.length>0" />
                     </view>
-
                     <!--滑动列表-->
                     <view class="coupon-scroll-box">
                         <scroll-view class="coupon-scroll" scroll-x>
                             <block v-for="(item, index) in userCoupons" :key="index">
-                                <view :id="['scroll' + (index + 1 )]" class="coupon-scroll-item margin-top-sm flex coreshop-service-view couponBox" @click="couponHandle(index)">
-                                    <view class="flex-sub bg-page padding-sm margin-xs radius ">
-                                        <view class="text-black text-cut">{{ item.couponName || ''}}</view>
-                                        <view class="text-gray text-sm text-cut"> {{ item.expression2 }}</view>
-                                        <view class="text-black">
-                                            <!--<text class="margin-right-xs">￥ 95.00</text>-->
-                                            <text class="cu-tag line-red sm radius">有效期：{{ item.stime + ' 至 ' + item.etime }}</text>
+                                <view :id="['scroll' + (index + 1 )]" class="coupon-scroll-item u-margin-top-20 flex coreshop-service-view couponBox" @click="couponHandle(index)">
+                                    <view class="flex-sub bg-page u-padding-20 u-margin-10 radius ">
+                                        <view class="coreshop-text-black u-line-1">{{ item.couponName || ''}}</view>
+                                        <view class="coreshop-text-gray u-font-sm u-line-1"> {{ item.expression2 }}</view>
+                                        <view class="coreshop-text-black">
+                                            <text class="line-red u-font-20 radius">有效期：{{ item.stime + ' 至 ' + item.etime }}</text>
                                         </view>
                                         <view v-if="!item.checked && item.disabled">
                                             <view class="coreshop-corner-mark" />
-                                            <text class="cuIcon-check check-icon" />
+                                            <u-icon name="checkmark" class="check-icon"></u-icon>
                                         </view>
                                         <view v-else-if="item.checked && item.disabled">
                                             <view class="coreshop-corner-mark check" />
-                                            <text class="cuIcon-check check-icon check" />
+                                            <u-icon name="checkmark" class="check-icon check"></u-icon>
                                         </view>
                                     </view>
                                 </view>
@@ -148,111 +140,100 @@
                     </view>
                 </view>
             </view>
-
-
             <!--支付方式-->
-            <view class="margin-tb-sm coreshop-view-box">
-                <view class="bg-white coreshop-card pay-view">
-                    <view class="cu-list menu">
+            <view class="u-margin-top-20 u-margin-bottom-20 coreshop-common-view-box">
+                <view class="coreshop-bg-white coreshop-card pay-view">
+                    <view class="coreshop-list menu">
                         <!-- 商户开启积分 并且用户有积分情况下 -->
-                        <view class="cu-item" v-if="isOpenPoint === 1 && userPointNums > 0">
-                            <!--<view class="cu-item arrow">-->
+                        <view class="coreshop-list-item" v-if="isOpenPoint === 1 && userPointNums > 0">
+                            <!--<view class="coreshop-list-item arrow">-->
                             <view class="content">
-                                <text class="text-black">积分抵扣</text>
-                                <view class="text-gray text-xs flex">
-                                    <text class="text-cut">
+                                <text class="coreshop-text-black">积分抵扣</text>
+                                <view class="coreshop-text-gray u-font-xs flex">
+                                    <text class="u-line-1">
                                         可用{{ canUsePoint}}积分，可抵扣{{ pointMoney}}元，共有{{ userPointNums}}积分
                                     </text>
                                 </view>
                             </view>
                             <view class="action" @click="changePointHandle">
-                                <view class="text-gray fr">
-                                    <switch :class="isUsePoint?'checked':''" :checked="isUsePoint?true:false"></switch>
-                                    <!--<radio value="1" :checked="isUsePoint" color="#FF7159" style="transform:scale(0.7)" />-->
+                                <view class="coreshop-text-gray fr">
+                                    <switch :class="isUsePoint?'checked':''" :checked="isUsePoint"></switch>
                                 </view>
                             </view>
                         </view>
-                        <view class="cu-item arrow" v-if="invoiceSwitch == 1" @click="goInvoice()">
+                        <view class="coreshop-list-item" v-if="invoiceSwitch == 1" @click="goInvoice()">
                             <view class="content">
-                                <text class="text-black">发票</text>
+                                <text class="coreshop-text-black">发票</text>
                             </view>
                             <view class="action">
-                                <text class="text-gray">{{invoice.name|| '无'}}</text>
+                                <text class="coreshop-text-gray">{{invoice.name|| '无'}}</text>
+                                <u-icon name="arrow-right"></u-icon>
                             </view>
                         </view>
                     </view>
                 </view>
             </view>
-
             <!--商品价格计算-->
-            <view class="margin-tb-sm coreshop-view-box">
-                <view class="bg-white coreshop-card coreshop-price-view">
+            <view class="u-margin-top-20 u-margin-bottom-20 coreshop-common-view-box">
+                <view class="coreshop-bg-white coreshop-card coreshop-price-view">
 
-                    <view class="text-black item-view">
-                        <view class="text-cut title">商品总额</view>
-                        <text class="text-red text-price text-right">{{ cartData.goodsAmount }}</text>
+                    <view class="coreshop-text-black item-view">
+                        <view class="u-line-1 title">商品总额</view>
+                        <text class="coreshop-text-red coreshop-text-price u-text-right">{{ cartData.goodsAmount }}</text>
                     </view>
 
-                    <view class="text-black item-view">
-                        <view class="text-cut title">商品优惠</view>
-                        <text class="text-right">- {{ cartData.goodsPromotionMoney || '0'}}</text>
+                    <view class="coreshop-text-black item-view">
+                        <view class="u-line-1 title">商品优惠</view>
+                        <text class="u-text-right">- {{ cartData.goodsPromotionMoney || '0'}}</text>
                     </view>
-                    <view class="text-black item-view">
-                        <view class="text-cut title">订单优惠</view>
-                        <text class="text-right">- {{ cartData.orderPromotionMoney || '0' }}</text>
+                    <view class="coreshop-text-black item-view">
+                        <view class="u-line-1 title">订单优惠</view>
+                        <text class="u-text-right">- {{ cartData.orderPromotionMoney || '0' }}</text>
                     </view>
-                    <view class="text-black item-view">
-                        <view class="text-cut title">优惠券抵扣</view>
-                        <text class="text-right">- {{ cartData.couponPromotionMoney  || '0'}}</text>
+                    <view class="coreshop-text-black item-view">
+                        <view class="u-line-1 title">优惠券抵扣</view>
+                        <text class="u-text-right">- {{ cartData.couponPromotionMoney  || '0'}}</text>
                     </view>
-                    <view class="text-black item-view">
-                        <view class="text-cut title">积分抵扣</view>
-                        <text class="text-right">- {{ cartData.pointExchangeMoney || '0'}}</text>
+                    <view class="coreshop-text-black item-view">
+                        <view class="u-line-1 title">积分抵扣</view>
+                        <text class="u-text-right">- {{ cartData.pointExchangeMoney || '0'}}</text>
                     </view>
-
-                    <view class="text-black item-view">
-                        <view class="text-cut title">
-                            <text class="margin-right-xs">运费</text>
+                    <view class="coreshop-text-black item-view">
+                        <view class="u-line-1 title">
+                            <text class="u-margin-right-20">运费</text>
                             <text class="cuIcon-question icon" />
                         </view>
-                        <text class="text-right">{{ cartData.costFreight || '0'}}</text>
+                        <text class="u-text-right">{{ cartData.costFreight || '0'}}</text>
                     </view>
-
                 </view>
             </view>
-
             <!--买家留言-->
-            <view class="margin-tb-sm coreshop-view-box">
-                <view class="bg-white">
-                    <view class="cu-form-group margin-top">
+            <view class="u-margin-top-20 u-margin-bottom-20 coreshop-common-view-box">
+                <view class="coreshop-bg-white">
+                    <view class="u-margin-top-20 u-padding-20">
                         <view class="title">买家留言</view>
                         <!--<input v-model="memo" placeholder="50字以内(选填)" name="input" />-->
                     </view>
-                    <view class="cu-form-group">
+                    <view class="u-padding-20">
                         <textarea class="memoBox" maxlength="50" @input="memoChange" placeholder="50字以内(选填)"></textarea>
                     </view>
                 </view>
             </view>
-
             <!--占位底部距离-->
-            <view class="cu-tabbar-height" />
-
+            <view class="coreshop-tabbar-height" />
             <!--底部操作-->
-            <view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
-                <view class="cu-bar padding-lr">
-                    <view class="text-black text-bold price-view">
+            <view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
+                <view class="u-flex u-flex-nowrap u-row-between  u-padding-left-20 u-padding-right-20  u-padding-top-20 w100">
+                    <view class="coreshop-text-black coreshop-text-bold price-view">
                         <text class="u-margin-right-20">共 {{ productNums}} 件商品</text>
-                        <text>合计<text class="text-price text-red text-lg u-margin-left-20"> {{ cartData.amount}}</text></text>
-                    </view>
-                    <view class="btn-view">
-                        <button class="cu-btn radius bg-red" @tap="$u.throttle(toPay, 500)" :disabled='submitStatus' :loading='submitStatus'>确认下单</button>
+                        <text>合计<text class="coreshop-text-price coreshop-text-red u-font-lg u-margin-left-20"> {{ cartData.amount}}</text></text>
                     </view>
+                    <u-button  size="medium"  type="error" @click="toPay" :disabled='submitStatus' :loading='submitStatus'>确认下单</u-button>
                 </view>
             </view>
         </div>
-
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 <script>
@@ -398,7 +379,7 @@
             // 没有收货地址时跳转
             goAddress() {
                 console.log("没有收货地址时跳转");
-                this.$u.route('/pages/member/address/list?type=order')
+                this.$u.route('/pages/member/address/list/list?type=order')
             },
             // 获取用户的默认收货地址
             userDefaultShip() {
@@ -718,7 +699,7 @@
             },
             // 跳转我的收货地址列表
             showAddressList() {
-                this.$u.route('/pages/member/address/list?type=order')
+                this.$u.route('/pages/member/address/list/list?type=order')
             },
             // tab点击切换
             onClickItem(index) {
@@ -815,5 +796,5 @@
 </script>
 
 <style scoped lang="scss">
-    @import '../../../static/style/placeOrder.scss';
+    @import 'index.scss';
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.scss b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.scss
new file mode 100644
index 0000000000000000000000000000000000000000..35be228c70cf06e6cc1672ef55cf1aa7977e6ed6
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.scss
@@ -0,0 +1,9 @@
+.cu-form-group .title { min-width: calc(4em + 15px); }
+
+.coreshop-bottomBox .coreshop-btn { width: 100%; }
+.cheque { position: relative; }
+.cheque-content { position: absolute; left: 15rpx; top: 90rpx; z-index: 10; width: calc(100% - 30rpx);; background-color: #fff; box-shadow: 0 0 0.666667vw 0.4vw rgba(0, 0, 0, .13); border-radius: 10rpx; padding: 20rpx; }
+.tips-item { margin-bottom: 20rpx; }
+.tips-name { font-size: 32rpx; line-height: 35rpx; color: #333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; margin-bottom: 10rpx; }
+.sub-div { display: flex; width: 100%; justify-content: space-between; height: 30rpx; font-size: 24rpx; line-height: 30rpx; color: #999; }
+.num { display: inline-block; }
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 14a483965dc39f672b44570bb62fceafe0760843..b407754d4d196dd5b60fee5ce8d125dd100ca20a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/invoice/invoice.vue
@@ -2,60 +2,58 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="发票设置"></u-navbar>
-        <view class="content">
-            <view class="content-top">
-                <u-radio-group v-model="typeName">
-                    <view class="cu-form-group">
-                        <view class="title">发票类型：</view>
-                        <view>
+
+        <view class="coreshop-bg-white">
+            <u-form :model="model" :rules="rules" ref="uForm" :errorType="errorType">
+                <view class="u-padding-20">
+                    <u-form-item label="发票类型" label-width="150" prop="typeName">
+                        <u-radio-group v-model="model.typeName">
                             <u-radio @change="radioChange" v-for="(item, index) in radioItems" :key="index" :name="item.name">
                                 {{item.name}}
                             </u-radio>
-                        </view>
-                    </view>
-                </u-radio-group>
+                        </u-radio-group>
+                    </u-form-item>
 
-
-                <view class="cu-form-group cheque">
-                    <view class="title">发票抬头：</view>
-                    <input v-model="name" placeholder='抬头名称' @input="getCheque"></input>
-                    <view class="cheque-content" v-show="isShow">
-                        <view class="tips-item" v-for="(item,index) in chequeLisit" :key="index" @click="chooseCheque(item)">
-                            <view class="tips-name">
-                                {{item.name|| ''}}
-                            </view>
-                            <view class="sub-div">
-                                <view class="tax-no">
-                                    {{item.code|| ''}}
+                    <u-form-item label="发票抬头" label-width="150" class="cheque" prop="name">
+                        <u-input v-model="model.name" placeholder='抬头名称' @input="getCheque" />
+                        <view class="cheque-content" v-show="isShow">
+                            <view class="tips-item" v-for="(item,index) in chequeLisit" :key="index" @click="chooseCheque(item)">
+                                <view class="tips-name">
+                                    {{item.name|| ''}}
                                 </view>
-                                <view class="tips-num">
-                                    <view class="num">
-                                        {{item.frequency|| ''}}
+                                <view class="sub-div">
+                                    <view class="tax-no">
+                                        {{item.code|| ''}}
+                                    </view>
+                                    <view class="tips-num">
+                                        <view class="num">
+                                            {{item.frequency|| ''}}
+                                        </view>
+                                        人使用过
                                     </view>
-                                    人使用过
                                 </view>
                             </view>
                         </view>
-                    </view>
-                </view>
-                <view class="cu-form-group" v-show="type === '3'">
-                    <view class="title">税务编号：</view>
-                    <input v-model="code" placeholder='纳税人识别号'></input>
+                    </u-form-item>
+                    <u-form-item label="税务编号" label-width="150" prop="code" v-show="type === '3'">
+                        <u-input v-model="model.code" placeholder='纳税人识别号' />
+                    </u-form-item>
+                    <u-form-item label="发票内容" label-width="150" v-show="type === '3'">
+                        <view>明细</view>
+                    </u-form-item>
+
                 </view>
 
-                <view class="cu-form-group">
-                    <view class="title">发票内容：</view>
-                    <view>明细</view>
+                <view class="coreshop-bottomBox">
+                    <button class="coreshop-btn coreshop-btn-square coreshop-btn-w" @click="saveInvoice">保存发票</button>
+                    <button class="coreshop-btn coreshop-btn-square coreshop-btn-b" @click="notNeedInvoice">本次不开具发票</button>
                 </view>
-            </view>
-            <view class="coreshop-bottomBox">
-                <button class="coreshop-btn coreshop-btn-square coreshop-btn-w" @click="saveInvoice" hover-class="btn-hover2">保存发票</button>
-                <button class="coreshop-btn coreshop-btn-square coreshop-btn-b" @click="notNeedInvoice" hover-class="btn-hover2">本次不开具发票</button>
-            </view>
+
+            </u-form>
         </view>
 
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 <script>
@@ -63,21 +61,54 @@
         data() {
             return {
                 radioItems: [{
-                    name: '个人或事业单位',
+                    name: '个人发票',
                     value: '2'
                 },
                 {
-                    name: '企业',
+                    name: '企业发票',
                     value: '3'
                 }],
-                type: '1', // 发票类型 2个人 3企业
-                typeName: '', // 发票类型 2个人 3企业
-                name: '', // 抬头名称
-                code: '', // 税号
+                type: '1', // 发票类型 1不开发票、2个人发票、3公司发票
+                model: {
+                    typeName: '', // 发票类型 2个人 3企业
+                    name: '', // 抬头名称
+                    code: '', // 税号
+                },
+                errorType: ['message'],
                 isShow: false,
-                chequeLisit: []
+                chequeLisit: [],
+                rules: {
+                    typeName: [
+                        {
+                            required: true,
+                            message: '请选择发票类型或点击不开具',
+                            trigger: ['change', 'blur'],
+                        }
+                    ],
+                    name: [
+                        {
+                            required: true,
+                            message: '请输入发票抬头',
+                            trigger: ['change', 'blur'],
+                        }
+                    ],
+                    code: [
+                        {
+                            validator: (rule, value, callback) => {
+                                if (this.type === '3' && !this.model.code) {
+                                    return false;
+                                }
+                                return true;
+                            },
+                            message: '请输入发票税务编号'
+                        }
+                    ],
+                },
             }
         },
+        onReady() {
+            this.$refs.uForm.setRules(this.rules);
+        },
         onLoad() {
             let invoice
             let pages = getCurrentPages()
@@ -95,13 +126,13 @@
                 // #endif
                 if (invoice && invoice.hasOwnProperty('type') && invoice.type !== '1') {
                     // 发票不是未使用, 展示发票信息
-                    this.name = invoice.name;
-                    this.code = invoice.code;
+                    this.model.name = invoice.name;
+                    this.model.code = invoice.code;
                     this.type = invoice.type;
                     if (invoice.type == 2) {
-                        this.typeName = this.radioItems[0].name;
+                        this.model.typeName = this.radioItems[0].name;
                     } else if (invoice.type == 3) {
-                        this.typeName = this.radioItems[1].name;
+                        this.model.typeName = this.radioItems[1].name;
                     }
                 }
             }
@@ -126,31 +157,39 @@
             },
             // 保存发票信息
             saveInvoice() {
-                if (this.type === '1' || this.type === 1) {
-                    this.$u.toast('请选择发票类型')
-                    return false
-                }
-                if (!this.name) {
-                    this.$u.toast('请输入发票抬头')
-                    return false
-                }
-                // 个人需要输入昵称
-                if (this.type === '3' && !this.code) {
-                    this.$u.toast('请输入发票税号信息')
-                    return false
-                }
-                // 企业类型需要输入税号
-                if (this.type === '3' && !this.code) {
-                    this.$u.toast('请输入发票税号信息')
-                    return false
-                }
-                let data = {
-                    type: this.type,
-                    name: this.name
-                }
-                // 不是企业类型不需要税号
-                data['code'] = this.type === '3' ? this.code : ''
-                this.setPageData(data)
+                //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('验证通过');
+
+                        let data = {
+                            type: this.type,
+                            name: this.model.name
+                        }
+                        // 不是企业类型不需要税号
+                        data['code'] = this.type === '3' ? this.model.code : ''
+
+                        this.setPageData(data)
+
+                    } else {
+                        console.log('验证失败');
+                    }
+                });
+
+
             },
             // 向上个页面赋值并返回
             setPageData(data) {
@@ -173,7 +212,7 @@
                 }
             },
             getCheque(event) {
-                let name = event.detail.value
+                let name = event;
                 if (name != '') {
                     let data = {
                         name: name
@@ -195,23 +234,15 @@
                 }
             },
             chooseCheque(item) {
-                this.name = item.name;
-                this.code = item.code;
+                this.model.name = item.name;
+                this.model.code = item.code;
                 this.isShow = false;
                 this.type = '3';
-                this.typeName = this.radioItems[1].name;
+                this.model.typeName = this.radioItems[1].name;
             }
         }
     }
 </script>
 <style scoped lang="scss">
-    .cu-form-group .title { min-width: calc(4em + 15px); }
-
-    .coreshop-bottomBox .coreshop-btn { width: 100%; }
-    .cheque { position: relative; }
-    .cheque-content { position: absolute; left: 15rpx; top: 90rpx; z-index: 10; width: calc(100% - 30rpx);; background-color: #fff; box-shadow: 0 0 0.666667vw 0.4vw rgba(0, 0, 0, .13); border-radius: 10rpx; padding: 20rpx; }
-    .tips-item { margin-bottom: 20rpx; }
-    .tips-name { font-size: 32rpx; line-height: 35rpx; color: #333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; margin-bottom: 10rpx; }
-    .sub-div { display: flex; width: 100%; justify-content: space-between; height: 30rpx; font-size: 24rpx; line-height: 30rpx; color: #999; }
-    .num { display: inline-block; }
+    @import "invoice.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.scss b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.scss
new file mode 100644
index 0000000000000000000000000000000000000000..8dd5ec78f9cad7769663c4acd04a527e241a98c2
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.scss
@@ -0,0 +1,8 @@
+.coreshop-list { margin: 20rpx;
+    &.menu-avatar {
+        & > .coreshop-list-item { height: auto;
+            & > .coreshop-avatar { position: absolute; left: 15rpx; }
+            .content { position: initial; width: calc(100% - 96rpx - 120rpx - 20rpx); }
+        }
+    }
+}
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 522f095c8e3098814c0cf1d68682704254a4ff92..eb3c38a7185be0939d43b11c2d54e8a97af5ba76 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/storeList/storeList.vue
@@ -2,42 +2,42 @@
     <view>
         <u-navbar title="门店列表"></u-navbar>
         <view class="content">
-            <view class="u-padding-15 bg-white u-border-bottom">
-                <u-search placeholder="请输入门店名" v-model="key" :show-action="true" action-text="搜索" :animation="false" @search="storeSearch" @custom="storeSearch"></u-search>
+            <view class="u-padding-15 coreshop-bg-white u-border-bottom">
+                <u-search placeholder="请输入门店名" v-model="key" :show-action="true" action-text="搜索" :animation="false" @clear="clear" @search="storeSearch" @custom="storeSearch"></u-search>
             </view>
 
             <view v-if="storeList.length>0">
-                <view class="cu-list menu-avatar" v-for="(item, key) in storeList" :key="key" @click="selectStore(item.id, item.storeName, item.mobile, item.address)">
-                    <view class="cu-item  u-padding-top-20  u-padding-bottom-20">
-                        <view class="cu-avatar lg radius" :style="[{backgroundImage:'url('+ item.logoImage +')'}]" />
+                <view class="coreshop-list menu-avatar" v-for="(item, key) in storeList" :key="key" @click="selectStore(item.id, item.storeName, item.mobile, item.address)">
+                    <view class="coreshop-list-item  u-padding-top-20  u-padding-bottom-20">
+                        <view class="coreshop-avatar lg radius" :style="[{backgroundImage:'url('+ item.logoImage +')'}]" />
                         <view class="content">
-                            <view class="text-grey">{{item.storeName|| ''}}</view>
-                            <view class="text-gray text-sm flex">
-                                <view class="text-cut">
+                            <view class="coreshop-text-grey">{{item.storeName|| ''}}</view>
+                            <view class="coreshop-text-gray u-font-sm">
+                                <view class="u-line-1">
                                     电话：{{item.mobile|| ''}}
                                 </view>
                             </view>
-                            <view class="text-gray text-sm flex">
+                            <view class="coreshop-text-gray u-font-sm">
                                 <view class="u-line-2">
                                     地址：{{item.address|| ''}}
                                 </view>
                             </view>
                         </view>
                         <view class="action">
-                            <view class="text-grey text-xs u-margin-bottom-20">{{item.distanceStr|| ''}}</view>
-                            <view class="cu-tag round bg-grey sm">点击选择</view>
+                            <view class="coreshop-text-grey u-font-xs u-margin-bottom-20">{{item.distanceStr|| ''}}</view>
+                            <u-button type="success" size="mini">选择</u-button>
                         </view>
                     </view>
                 </view>
             </view>
             <!-- 无数据时默认显示 -->
             <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无门店列表" mode="list"></u-empty>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无门店列表" mode="list"></u-empty>
             </view>
         </view>
 
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+		<coreshop-login-modal></coreshop-login-modal>
     </view>
 
 </template>
@@ -60,6 +60,17 @@
         methods: {
             //门店搜索
             storeSearch() {
+                console.log('storeSearch');
+                this.page = 1;
+                this.limit = 30;
+                this.storeList = [];
+                this.getStoreList();
+            },
+            clear() {
+                console.log('clear');
+                this.page = 1;
+                this.limit = 30;
+                this.storeList = [];
                 this.getStoreList();
             },
             //获取门店列表
@@ -121,8 +132,5 @@
 </script>
 
 <style lang="scss">
-    .cu-list { margin: 20rpx; }
-        .cu-list.menu-avatar > .cu-item { height: auto; }
-            .cu-list.menu-avatar > .cu-item > .cu-avatar { position: absolute; left: 15rpx; }
-            .cu-list.menu-avatar > .cu-item .content { position: initial; width: calc(100% - 96rpx - 120rpx - 20rpx); }
+    @import "storeList.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/reward/reward.vue b/CoreCms.Net.Uni-App/CoreShop/pages/reward/reward.vue
index 9f252a14050c2b34b6a7af11d58ba3d45d808780..d4efbf65c7ca3c7a99f9a9e8cbaaf328f8a625c6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/reward/reward.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/reward/reward.vue
@@ -1,12 +1,12 @@
 <template>
     <view>
         <u-navbar title="打赏"></u-navbar>
-        <view class="padding bg-white">
-            <image :src="$apiFilesUrl+'/static/images/reward/wx.png'" mode="widthFix" />
-            <image :src="$apiFilesUrl+'/static/images/reward/zfb.jpg'" mode="widthFix" />
+        <view class="u-padding-30 coreshop-bg-white">
+            <image :src="$globalConstVars.apiFilesUrl+'/static/images/reward/wx.png'" mode="widthFix" />
+            <image :src="$globalConstVars.apiFilesUrl+'/static/images/reward/zfb.jpg'" mode="widthFix" />
         </view>
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+		<coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 <script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/search/search.vue b/CoreCms.Net.Uni-App/CoreShop/pages/search/search.vue
index 0dae1a6fec1a8c3797970af6bebd9c2795ca62b2..db9a002b8560089eef307ac205e0f1f259e5a39e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/search/search.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/search/search.vue
@@ -2,7 +2,7 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="搜索"></u-navbar>
-        <view class="u-padding-15 u-margin-bottom-15 bg-white u-border-bottom">
+        <view class="u-padding-15 u-margin-bottom-15 coreshop-bg-white u-border-bottom">
             <u-search placeholder="请输入关键字搜索" v-model="key" :show-action="true" action-text="搜索" :animation="false" @search="search" @custom="search"></u-search>
         </view>
 
@@ -25,7 +25,7 @@
             </view>
         </view>
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+		<coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.scss b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.scss
new file mode 100644
index 0000000000000000000000000000000000000000..725f4ecb258405f858c317c0f24ec0f6b6263076
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.scss
@@ -0,0 +1 @@
+.coreshop-limited-seckill-box .coreshop-time-right { position: absolute; right: 30rpx; top: 10rpx; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
index 1ebc0d83622fab16e9b4b3f97c2e364ac829b0af..e453fd3743bd8caa564ca1a1be9d1ad9d9724827 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
@@ -2,77 +2,72 @@
     <!-- 页面主体 -->
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
-        <view class="nav-back">
+        <view class="coreshop-full-screen-nav-back">
             <view class="back-btn" @click="toBackBtn()">
-                <image class="icon" src="/static/images/common/back-black.png" mode=""></image>
+                <u-icon name="arrow-left" size="40" top="12"></u-icon>
             </view>
         </view>
 
-        <view class="coreshop-banner-swiper-box">
+        <view class="coreshop-full-screen-banner-swiper-box">
             <u-image width="100%" height="750rpx" :src="info.thumbnail && info.thumbnail!='null' ?  info.thumbnail+'?x-oss-process=image/resize,m_lfit,h_320,w_240' : '/static/images/common/empty-banner.png'">
                 <u-loading slot="loading"></u-loading>
             </u-image>
         </view>
 
         <!--限时秒杀-->
-        <view class="coreshop-limited-seckill-box bg-green">
-            <text class="text-price text-xxl">{{ info.money || '0.00' }}</text>
-            <view class="text-xs coreshop-cost-price-num price-4">
+        <view class="coreshop-limited-seckill-box coreshop-bg-green">
+            <text class="coreshop-text-price u-font-40">{{ info.money || '0.00' }}</text>
+            <view class="u-font-xs coreshop-cost-price-num price-4">
                 <view>单包量：{{ info.ticketNumber }}</view>
                 <view>剩余：{{ info.amount || '0' }} </view>
             </view>
-            <view class="text-right coreshop-time-right">
+            <view class="u-text-right coreshop-time-right">
                 <view>限时秒杀</view>
-                <view class="text-xs">
+                <view class="u-font-xs">
                     距结束剩余 <u-count-down :timestamp="timestamp" separator="zh" separator-size="22" separator-color="#ffffff" font-size="22" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true"></u-count-down>
                 </view>
             </view>
-            <view class="text-right coreshop-share-right">
-                <u-icon name="share" @click="goShare()" label="分享" size="40" label-size="22" label-color="#fff" label-pos="bottom"></u-icon>
-            </view>
         </view>
 
         <!--标题-->
-        <view class="bg-white coreshop-view-box coreshop-title-view-box">
+        <view class="coreshop-bg-white coreshop-common-view-box coreshop-good-title-view-box">
             <view class="title-view">
-                <text class="text-black text-lg text-bold">{{ info.title || '' }}</text>
+                <text class="coreshop-text-black u-font-lg coreshop-text-bold">{{ info.title || '' }}</text>
             </view>
-            <view class="light bg-red radius margin-top-sm coreshop-title-tip-box">
-                <view>
-                    <text class="text-sm">{{ info.description || '' }}</text>
-                </view>
+            <view class="light coreshop-bg-red radius u-margin-top-20 coreshop-title-tip-box">
+                <text class="u-font-sm">{{ info.description || '' }}</text>
             </view>
         </view>
 
         <!--会员级别-->
-        <view class="margin-top bg-white coreshop-view-box coreshop-promotion-view-box" v-if="info.allowedMemberships">
-            <view class="flex flex-wrap text-sm">
-                <view class="basis-2">
-                    <text class="text-gray">会员级别</text>
+        <view class="u-margin-top-20 coreshop-bg-white coreshop-common-view-box" v-if="info.allowedMemberships">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-2">
+                    <text class="coreshop-text-gray">会员级别</text>
                 </view>
-                <view class="basis-8">
-                    <text class="cu-tag bg-olive sm radius" v-for="(item, index) in info.allowedMemberships" :key="index">{{item}}</text>
+                <view class="coreshop-basis-8">
+                    <u-tag :text="item" mode="light" size="mini" class="u-margin-right-5" v-for="(item, indexChild) in info.allowedMemberships" :key="indexChild" />
                 </view>
             </view>
         </view>
 
         <!--服务网点-->
-        <view class="bg-white coreshop-view-box coreshop-select-view-box">
-            <view class="flex flex-wrap text-sm">
-                <view class="basis-2">
-                    <text class="text-gray">服务网点</text>
+        <view class="coreshop-bg-white coreshop-common-view-box ">
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-2">
+                    <text class="coreshop-text-gray">服务网点</text>
                 </view>
-                <view class="basis-8">
-                    <text class="cu-tag bg-orange sm radius" v-for="(item, index) in info.consumableStores" :key="index">{{item}}</text>
+                <view class="coreshop-basis-8">
+                    <u-icon name="checkmark-circle" size="20" label-size="24" color="#e54d42" :label="item" v-for="(item, index) in info.consumableStores" :key="index" class="u-margin-right-10"></u-icon>
                 </view>
             </view>
-            <view class="coreshop-border-view" />
-            <view class="flex flex-wrap text-sm">
-                <view class="basis-2">
-                    <text class="text-gray">有效期</text>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20 u-padding-top-20" />
+            <view class="coreshop-flex coreshop-flex-wrap u-font-sm">
+                <view class="coreshop-basis-2">
+                    <text class="coreshop-text-gray">有效期</text>
                 </view>
-                <view class="basis-8">
-                    <text class="text-sm">
+                <view class="coreshop-basis-8">
+                    <text class="u-font-24">
                         {{info.validityStartTime}} 至 {{info.validityEndTime}}
                     </text>
                 </view>
@@ -80,127 +75,129 @@
         </view>
 
         <!--内容区-->
-        <view class="margin-top bg-white coreshop-details-view-box">
-            <view class="text-df title-view">
-                <text class="cuIcon-titles text-red" />
-                <text class="text-black">服务详情</text>
+        <view class="u-margin-top-20 u-padding-top-10 coreshop-bg-white">
+            <view class="u-font-md u-padding-top-10 u-padding-bottom-10 u-padding-left-20 u-padding-right-10">
+                <u-icon name="more-circle" color="#e54d42"></u-icon>
+                <text class="u-margin-left-10 coreshop-text-black">服务详情</text>
             </view>
-            <view class="u-padding-10">
+            <view class="u-padding-10 coreshop-good-rich-text-view">
                 <u-parse :html="info.contentBody" :selectable="true" v-if="info.contentBody"></u-parse>
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="详情为空" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/data.png'" icon-size="300" text="详情为空" mode="list"></u-empty>
                 </view>
             </view>
         </view>
 
         <!--常见问题-->
-        <view class="margin-top bg-white margin-bottom coreshop-view-box coreshop-goods-help-view-box">
-            <view class="text-black text-lg margin-bottom-sm">常见说明</view>
-            <view class="flex flex-wrap margin-bottom">
-                <view class="basis-2">
+        <view class="u-margin-top-20 coreshop-bg-white u-margin-bottom-30 coreshop-common-view-box">
+            <view class="u-font-md u-padding-bottom-20">
+                <u-icon name="question-circle" color="#e54d42"></u-icon>
+                <text class="u-margin-left-10 coreshop-text-black">常见说明</text>
+            </view>
+            <view class="coreshop-flex coreshop-flex-wrap u-margin-bottom-20">
+                <view class="coreshop-basis-2">
                     <text class="cu-tag bg-grey radius sm">服务说明</text>
                 </view>
-                <view class="basis-8">
-                    <view class="text-sm">服务是对商品概念的扩展，商品订单为单次交易，但很多是否需要购买的商品或产品能够进行多次次数消费，特推出此服务包。</view>
+                <view class="coreshop-basis-8">
+                    <view class="u-font-sm">服务是对商品概念的扩展，商品订单为单次交易，但很多是否需要购买的商品或产品能够进行多次次数消费，特推出此服务包。</view>
                 </view>
             </view>
-            <view class="flex flex-wrap margin-bottom">
-                <view class="basis-2">
+            <view class="coreshop-flex coreshop-flex-wrap u-margin-bottom-20">
+                <view class="coreshop-basis-2">
                     <text class="cu-tag bg-grey radius sm">权利声明</text>
                 </view>
-                <view class="basis-8">
-                    <view class="text-sm">本站商品信息均来自于合作方，其真实性、准确性和合法性由信息拥有者（合作方）负责。本站不提供任何保证，并不承担任何法律责任。</view>
+                <view class="coreshop-basis-8">
+                    <view class="u-font-sm">本站商品信息均来自于合作方，其真实性、准确性和合法性由信息拥有者（合作方）负责。本站不提供任何保证，并不承担任何法律责任。</view>
                 </view>
             </view>
-            <view class="flex flex-wrap margin-bottom">
-                <view class="basis-2">
+            <view class="coreshop-flex coreshop-flex-wrap u-margin-bottom-20">
+                <view class="coreshop-basis-2">
                     <text class="cu-tag bg-grey radius sm">销售价</text>
                 </view>
-                <view class="basis-8">
-                    <view class="text-sm">销售价为商品的销售价格，是您最终决定是否购买商品的依据。</view>
+                <view class="coreshop-basis-8">
+                    <view class="u-font-sm">销售价为商品的销售价格，是您最终决定是否购买商品的依据。</view>
                 </view>
             </view>
-            <view class="flex flex-wrap margin-bottom">
-                <view class="basis-2">
+            <view class="coreshop-flex coreshop-flex-wrap u-margin-bottom-20">
+                <view class="coreshop-basis-2">
                     <text class="cu-tag bg-grey radius sm">划线价</text>
                 </view>
-                <view class="basis-8">
-                    <view class="text-sm">商品展示的划横线价格为参考价，并非原价，该价格可能是品牌专柜标价、商品吊牌价或由品牌供应商提供的正品零售价（如厂商指导价、建议零售价等）或该商品在平台上曾经展示过的销售价；由于地区、时间的差异性和市场行情波动，品牌专柜标价、商品吊牌价等可能会与您购物时展示的不一致，该价格仅供您参考。</view>
+                <view class="coreshop-basis-8">
+                    <view class="u-font-sm">商品展示的划横线价格为参考价，并非原价，该价格可能是品牌专柜标价、商品吊牌价或由品牌供应商提供的正品零售价（如厂商指导价、建议零售价等）或该商品在平台上曾经展示过的销售价；由于地区、时间的差异性和市场行情波动，品牌专柜标价、商品吊牌价等可能会与您购物时展示的不一致，该价格仅供您参考。</view>
                 </view>
             </view>
-            <view class="flex flex-wrap margin-bottom">
-                <view class="basis-2">
+            <view class="coreshop-flex coreshop-flex-wrap u-margin-bottom-20">
+                <view class="coreshop-basis-2">
                     <text class="cu-tag bg-grey radius sm">折扣</text>
                 </view>
-                <view class="basis-8">
-                    <view class="text-sm">如无特殊说明，折扣指销售商在原价、或划线价（如品牌专柜标价、商品吊牌价、厂商指导价、厂商建议零售价）等某一价格基础上计算出的优惠比例或优惠金额；如有疑问，您可在购买前联系销售商进行咨询。</view>
+                <view class="coreshop-basis-8">
+                    <view class="u-font-sm">如无特殊说明，折扣指销售商在原价、或划线价（如品牌专柜标价、商品吊牌价、厂商指导价、厂商建议零售价）等某一价格基础上计算出的优惠比例或优惠金额；如有疑问，您可在购买前联系销售商进行咨询。</view>
                 </view>
             </view>
-            <view class="flex flex-wrap margin-bottom">
-                <view class="basis-2">
+            <view class="coreshop-flex coreshop-flex-wrap u-margin-bottom-20">
+                <view class="coreshop-basis-2">
                     <text class="cu-tag bg-grey radius sm">异常问题</text>
                 </view>
-                <view class="basis-8">
-                    <view class="text-sm">商品促销信息以商品详情页“促销”栏中的信息为准；商品的具体售价以订单结算页价格为准；如您发现活动商品售价或促销信息有异常，建议购买前先联系销售商咨询。</view>
+                <view class="coreshop-basis-8">
+                    <view class="u-font-sm">商品促销信息以商品详情页“促销”栏中的信息为准；商品的具体售价以订单结算页价格为准；如您发现活动商品售价或促销信息有异常，建议购买前先联系销售商咨询。</view>
                 </view>
             </view>
-            <view class="coreshop-border-view" />
-            <view class="text-center text-blue" @tap="goArticleList()">查看更多问题</view>
+            <view class="coreshop-solid-bottom u-margin-top-20 u-margin-bottom-20" />
+            <view class="u-text-center coreshop-text-blue  u-padding-top-20" @tap="goArticleList()">查看更多问题</view>
         </view>
 
-        <!--按钮-->
-        <!--<view class="bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
-            <view class="flex padding-sm flex-direction basis-10">
-                <button class="cu-btn bg-red" @tap="$u.debounce(toAddOrder, 500)">立刻购买</button>
-            </view>
-        </view>-->
-
-         <!--占位底部距离-->
-        <view class="cu-tabbar-height" />
-        <!--底部操作-->
-        <view class="coreshop-footer-fixed">
-            <view class="cu-bar bg-white tabbar border shop">
-                <!-- 客服按钮 -->
-                <!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
-                <view class="action" @click="showChat()">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
-                </view>
-                <!-- #endif -->
-                <!-- #ifdef MP-WEIXIN -->
-                <button class="action" hover-class="none" open-type="contact" bindcontact="showChat" :session-from="kefupara">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
-                </button>
-                <!-- #endif -->
-                <!-- #ifdef MP-ALIPAY -->
-                <view class="action">
-                    <contact-button class="goods-bottom-ic icon" icon="/static/images/customerservice.png" size="80rpx*80rpx" tnt-inst-id="WKPKUZXG" scene="SCE00040186" hover-class="none" />
+        <!--为您推荐-->
+        <view class="coreshop-recommended-title-view">
+            <view class="u-flex u-flex-wrap">
+                <view class="u-flex-4 u-text-right">
+                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
-                <!-- #endif -->
-                <!-- #ifdef MP-TOUTIAO -->
-                <view class="action" @click="showChat()">
-                    <view class="cuIcon-service" />
-                    <view>客服</view>
+                <view class="u-flex-4 u-text-center">
+                    <text class="coreshop-text-black u-font-lg">为您推荐</text>
                 </view>
-                <!-- #endif -->
-                <button class="action" @click="collection">
-                    <view :class="isfav ? 'cuIcon-favorfill':'cuIcon-favor'" />
-                    <view v-if="!isfav">收藏</view>
-                    <view v-if="isfav">已收藏</view>
-                </button>
-                
-                <view class="btn-group">
-                    <button class="cu-btn bg-green radius shadow-blur  y-f buyBtn" style="width: 90%;" @tap="$u.debounce(toAddOrder, 500)">立刻购买</button>
+                <view class="u-flex-4 u-text-left">
+                    <image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
                 </view>
             </view>
         </view>
 
+        <!--推荐列表-->
+        <view class="coreshop-goods-group" v-if="otherRecommendData.length>0">
+            <u-grid col="2" :border="false" :align="center">
+                <u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in otherRecommendData" :key="index" @click="goGoodsDetail(item.id)">
+                    <view class="good_box">
+                        <!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
+                        <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
+                        <view class="good_title u-line-2">
+                            {{item.name}}
+                        </view>
+                        <view class="good-price">
+                            {{item.price}}元 <span class="u-font-xs  coreshop-text-through u-margin-left-15 coreshop-text-gray">{{item.mktprice}}元</span>
+                        </view>
+                        <view class="good-tag-recommend" v-if="item.isRecommend">
+                            推荐
+                        </view>
+                        <view class="good-tag-hot" v-if="item.isHot">
+                            热门
+                        </view>
+                    </view>
+                </u-grid-item>
+            </u-grid>
+        </view>
 
+        <!--占位底部距离-->
+        <view class="coreshop-tabbar-height" />
+        <!--底部操作-->
+        <!--按钮-->
+        <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="success" size="medium" @click="toAddOrder">立刻购买</u-button>
+            </view>
+        </view>
 
         <!-- 登录提示 -->
-        <corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
@@ -210,16 +207,23 @@
         mixins: [commonUse, articles],
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 id: 0,
                 info: {},
                 timestamp: 86400,
-                orderType: 5	// 订单类型
+                orderType: 5,	// 订单类型
+                otherRecommendData: [], // 其他数据
+
             }
         },
         onLoad(e) {
             this.id = e.id;
-            console.log(this.id);
+            //获取服务商品数据
             this.getDetail();
+            //获取推荐商品数据
+            this.getGoodsRecommendList();
         },
         methods: {
             getDetail() {
@@ -235,6 +239,20 @@
                     }
                 });
             },
+            // 获取推荐商品信息
+            getGoodsRecommendList() {
+                let _this = this;
+                let data = {
+                    id: 10
+                }
+                _this.$u.api.getGoodsRecommendList(data).then(res => {
+                    if (res.status) {
+                        _this.otherRecommendData = _this.$u.randomArray(res.data);
+                    } else {
+                        _this.$u.toast(res.msg)
+                    }
+                });
+            },
             toAddOrder() {
                 //创建一个服务订单并跳转到支付
                 let data = {
@@ -253,5 +271,5 @@
 </script>
 
 <style lang="scss" scoped>
-    @import '../../../static/style/goodDetails.scss';
+    @import "details.scss";
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue
index a52f694e8c83cb84ae7a65ab4220bd4b4ce94d06..20f51dc5638e76f4c5d47cc94ce58967b0855d41 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue
@@ -4,7 +4,7 @@
         <u-navbar title="服务商品"></u-navbar>
         <view class="content">
             <view v-if="list.length">
-                <view class="order" v-for="(item, index) in list" :key="index" @click="goServicesDetail(item.id)">
+                <view class="orderList" v-for="(item, index) in list" :key="index" @click="goServicesDetail(item.id)">
                     <view class="top">
                         <view class="left">
                             <u-icon name="clock" :size="28" color="rgb(94,94,94)"></u-icon>
@@ -18,32 +18,33 @@
                             仅剩{{item.amount}}
                         </view>
                     </view>
-                    <view class="item">
+                    <view class="item u-padding-20 coreshop-solid-bottom">
                         <view class="left"><image :src="item.thumbnail && item.thumbnail!='null' ?  item.thumbnail : '/static/images/common/empty-banner.png'" mode="aspectFill"></image></view>
                         <view class="content">
                             <view class="title u-line-2">{{item.title}}</view>
                             <view class="type u-line-2">{{item.description}}</view>
-                            <view class="text-price text-red u-margin-bottom-10">{{ item.money }}</view>
+                            <view class="coreshop-text-price coreshop-text-red u-margin-bottom-10">{{ item.money }}</view>
                             <view class="delivery-time">最大购买限制：{{item.maxBuyNumber== 0 ? '不限' : item.maxBuyNumber}}</view>
                         </view>
                     </view>
-                    <view class="bottom cell u-border-bottom text-sm">
+
+                    <view class="coreshop-text-gray u-font-xs u-flex u-flex-nowrap u-padding-20 coreshop-solid-bottom">
                         兑换级别：
                         <view v-if="item.allowedMemberships && item.allowedMemberships.length>0">
-                            <view class="cu-tag bg-olive light sm" v-for="(item, index) in item.allowedMemberships" :key="index">{{item}}</view>
+                            <u-tag :text="item" mode="light" size="mini" class="u-margin-right-5" v-for="(item, indexChild) in item.allowedMemberships" :key="indexChild" />
                         </view>
                     </view>
-                    <view class="bottom cell u-border-bottom text-sm">
+                    <view class="coreshop-text-gray u-font-xs u-flex u-flex-nowrap u-padding-20 coreshop-solid-bottom">
                         兑换门店：
                         <view v-if="item.consumableStores && item.consumableStores.length>0">
-                            <view class="cu-tag bg-orange light sm" v-for="(item, index) in item.consumableStores" :key="index">{{item}}</view>
+                            <view class="coreshop-bg-orange light sm  u-padding-4 u-margin-right-5" v-for="(item, indexChild) in item.consumableStores" :key="indexChild">{{item}}</view>
                         </view>
                     </view>
-                    <view class="bottom2">
-                        <view class="more text-sm">
+                    <view class="u-flex u-flex-nowrap u-row-between u-padding-10">
+                        <view class="u-font-xs">
                             购买截止：{{ item.endTime }}
                         </view>
-                        <view class='evaluate coreshop-btn' hover-class="btn-hover">立刻抢购</view>
+                        <u-button type="warning" shape="square"  size="mini" :plain="true">立刻抢购</u-button>
                     </view>
                 </view>
                 <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
@@ -51,16 +52,19 @@
 
             <!-- 无数据时默认显示 -->
             <view class="coreshop-emptybox" v-else>
-                <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无服务列表" mode="list"></u-empty>
+                <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无服务列表" mode="list"></u-empty>
             </view>
         </view>
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 
 </template>
 
 <script>
+
+    
+
     import { services } from '@/common/mixins/mixinsHelper.js'
     export default {
         mixins: [services],
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
index 5625d0789fae42663b7504ce2f56a30a985047ff..64c78c16a88b2f7d88a386e0008dfb0ea5155286 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
@@ -122,7 +122,7 @@
             //todo:: 功能暂无后续开发
             // gotoInvitationGroup(id, groupId, teamId) {
             // 	if(id && id != '' && groupId && groupId != '' && teamId && teamId != ''){
-            // 		let url = '/pages/member/order/invitationGroup?id=' + id + '&groupId=' + groupId + '&teamId=' + teamId;
+            // 		let url = '/pages/member/order/invitationGroup/invitationGroup?id=' + id + '&groupId=' + groupId + '&teamId=' + teamId;
             // 		this.$u.route({ type: 'redirectTo', url: url });
             // 	}else{
             // 		this.gotoIndex();
@@ -139,7 +139,7 @@
             },
             gotoStore(id) {
                 if (id && id != '') {
-                    let url = '/pages/member/distribution/myStore?store=' + id;
+                    let url = '/pages/member/distribution/myStore/myStore?store=' + id;
                     this.$u.route({ type: 'redirectTo', url: url });
                 } else {
                     this.gotoIndex();
@@ -147,7 +147,7 @@
             },
             gotoAgentStore(id) {
                 if (id && id != '') {
-                    let url = '/pages/member/agent/myStore?store=' + id;
+                    let url = '/pages/member/agent/myStore/myStore?store=' + id;
                     this.$u.route({ type: 'redirectTo', url: url });
                 } else {
                     this.gotoIndex();
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.scss b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.scss
new file mode 100644
index 0000000000000000000000000000000000000000..7b81dde4af30ac670aa3d2b03d3c6f39e719e020
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.scss
@@ -0,0 +1,4 @@
+.share-top { margin-bottom: 50upx; padding-top: 50upx; text-align: center;
+    .share-img { box-shadow: 0 0 20upx #ccc; width: 80%; }
+}
+.share-bot { width: 80%; margin: 0 auto; }
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 787f4073206b39f4efe63c5e5caaa6ae732ad05e..44925089b1a3c71fe4963e5006bcd57872139499 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
@@ -2,16 +2,22 @@
     <view>
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar title="分享"></u-navbar>
-        <view class="content">
-            <view class="share-top"><img class="share-img" :src="poster" mode="widthFix" /></view>
-            <view class="share-bot flex flex-direction">
-                <button class="cu-btn bg-grey lg u-margin-bottom-40" v-if="weiXinBrowser">长按图片保存到手机</button>
-                <button class="cu-btn bg-grey lg u-margin-bottom-40" @click="savePoster()" v-else>保存到本地</button>
-                <button class="cu-btn line-black lg" @click="goBack()">返回</button>
+        <view class="share-top"><img class="share-img" :src="poster" mode="widthFix" /></view>
+        <view class="share-bot flex flex-direction">
+            <view class="u-margin-bottom-40">
+                <u-button shape="square" type="primary" v-if="weiXinBrowser">
+                    <u-icon name="download" :margin-right="20" label="长按图片保存到手机" label-color="#fff"></u-icon>
+                </u-button>
+                <u-button shape="square" type="primary" @click="savePoster()" v-else>
+                    <u-icon name="download" :margin-right="20" label="保存到本地" label-color="#fff"></u-icon>
+                </u-button>
             </view>
+            <u-button shape="square" @click="goBack()">
+                <u-icon name="arrow-leftward" :margin-right="20" label="返回" label-color="#333"></u-icon>
+            </u-button>
         </view>
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+        <coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 <script>
@@ -122,9 +128,5 @@
     };
 </script>
 <style scoped lang="scss">
-    view { box-sizing: border-box; }
-    .share-top { margin-bottom: 50upx; padding-top: 50upx; text-align: center; }
-    .share-img { box-shadow: 0 0 20upx #ccc; width: 80%; }
-    .share-bot { width: 80%; margin: 0 auto; }
-        .share-bot .coreshop-btn { width: 100%; margin: 20upx 0; }
+    @import "sharePoster.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss b/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss
new file mode 100644
index 0000000000000000000000000000000000000000..f1fbe91aa2692cce345c170db43f85163f441f73
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.scss
@@ -0,0 +1,7 @@
+.content { width: 100%; /* #ifdef H5 */ height: calc(100vh - 44px); /* #endif */ }
+.map-body { width: 100%; height: 700rpx; position: relative; }
+.store-list { background-color: #fff; height: calc(100vh - 44px - 700rpx);
+    .coreshop-list-item { height: 160rpx;
+        .action { width: 130rpx; }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.vue b/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.vue
index 42dd9dd28d1cb18079c8f60e7878dc87eb191d9f..35373dcf2edef509e1a34a996ae32f05d188124d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/storeMap/storeMap.vue
@@ -16,42 +16,39 @@
                 </map>
             </view>
             <scroll-view class="store-list" scroll-y>
-
                 <view class="u-margin-top-30" v-if="storeList.length>0">
-                    <view class="cu-list menu-avatar" v-for="(item, key) in storeList" :key="key">
-                        <view class="cu-item  u-padding-top-20  u-padding-bottom-20">
-                            <view class="cu-avatar lg radius" :style="[{backgroundImage:'url('+ item.logoImage +')'}]" />
+                    <view class="coreshop-list menu-avatar" v-for="(item, key) in storeList" :key="key">
+                        <view class="coreshop-list-item">
+                            <image class="coreshop-avatar lg radius" :src="item.logoImage" mode="aspectFill"></image>
                             <view class="content">
-                                <view class="text-grey">{{item.storeName|| ''}}</view>
-                                <view class="text-gray text-sm flex">
-                                    <u-icon name="phone" size="28"></u-icon>
-                                    <view class="text-cut" @tap="doPhoneCall(item.mobile)">
-                                        电话：{{item.mobile|| ''}}
+                                <view class="coreshop-text-grey u-margin-bottom-10">{{item.storeName|| ''}}</view>
+                                <view class="coreshop-text-gray u-font-sm flex u-margin-bottom-10">
+                                    <view class="u-line-2" @tap="doPhoneCall(item.mobile)">
+                                        <u-icon name="phone" size="24" :label="item.mobile"></u-icon>
                                     </view>
                                 </view>
-                                <view class="text-gray text-sm flex">
-                                    <u-icon name="map" size="28"></u-icon>
-                                    <view class="text-cut">
-                                        地址：{{item.address|| ''}}
+                                <view class="coreshop-text-gray u-font-sm flex u-margin-bottom-10">
+                                    <view class="u-line-2 u-font-xs">
+                                       地址：{{item.address}}
                                     </view>
                                 </view>
                             </view>
                             <view class="action" @click="goMarkers(item.latitude,item.longitude)">
-                                <view class="text-grey text-xs u-margin-bottom-20">{{item.distanceStr|| ''}}</view>
-                                <view class="cu-tag round bg-grey sm">点击查看</view>
+                                <view class="coreshop-text-grey u-font-xs u-margin-bottom-20">{{item.distanceStr|| ''}}</view>
+                                <u-tag text="点击查看" type="success" size="mini"/>
                             </view>
                         </view>
                     </view>
                 </view>
                 <!-- 无数据时默认显示 -->
                 <view class="coreshop-emptybox" v-else>
-                    <u-empty :src="$apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无门店列表" mode="list"></u-empty>
+                    <u-empty :src="$globalConstVars.apiFilesUrl+'/static/images/empty/history.png'" icon-size="300" text="暂无门店列表" mode="list"></u-empty>
                 </view>
 
             </scroll-view>
         </view>
         <!-- 登录提示 -->
-		<corecms-login-modal></corecms-login-modal>
+		<coreshop-login-modal></coreshop-login-modal>
     </view>
 </template>
 
@@ -137,13 +134,5 @@
 </script>
 
 <style scoped lang="scss">
-    view { box-sizing: border-box; }
-    .content { width: 100%; /* #ifdef H5 */ height: calc(100vh - 44px); /* #endif */ }
-    .map-body { width: 100%; height: 700rpx; position: relative; }
-    .store-list { background-color: #fff; height: calc(100vh - 44px - 700rpx); }
-
-    /*    .cu-list { margin: 20rpx; }
-        .cu-list.menu-avatar > .cu-item { height: auto; }
-            .cu-list.menu-avatar > .cu-item > .cu-avatar { position: absolute; left: 15rpx; }
-            .cu-list.menu-avatar > .cu-item .content { position: initial; width: calc(100% - 96rpx - 120rpx - 20rpx); }*/
+    @import "storeMap.scss";
 </style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/template.vue b/CoreCms.Net.Uni-App/CoreShop/pages/template.vue
index 9c15d9e0782da6e00dac186772deae8deb98c4a3..b4f1ea1805ffdf3dfc5ef97784e6057683a8ed69 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/template.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/template.vue
@@ -12,9 +12,28 @@
                 <u-button :ripple="true">按钮组件演示</u-button>
             </view>
             <view class="link-demo">
-                <u-link :color="$u.color['primary']" :under-line="true" href="http://www.corecms.net">跳转CoreCms官网：www.coreshop.cn</u-link>
+                <u-link :color="$u.color['primary']" :under-line="true" href="http://www.coreshop.net">跳转coreshop官网：www.coreshop.cn</u-link>
             </view>
         </view>
+
+        
+        <view class="coreshop-bg-white coreshop-card-hight-box" />
+
+        <!--底部-->
+        <view class="coreshop-foot-hight-view" />
+        <view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom u-text-center u-padding-20">
+            <u-button class='coreshop-bg-red' type="success" size="default"  @click="">确认</u-button>
+        </view>
+
+
+        <!--按钮-->
+        <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="submitHandler" :disabled='submitStatus' :loading='submitStatus'>保存</u-button>
+            </view>
+        </view>
+
+
     </view>
 
 </template>
@@ -23,6 +42,9 @@
     export default {
         data() {
             return {
+                customStyle: {
+                    width: '100%',
+                },
                 title: 'Hello'
             }
         },
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/colorui/animation.css b/CoreCms.Net.Uni-App/CoreShop/static/colorui/animation.css
deleted file mode 100644
index 931bb513bf3431152acb6453d280500e316c5e18..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/colorui/animation.css
+++ /dev/null
@@ -1,184 +0,0 @@
-/* 
-  Animation 微动画  
-  基于ColorUI组建库的动画模块 by 文晓港 2019年3月26日19:52:28
- */
-
-/* css 滤镜 控制黑白底色gif的 */
-.gif-black{  
-  mix-blend-mode: screen;  
-}
-.gif-white{  
-  mix-blend-mode: multiply; 
-}
-
-
-/* Animation css */
-[class*=animation-] {
-    animation-duration: .5s;
-    animation-timing-function: ease-out;
-    animation-fill-mode: both
-}
-
-.animation-fade {
-    animation-name: fade;
-    animation-duration: .8s;
-    animation-timing-function: linear
-}
-
-.animation-scale-up {
-    animation-name: scale-up
-}
-
-.animation-scale-down {
-    animation-name: scale-down
-}
-
-.animation-slide-top {
-    animation-name: slide-top
-}
-
-.animation-slide-bottom {
-    animation-name: slide-bottom
-}
-
-.animation-slide-left {
-    animation-name: slide-left
-}
-
-.animation-slide-right {
-    animation-name: slide-right
-}
-
-.animation-shake {
-    animation-name: shake
-}
-
-.animation-reverse {
-    animation-direction: reverse
-}
-
-@keyframes fade {
-    0% {
-        opacity: 0
-    }
-
-    100% {
-        opacity: 1
-    }
-}
-
-@keyframes scale-up {
-    0% {
-        opacity: 0;
-        transform: scale(.2)
-    }
-
-    100% {
-        opacity: 1;
-        transform: scale(1)
-    }
-}
-
-@keyframes scale-down {
-    0% {
-        opacity: 0;
-        transform: scale(1.8)
-    }
-
-    100% {
-        opacity: 1;
-        transform: scale(1)
-    }
-}
-
-@keyframes slide-top {
-    0% {
-        opacity: 0;
-        transform: translateY(-100%)
-    }
-
-    100% {
-        opacity: 1;
-        transform: translateY(0)
-    }
-}
-
-@keyframes slide-bottom {
-    0% {
-        opacity: 0;
-        transform: translateY(100%)
-    }
-
-    100% {
-        opacity: 1;
-        transform: translateY(0)
-    }
-}
-
-@keyframes shake {
-
-    0%,
-    100% {
-        transform: translateX(0)
-    }
-
-    10% {
-        transform: translateX(-9px)
-    }
-
-    20% {
-        transform: translateX(8px)
-    }
-
-    30% {
-        transform: translateX(-7px)
-    }
-
-    40% {
-        transform: translateX(6px)
-    }
-
-    50% {
-        transform: translateX(-5px)
-    }
-
-    60% {
-        transform: translateX(4px)
-    }
-
-    70% {
-        transform: translateX(-3px)
-    }
-
-    80% {
-        transform: translateX(2px)
-    }
-
-    90% {
-        transform: translateX(-1px)
-    }
-}
-
-@keyframes slide-left {
-    0% {
-        opacity: 0;
-        transform: translateX(-100%)
-    }
-
-    100% {
-        opacity: 1;
-        transform: translateX(0)
-    }
-}
-
-@keyframes slide-right {
-    0% {
-        opacity: 0;
-        transform: translateX(100%)
-    }
-
-    100% {
-        opacity: 1;
-        transform: translateX(0)
-    }
-}
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/colorui/components/cu-custom.vue b/CoreCms.Net.Uni-App/CoreShop/static/colorui/components/cu-custom.vue
deleted file mode 100644
index a4e177342d5a220d11ec1d0e5a35b926f6b67b1a..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/colorui/components/cu-custom.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-	<view>
-		<view class="cu-custom" :style="[{height:CustomBar + 'px'}]">
-			<view class="cu-bar fixed" :style="style" :class="[bgImage!=''?'none-bg text-white bg-img':'',bgColor]">
-				<view class="action" @tap="BackPage" v-if="isBack">
-					<text class="cuIcon-back"></text>
-					<slot name="backText"></slot>
-				</view>
-				<view class="content" :style="[{top:StatusBar + 'px'}]">
-					<slot name="content"></slot>
-				</view>
-				<slot name="right"></slot>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				StatusBar: this.StatusBar,
-				CustomBar: this.CustomBar
-			};
-		},
-		name: 'cu-custom',
-		computed: {
-			style() {
-				var StatusBar= this.StatusBar;
-				var CustomBar= this.CustomBar;
-				var bgImage = this.bgImage;
-				var style = `height:${CustomBar}px;padding-top:${StatusBar}px;`;
-				if (this.bgImage) {
-					style = `${style}background-image:url(${bgImage});`;
-				}
-				return style
-			}
-		},
-		props: {
-			bgColor: {
-				type: String,
-				default: ''
-			},
-			isBack: {
-				type: [Boolean, String],
-				default: false
-			},
-			bgImage: {
-				type: String,
-				default: ''
-			},
-		},
-		methods: {
-			BackPage() {
-				if (getCurrentPages().length < 2 && 'undefined' !== typeof __wxConfig) {
-					let url = '/' + __wxConfig.pages[0]
-					return uni.redirectTo({url})
-				}
-				uni.navigateBack({
-					delta: 1
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-
-</style>
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/colorui/icon.css b/CoreCms.Net.Uni-App/CoreShop/static/colorui/icon.css
deleted file mode 100644
index 16ed1217a8afde142bbf72f0cb69791dd75089f4..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/colorui/icon.css
+++ /dev/null
@@ -1,1226 +0,0 @@
-@keyframes cuIcon-spin {
-	0% {
-		-webkit-transform: rotate(0);
-		transform: rotate(0);
-	}
-
-	100% {
-		-webkit-transform: rotate(359deg);
-		transform: rotate(359deg);
-	}
-}
-
-.cuIconfont-spin {
-	-webkit-animation: cuIcon-spin 2s infinite linear;
-	animation: cuIcon-spin 2s infinite linear;
-	display: inline-block;
-}
-
-.cuIconfont-pulse {
-	-webkit-animation: cuIcon-spin 1s infinite steps(8);
-	animation: cuIcon-spin 1s infinite steps(8);
-	display: inline-block;
-}
-
-[class*="cuIcon-"] {
-	font-family: "cuIcon";
-	font-size: inherit;
-	font-style: normal;
-}
-
-@font-face {
-	font-family: "cuIcon";
-	src: url('//at.alicdn.com/t/font_533566_yfq2d9wdij.eot?t=1545239985831');
-	/* IE9*/
-	src: url('//at.alicdn.com/t/font_533566_yfq2d9wdij.eot?t=1545239985831#iefix') format('embedded-opentype'),
-		/* IE6-IE8 */
-		url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAKQcAAsAAAABNKAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFY8dkoiY21hcAAAAYAAAAiaAAATkilZPq9nbHlmAAAKHAAAjqoAAQkUOjYlCmhlYWQAAJjIAAAALwAAADYUMoFgaGhlYQAAmPgAAAAfAAAAJAhwBcpobXR4AACZGAAAABkAAAScnSIAAGxvY2EAAJk0AAACUAAAAlAhX2C+bWF4cAAAm4QAAAAfAAAAIAJAAOpuYW1lAACbpAAAAUUAAAJtPlT+fXBvc3QAAJzsAAAHLQAADMYi8KXJeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2BkYWScwMDKwMHUyXSGgYGhH0IzvmYwYuRgYGBiYGVmwAoC0lxTGByeMbzQZ27438AQw9zA0AAUZgTJAQDhHQwVeJzN1/nf1mMaxvHP9ZQiSUKWbCXZ1+w7Q0NqImNJhSSSZSyTlMQYs9hlLGPKMoRBMyU1tlIiIrKUfeycZyOpkCVLc1zPYbz8BzPdr7fb8/yQ2/29zuM6TmA5oIlsIU31460U6r+O1m9L4++b0KLx902bnq6fL+ICmtE0GqJltIl20TE6R5foHj3jmDgtzoohMSyGx4i4MC6KS+LquD5uiFvizhgb42NCTIwpMS1mxOx4IyJLtsiNc8vcN7vnodkr+2a/HJCD8oK8MkfmdTk6b8oxeUeOzUk5M1/IuTk/F+Ti/CqXztt62TIIfvIp9osDo0ccHv3ijBgcQ3/8FBfHVY2fYlTcFvfEuMZPcX9MjenxVLwYb8ZH2SRb5aa5TXbNHnlY9s5js38OzMF5qT7FNTnqh09xV47LyTkr5zR+ioW55L+f4n/+p+ip/PEnr8u4hr8wlid4mtk8/+PrRV5ufL3DPD7i48bXVywtlBZlnbJV6VMGldFlTJlZZpeXy1vlvfJBmVc+bmhoaKFXq4bWP7zaNnRo2LWhS8MBja9uDT0beupDtC+dSseyHpNKB+aVVfWpGnR2muqENaN52ZDlWUEnaUVashKtWJnWrEIbVmU1Vqcta7Ama7E27ViHdVmP9dmA9nRgQzqyEZ3YmE3YlM34ls11JrdkK7ZmG7Zlu7IandmeHdiRndiZXdiV3didPdizbFDashd7sw/78jP2Y3+68HMO4EC6chDd6M4v6MHBHEJPDuWXHMbhHMGR9OIoetOHvhzNMRxLP46jP8czgBM4kYGcxN8YxMmcwqmcxq84nTM4k7P4NYM5myGcw1CGcS7DOY8RnK+J+YbfcCG/1XP6Hb/nD3pGF3MJl+pJXc4VXMlVjORq/qTndi3XcT1/5gY9wVGM5kZu4mZu4a/cym2M4Xbu4E7u4m7u0RP+O/9gHOO5lwncx0T+yf08wIM8xMNMZgqPMJVpPMp0HuNxZuhEPMlMntK5mMUzPKvT8ZzOxQs6GXOYq9Pwkk7HK7zKa7zOG/yLN3mLt3Vexum/8y7v8T4f8KHGLvm3TtB8PmEhi1jMp3zG5yzhC77UifqapXzH9yzTySqloTQpTctypVlpXpYvK+isrVhalpVKq7JyaV1WKW3K6mWNsmZZq2xU1i7tdBLXLeuzQCeq2f96sP4P/rSs/1hpkX8om9TMs9Je78VKJ703WOmo95amaSTaGJP03s40oURHUxYQnU1TS+xnNf1jf6P+3V2s3hZxoNUbI7pavUniINPEE92M5nrvbkoBoocpD4iDTclAHGL1tomeprQgDrf6TcQRpgQhjjRlCdHLlCrEUaZ8IXqbkoboY9Tvo69R/3+PNuUQcYwpkYh+pmwijjOlFNHflFfE8abkIgaYMow4wajf94mmXCMGmhKOOMmoz2iQKfWIk035R5xi1Gd9qlGf3WlG/T7PMOrzPNOUmMRZRj0bg00pSpxt1LM0xJSsxFBTxhLDTGlLDDflLjHCaluIC01ZTFxkSmXiYlM+E5eYkpq4ypTZxEhjO71fbaV+/9cb9TzeYMp2YpQp5YnRprwnbjQlP3GT6Q4gbjbdBsQtpnuBuM10QxBjTHcFcbvp1iDuMPbU+51W6rO4x0o9D2NNtwsxznTPEONNNw4xwXT3EBNNtxBxv1Hn7AGjztmDRp2zh0y3FfGw6d4iJht1/qYYdf6mGnX+phl1/qYbdf4eM915xONGncUZRp3Fp4w6i08bdRZnmW5J4hnTfUk8a7o5idlGndcXjTqvc4w6r3ONOq8vGXVeXzbqvL5i1Hl91ajz+ppR5/V1o87rG6Z7mnjTqLP7llFn922jzu47Rp3dd406u+8ZdXbfN+rsfmDU2f3QqLMbpi5AfGTUOZ5v1Dn+2KhzvMCoc/yJUed4oalHEItMjYJYbNT5/tSo8/2ZUef7c1PzIJYYdda/MOqsf2nUWf/K1FCIr40690uNOvffmPoL8a1RM+A7U6chvjdqHiwz9RzVAlPjIYup+5BNTC2IbGrqQ+RypmZENjN1JLK5qS2Ry5t6E7mCqUGRLUxdimxlalXkyqZ+RbY2NS1yFVPnItuY2he5qqmHkauZGhm5uqmbkW1NLY1cw9TXyDVNzY1cy9ThyLVNbY5sZ+p15Dqmhkeua+p65Hqm1keub+p/5AamJki2N3VCsoOpHZIbmnoi2dHUGMmNTN2R7GRqkeTGpj5JbmpqluRmpo5Jbm5qm+QWpt5JbmlqoOQ2pi5KbmtqpeR2pn5KdjY1VXJ7U2cldzC1SnJHU8ckdzI1WnJnU7cldzG1XHJXU98ldzM1X3J3Uwcm9zC1YXJPUy8m9zI1ZHJvU1cm9zG1ZnJfU38mu5qaNHmQqVOT3Uztmuxu6tlkD1PjJg82dW/yEFMLJ3ua+jh5qKmZk4eZOjp5uKmtk0eYejt5pKnBk71MXZ7sbWr1ZB9Tvyf7mpo+eayp85P9TO2f7G/aA8jjTRsBOcC0G5ADTVsCeZJpXyAHmTYHcrBphyDPNm0T5BDTXkGeY9owyKGmXYMcZto6yHNN+wc53LSJkOeZdhJyhGk7Ic837SnkBaaNhbzUGs/VZdZ43i437TPkFabNhrzStOOQI03bDnmNae8hr7VawPM6q4GXo0xbETnatB+RN5k2JXKMaWci7zBtT+Rdpj2KvNu0UZH3mHYrcqxpyyLHmfYtcrxp8yLvNe1g5ATTNkbeZ9rLyImmDY2cZNrVyMmmrY2cYtrfyEcM5XtOtRrpOc1KzfhHrWhHyOlWat4/ZqXm/eNWat7PsLrd5RNWat4/aaXm/UwrNe9nWal5/4wV7QX5rBXtBTnbivaCfM5KvROet1LvhBes1DthjpV6J8y1Uu+E+VZq9i+wUvN+oZWa94us1LxfbKVm7RIrNfu/sFKz/0srNfu/slKzf6lp12Xe1saC/wB/IDDcAAB4nLy9CZgcxXkw3FXV93T3TE/PTM+xMzvHzsze1+zO7EraS7u67wMJSSBWiFMgzGGDESCtwICQAQMO2A4YLRK2Hx/gA4MdbGBB+CAE25+dL4njfGFt57Jx8j8h32/HCdP66+ienV20Aiff/4G2u7qnu7rqrar3ft/iEMedeRPNoCYuwy3nNnEcyA2DYicoFkTJAH5AjlIuK4bNUKSUKQf7OwHK5MzSMKgMo8owsFPAjoiSGLEjdqk3YosQsId7y/1mXwEdeEH1i0JPMdlvWraiS0pivXah3zT9MLf3ItB/tzM6viE0mdUChqnBsF9PimIOQcD7/P8sWEA8rzqAH06ZJpjN7h/oHPUrSiC0oliK+psL0PQ7o34zCi5oaS87E+A2vq/fqgwv8UHIw1TTppuQbEp+EDSWO78DT7OHTT+Y8Zsc7ib+49Ad8CLOxhe4s7jHWTFkC5FGEOkdAeUKKPehD6txxTnvV2rcUgFAPBI1kUc8eFmBOxSgOkv+QQnF1CoCCCIIEXhTjXG1usfgi1yC4xRcTyErKYBWrwARg6ai4G+U+4qwA6iKFVed3zm/V2MhFUjO71R8DRSg4G8q4AiQFXx2/h2frZjq/Lvz72oM35ed/5e8hz/D4/GbQafRCJfjurll3GqOEzJ4+Ew8QJneSEjMZbzBoyNS7o2ETQOgbKEP9xA/IAGxDeCr8lJAHrczpFyir6J0daalDEC5BcwYwaDhjJIjJMeGICj/vY5bMkza6byiPkifIIevOVOkCMhxFL8Lp3Ad+IWgUaU/QI7WxeG7Z0hfhykEXlHIIw3BGXbiBNqvl9Ao58Mj1M4Ncitxz3DHcL/wlMM9wPMSF/BlJ+lNsTAMIngy9pbxpEwBiXax2D+MO2WHDZCpvwBnXqwKQvVFdjz1U57/6Sl6PDnxoVYZheNyZs+BCzJyPIzk1hv/PJQAINFMDkCbK4/WKnixipZ6NeBj9chgvy8eQGpre0erDwXivvISABPh0VAiERoNJ+ZK7lw58208fqNcmszDYh4Vij2ihAQDNAIkRkbw8lpKetVXRJUyekG0nH/9sGqFlEPOv1qa/moXTJtvvy3JQA8C2PEdHfwmiFoBMgEwHaeFbzL+1PklXnh33sUHDVEA9mvG3DfHMFQ5IdsFJLFQsYqFMp72KSD68Sf9oFJuxEtiBP91EWh2gopVrvREbEtIYbRgRSQRnpGlt98207DrVV0LPqaHecO46LMqLH7fH/heAfqe/LkpXXKJGI0qwu1KyFI/DPxBXf9OJwzIo/xddyq2BZJ/ajTxcWgkwijwBS3w1jWycs1vAr7PZ5H/f/65pmhRDQRpV6qtKG+8hruiiRwHafufR1sx/LrICsOD2wnLlXITxUYGBiNBYDxuNrluqrhzguIyET3qXLr62LLVu+Jt5RvBxY8Nn2chPRFBgTXlO53/cWlXPrJh+E7QdWlvEEXiBgwvqXxiVwbMVKsd7ZVPPPOF1Y/0XtN1dL0eEXV97APNe9umhh/61O1de9unxjcbuhDRL9q4erfOk7GFdA5P4rENcA0Y7PjrEY4O5wgIkmlbN50h9/D3eAtEU4oBDOXgXwP+ew9P7IZw9wQ9olF8/ajzeEz13Qa0ex/+nsN7P+EjQTe1b5H1gscVLL5W+ipl8vkivhuKMHhB91mRw+PKbTkI4cEt7FheA8CaMjtqIWX9rA+dOnToFLpyv4LCMYU2lDTd+aeUCtK117YcBMO198prqvuCcXUj6LwGv4nfH3zhZl/cRCrtCu91jXP78W1Mj4YwPVrHXcdx+bBEBnMYVkq9dqRMpmOh2FeulBjhMUAxQoYXj3jOAGF8M0xIEcUAGCkUaTfx3e6eSq+dxZeYZEVKFBL1/e8E/R6wwHVmeRUEwVxHnG/Odu6JqzJqhCvLfMe4T9d3736kGJjavtGnihm7IQdUURR5aJk9ubFum+dFS0/mYC6BhE/u2aapvqi2amMNwaSSkmjH5EzOQx3LAQAry7GuQghEA4eykopyHeW1CJTb408dvX50Qui+8roHAtEG2JQwQiLAH+IDe1Z1pIACkSADmO/PAvDdnBCNKXyqhoIql3dqMUPQ+m8e9RAUm4svY3w6gudHjs1Fb0ZYIIzXvIjxAIFtXxlTwEq5N4Wn5AvvCMI7L9Bj/AyHKR+mf5gKHiFU7/JfY0oE0LD3AD46DzpVQIghoYa3Y8IAlAO/wdidq83PGXd+di2Oy61C1k9GUwxhQjxHiwuQWwRp96kx9deXY/KpHJmj0JwKFkXQzn8qym8OKACTndshI9wI8ErcXa+sjcX5MEKYHFJEiVcPwYmYjlIoRUJ+MK9lEqFm9xwnHMPx43VlVN+c6rcItT9+D/n92PG68kI4lc5B8yqEr/AztqWRTHcCKpvxFYvB6sbjhL3AH8NE+9g9CsDjeJy0T1kcWHccI7/fcw/hP+45Rtp67F6X96iHV+MCeM2HVMTuiYjzWtU8TcCCK8RNOMEj/F99E5yOx8kPx2hDp3lRsd49h9rPAZvuHjKVGWAIwzWCl/2iQMFT+gTtFxkv5QkJLQ6Mj4n8NHmIAeJxyaK09AVKS0l7cGv6GWLBTenFaKkTfz9Xa2UIM8qhRhTpHQbo+U919gpvfeWrb/H8W1/dvVVTfFF9xfpHvsvz330E48RSl6Ii+Fn8GaCdGrh7LXvuK28JeRGvdiGNcSZ7dsVtvXgBQP6rapAsNEwez7xIYSRzJpfk9nJXcCc5zhqm3F22kCccIClU6hi9Sn9fF+gjuDKHC+REWP9QGPP9figmycASzFoKMwD3zxXIoRNg6BLusRHkQIhwk/QVwnH1Fd51VRgCuAnl/iKGTimTwlxOOJSC4VnQVG7C/8BMU6UJ/0vXcZFfxXQluDKfA5bUkXo61SGGmppWB0EaYPyLGcw0ozNT7JQmHGuu+h9AlZ+WfSDwW/CfQQOzrKR+QDlUt4TvWQkLNCp5C8yYBV+KMLVcgny8qYGdHmPM6DIBzxAe4XFEaDieASAdG+FRS5swjXje150+3dwPIKN00DuD/ubT6W6wAsqyUKr+rW4GjSyuNJElvfJKpn4aN8Jo+FQoDKLmJ5OYhwsa89dVw4J1lXMBGEmCEhm6ebO68SXdwu09gb8xfzkJln6GfPhNwlovWEfNC75Qv6ZyeMyY+EB40L7FkTCaphz+zMIvv/OduuUDbp0ljTjDUQHCk5M+Akc4cjEnJBEsRsWvQ3hmO990vk7lr30QC2Ngrwr7FcV5FqwhCMI5CRUFXIzFLtKnWbwOG+msL2C+Ac/jLBbrCPXHs3wYFAATfsjk77fJ5KcyzpedL5pd/V2m86UASvRl4clsXwI5GTbyacypNycSR+C+VCaTqp5IDXbFYl2D4E0qwtDezCZaEvgf6YpAZWnWhhTXhjFCP5HGsp2EglHhA7cFMxi4VVhezmCmBRQwO+ZJZRg75LxlirZU95KGBMB22jpwHmmdc1+QtDNEWhkKOF8MBCkkg0Y3EUrwv0y8c0mq1tglnXHEgWT18SRmE7JJeHHSyeIllfYaf22ItDxBYIfHYQal8WzIETwGMgwHSOTPxFMBt7Vi4nVeNzesTuBCcNKZxqtwFK+7SSYtQiY1OjfV8ZFvMkhCT6Ast1AJkDyNz9Wfz2ccWW84hs/ctpG5Os5NcBu4C/HoLoL5gSf70sXRBubJvoWci/Pw00QGrkE7Tx8t9PcwKTi8KAcMWqujrNWTBIj0AJlsPE3RFYPALm88nDeDBsVj+DC9GG/sZFwoMCnZ4WpSMpGyKZxgFwPf35GfyB+V+2fRNB66MJ5rRSz741FzR6tkE4pXqo0ZGyf7XQU0Wp1ivfnJDjWu7vgJvaj+I/vWl+ad8ERyh2ynoux0G+wcdfsJFpy5uvb1c8PcKm4zkzQ9xomgE3dEPPRCx8vTXLARknJYXFu8/ZDT1UnCi6xZo+p0MTINAxsbd3bN9fCFs/UrrUwS/mbtWmVOM+FBHroz1O02mF60t0ymnkWzuL+YCuNp53clEjIzAVVLADpB4Wzv7qburqY9vQcfQKA7AYastt42C4wk2wF6AHFN2e6ubB49cHD4ggbnJSsSCYHl2a2jBx9wv/Em/cYAhqZYdJdjr02wSrGQY/IMIMiTCThZytcTPgzTWrpWMOaBXFu78zL93MEty31CIKb1DOGJmUqCZXaTDYbCTQBP0qbxxF2E+7o7v6ubNLWrwTndngatYJw2B3XJsQgv5fCT7ctyzst2FIyGV3bieuLRuwiTeXcm5/Zips3l3X6J13ESz9duPB/obCCcEZG7SpUy0R3iEa8QEY00t48wcMNEAqDtxv2wMR6tsH65uh7SHxEajYXntrGB2vZcPh1sBCD1MVXx8bIWz6WjpsxHYkog0YpXQkLzXegLAbl3NYSre2UQjqn92yHc3u9ryH8Dv0+Q0zfyiUx1NJN4RZRjvmB6xf6xlO2LBXhfOLN9fGxX1tQPmnG1fOfOnXeW1XgQqksevfzyR5f4XF2c18cit5zbtVgvKU9EJ30jNHHXcuD/TLedE3Tm6+qMosyoOnjgvw8G2ECpujKjwCfxwfnsHw4Wws/gCfAE/AVncS1U2+oHjCuv6YkBEWVMj9nAEjoR+/rAesWSZqgUhVekDy7HWOpKUlJEUVenFfi3CEkzZP0er/4zxZqTasAZUpQD0KLoYFoN8FDBooaLj57AdARxMdyKJbgdpXAOzOfYyxUqQIF+RgiSjJ0tCKGajrSf0mowOTUFKw+1dde4m1WHSw/ihlSnGBNE+czJoEGpwhRuMkxPOTc9WDq8qsY0dbc9hHsGbqgpTrdSvEMxGFfXXj+GWhPBn8Dl/byWFUv9OXKv1ixyE1AkW5kvhxCt3gI5xKb4s/btp6emAFdrLGZDdfVzitLZjZ49duxZhI9LK7qtqvryufZ3teP2kz56lYxOObNeB3BVzqzyOTxenTeMsRrwMcyrsagQqwFtxZE+AjSPd/pbSucDXCuWe5dxB1iP5/VOIDSh1jGypjzCL3hEoVawCDkM+zFqDJspRm5GYJkssn4s71DJx7NTYCo5ySgH7fzmrhW+W30rugbWArB2oHNCO6xNdNILZ2OyUBgsFMDeBnzO5+90urMd4DSfSIJgIpj4MY8gDyFQJPAjl4iAUXyadFmAPWCgvX2AVEpq629r62fl7wBS6WABAFLpYAET247sBRfD0GDOeZHyFcsLoSsRhAISkXCtpFhG9Qk63y9qqXCurvw4Gsd8Z45by13OfZBgHoxSpB4CwEqZarlKDJNgDBIScz0FPCOKOfJQkd7Gs8rGT1Z6ykRcp5OM6dfwY0sJPcHsKn6F6NSo1g2fCDJq9CQ6pll/xFBXPCDjpunaU9sVEHpds4Cy40s+HTdWemCluvIygd96Z0cpkuX9qrpn4+Aqng/4+VUDm/aqqp/Phvs67tzKX7ob7jgQa7HD56/S4mLP4JJuMa6tPC9st8QO7OjCtSeCAASbfOMpRIp8fpsaN4Mx37YmnowDSk2op4Bvz/rdr29X1OzlfQhKCl+6sklVtr++Z90eHxjVzu9a9cQEKkqyvr+nd1JTpDyaeGJV1/namaDxEm6t/pIR9Oblf6IZeMbl51dwa+otLETfSDhIItzWW1qGKL9PBF+U8yRu+la/95YB8uFMP2qsHnUZldsJA5ggEmD1MB3bIxiFkBvlZxqDCdPEJdWZSTQB0JQAo/TsfAaM8uTd5ayOveQ9eqjSaXMxPeDfjuIexYPB6/CrU6wGfHppasrjr1/G5NnHJbgsxozdxNLirTzS8hpf6UoBUjjXjwlZvmQWC35AERJGpBksx5TCIYa67Ui50l8yQ6BxmDSBHODKajzdDkBzCr6dagag3Xrzx4LsjJxcpWnjzsuy8PYZ+PuqIZ0xZFUU91/ubwBvgikmhmHZvj1d/XiqCEAxBQ+m29ff8YAsO59s4PkGsEeQH3ACQABf+H5AFVFzs2gFvu/sEBgOfZPilAZuFEsOV1DOjOARIgjgWVsgV27H8ABaeFJnKM8Utqm+o4yRJTW+kBN+ZggU8hk7I+TwMmAv44VALpiYTC7IEGdwCU36TU2qflbSzJQJurNwd7YbmBsPKKHqlBqA23kAtw+1rilaYy0tLWNWaKCpdWg7BFUD7hivdsNPtAaHEX6TXxNoMVfzwaQJe9JFXAVBDSBi+k9LmiadJgbN0/gu/gAug443/EBXfiTK2ubhbRC0R2yM5iNw2/A2Qz05NQsj7eQFPW9BaOVVMjJNSQC6cps3ZLtd/uU0ehEt55q59Zh7uczj2amqEa99WgZUoUc0WSmiAcVlYkMsujJ7F+Zmsp2w0lch6AcQKxYGH5JCRcqHMo2paNdfgKdzsQlFjbQNRXwxdcKOgW/FJ/AdoJBbmITgW86K2GS3GBDBt0QBA6Kh1BwCYXLDmRCA2J3Bd4phkNMt9WuEHXhG3aaTYwwflKHYSlxJeLg9jKtcGVsRBc/Y0VVqTI0MtYOwQm7FnI3RD/eKIvgarrI3FGnubWjO9OKanY3khgVAuLnUUPxfVhzXZ8XUZ5RJzJR8TaUHypf/P/BHKIDxL8G7oGZbVQAhs9OWH4uHWDj0F5KG8woYNpIBeuUHk0ay4HdecV7BP3GyKzMRmt/IdXEj3CbuIu4D3BGyHj0mkuEOVOMgy2Qe58z3+H3h+8UFv/fnPLnZlY3ntD5UTANTruDOTr/y+AZjkdtg5g98frp2k55G5tiKKrfoT86Mq3hgp5eoUo8epoiOwf3FIW/h3xz2pVGK2GVXB7aJ6knjmG42cR2Ybh6llrMsYU/LRQ9zY3pHrvsKkqc2Emq6A8JP9BWYu0SKUMkSpZo5QnYJs+GalnrtyDAxSLlCGn7CjlQoZiFyOmGAi5TGViLEGJgG5a1l/O8Iw3/XZjs6Jjo6spKiGIoC1ox6ytJKKusTU3uafZIe0/JFETz25S+9lYs0QQglKDQ0YB5r12YtqsnahVe8WBWSCVCKxsx4akPbwOEJfCPvXHrF+Zc8EZk4XOoC/E8hFprJh1uYWukhQL460XER+aqhYNpDPgv+pXN9woyIsURUikYlKaSnf/Hlz52QByoIyXJI6by0H3N3RVGJRsVOofri4DW9YMO+WABkGgpFfL38luppUFrz8cj4/eM7Ljn1U65u3vuoBmpu5nOgTkst1bsmLHL/v7tO0BTT6s0pyd6jXH37D5vo0CVp0+x0hpt3CSb/K8vAtY3gwxSYdeczZy2uN5llo/y7eSfgzTmw4Mx4oFlXB9eIefPVRANXPzLI4xbKnm7aAAKFtMu4u/odRKhuvXKO0GKXFHsCFuOo0PQ7tHeILOhramIK4airv5v2VGVEYPkXg6hqpl2hIwjfnjcCRAijkHWmam8Y0wyKtXeIdMbu1j3jKYGmGXx5ald5BdNGAt8Pct+leILBs8jQBWYgMLUUi4w7JvJ8ocgYZuJZUaAUkboiEJKI71UIY47LNmHKCS/tx4w35dUx4+0nZNV2nRZwrRL1spLEPHkEo44yq4TU4ZX6iLsG+ST5oleSRPYyedcrhYh/B6sHXxItV92ivzKgrgmF1oiW2tcpYw7er9+qmkLcD0X5UgAulUXojwumeqvuDwFF7uxTLbH2vCK/9/OC8xdhe6XPamy0fCvtsAWNmKUFb1LlfRjvQWDsk9WbgpoVM6D1Pp8DC7Clk9YvhfDsLVVD6tmb+p4v1MMC7KTN4Pl3N9ef9r+7ve9+UAviB4Pa3IML7ZshrrLALuORHouItYTyDDGprELtHNSqMedMUm+mYYrOFZEsmd6gsyHcSJc2uWI+JKBtvnVaYCYNsCrcGioTWahcHImHCoGWSn8LuZzYBeGeidwSTz5ibeY4hQtzGSwhcfkadbQXs9B2gsWbL7EeQs5To3ctYnU6ZSzSnwTprGveeHRRR61fgEW61jQYZ11nY+LgdZ/mClwvdz4ek75+YiIlwh6eOGGqrOqhhJxRc2L17e+rp0kWpitZqccAzBkFC4uYPcCCeRcWsubkD/QncJ3am63+a6Zb3QyU3ramruYVsdiKTfiwsrm7qa37tMORJlIt9Q1BQ+CDrWZhKNEwvn6iIbGiEMliUkgAkoO7Me6FGCrCt5KZdPJFIZHo3Rq1MqlUOo3/QvbWngbBoz9GEEoSgJZtx8N21FYkFDS+iN8HXVkyvirF/VMuT9qGZ+UAN8Yt59ZhCeG8BZIw02zOM7jU02k7QxCmR6drdujaXJkrzTkeQsbDVT9R8zw0TjAtJ9iHj5udMVp+SbcsZ6KbzdszeNrML6TrDAHE5AHP1JwR8dE5YiWCwYT1EpG2icD9NJs44XknNtepLYqjc51oEc9j/rIuJ7gQFvPF5iJV8lbYJKecIvlHXTTZlBeptxK7AKMejwfXVg/0jAMw3gMfoefqYCQFQCoCH2Hn6sOCoGkI7r4g3hFO9DX6g6q26gLSuUqHoTR3tE40WPkQ6BpRkQk5xsM5CVJfhNVb/XXPOHyJ1PRrt+YIPldfAkJENx9XgIrZTh5ms737eQwoMFDKTyiipooyEPZnfRqzS8ygOzBcCkT+KRRNLNxl7EjYpJYJLDX2m4h4XuGxJ5pIZOLFPakHgfKj6hs/lksqCsZ8w9rvRST7VfiKGpCg9PvgKB7XWU156y1Fc95sUWJhhJ/0gyZgS8GgqgaDkvMrp51QZ0KbH0On0QbXPngRxkAFo6YrzxaYkksi0EdYFsWkMAUo+e1EBiS+y2X6LOPF8dSfm5LukLkWFvwiutEXM6EvmAGg0hptNfjRht6Dwv7rfWLX5snLdg7HRMEvSdGYFBblzMarbrvxsmFFv+82cVcuOSTY44UVeyDoeudf8OhSN4cfmYaf19G9d4XCcjq0+0Lo/wuFOKAGhqOtFRCxpJ3pLhNG7trWMtEd9Heu2NTS2KBFDUkrtFWu3DUYjAzvqRz8cgPQG9M7xFQG7lnRfD6YYoP8YZ+RD2g7LT7dHOH1shSY80mconaqAvGdLEhFYiafp4+nSnCrnsFb4syqOpI0wakSofcHGHX8BgvayepozQQKzgMZFeMc8kgspP6g+mf0p/5/xi+AD7luvQt8D7rfww/MtQi4Pk7UF6xvUR+EkGsduJJoAKaxfD+tLu7Jc0hRrgAlgk+d168irgRPqNROML99vedoH54ZfrDQkkEht2gLrcclS4E88yG6gjY1Flq8jc9PS5hzgMw76XLnhxTVlQ6oxKOOrLkzxO2ci+ALPJULRUDnvAIMagHEoIK/B0DkNeeEv9iA2zrkvGqAZMEP9uI6wdUAGikf2Iil1oLf+Z+49kJKB1shEFxb5quojxtyrTV17rSExLG1AyhDyte53hZJC/A4LSUwwg0ooC9qUT4WGW9/yPn6B3pbotsnBqeWX/yVkYqFjHgEBbr2Ov9wy5JVoVzrXhC/tW04eI0eVVTtpCgCXg3wS3gfnOJ9+oqe7ZnLuj46/vhn7+ttbTlvy5rz9YigG2uHPtS8o+2m++4cxOf0eb1tvBqzxREIgE99QreZTAQvRpwnEwFvXUvvKoCToLylUtlCaMS8M5w+m7Tk+t2TeRKmnMEwoQTE5kKtDjkiERAi2FeQMj1kCnt0AEv6lNdhPh9WXRlNT4Nys/MSJlPTNdHn/uqMblEHfCKdOA/Nc5KH057ug11PYck07fpXYAmVueuDyXr3BGpcgtTW8guUwfjyw1SO8YPyPCtYmcopxHmNyh91liMJT3sDNEI2zL2VElVy5IdpJe74s+4vnTuTtTFE5g0R8/q9M/prOaYN+vnffPWrbwnCW1+tXNklCIkoJlNxnxVGqOWC7oe/z/Pff/iR76NohxCNqcJqnhehIAqIBzz6lI93bqNunJs3UWfT3Uz7w44YHvWXoNfHyy3lwa/+hmcfbEgAFAhhsgJlvw5ALMZ/75FHiC/yI+NDBzXVZ+tPSQLxDIXwoBL7pYI/oG7YoOLPKTuJk1Ua/42TqsfdC8PFHcSXv4dbgmGL1w5hE8lMoB7JiCieMSgRpfPkBxIy0wgsd3JY5QJ1FSBIT/AK6KlYsfpvNGJGV0W84LsDqhPHhLCcFEr5AvmhoAZQsiT25MA/5HrEElSqazHzkM+Xm8A7HhexP0n00AJSZOcrkgaCKrjh09kOYMUsYGiPOffmuwFoSYNtVr76RUY+EuxEeR2GD4jt1MJYsYj5wKXcasz9XIz7aGbM/AILgbDgHrXwnuU5q975yV70Apw6g3HSGc61fbAz+M6Cm/m8I5zluc/gMUqa1gM0jMh6hF3BWfIkJsKJ+qdHznbTAWe9+4TpBxwB/hlOs8CiF5yEYfc36Ak0wmmYYyR2zSFukruaWCI8bxiMf/L1+nCBOfYWspJL98RwikWA1NSPRVDzYMfQpNFXxOxCHyNFYqwDNXEKi1tTrqcMPrzzv3ULnzGNnFThGnJzymq3qBfMPpUKUuoOpgqwQBeuiH8LLxcejAz0yKJPVky1vf+2e4/0daoBVfYJUnWCBQDQI/w0c6chB8g+Rw43k3tHVXUfvbQiGIe2RKw1mOfGDGXa+dvBPzrvKwQFfGXHwwNrtZgsGOPFtvbmcYM4G4CrvNrxsU7eJPDs4gYJD56vny25eVPnrDg5z/iaJMgwnt19ekGMFJxkYPgBO4G3z4Kfqw9hrDqmB50pMO2MehokEi5FWOXy1NnwLynD9HzUzZBUNe2iboLI6QvM0TDTUvZk7ZeonjSGaU4Z45iVLM6DTQMiQhCMQlB3pUSRsjsBMP4WMkzTyYyTmCzl+kuSi4mzmB1GHDp5yy0nEdg4ccGRMNT9SDNR9Es3irecdBA8PDl5GMLb9ip7D8HDZ+jspnO8a2ZmKk2u8AFYkMMV4Gq23pHPP3yZZiNdv/4BHt8gLx+evPCwIBz+pemfIS9gsjYzNUki+1Kmx5eyOMQI8Q6yRKIgwyuCuUwWyWogrpPUBaITikQ/wLzF3LGzS254VylSN4STfp+CVHBzw/IYuFlFoajq3CNHZOcuQYGv/wi3ua2zGQSNP23qBAQ7PAU3Tm6BX5FljCNQO5gGhpqQQRnLlm/IiRCuqIPnnT/joTNq+h8JxkEs9AixumVBN+mS8yM/uLFn6dKeG4FogA52q6mNq6MLhA/p4rjMu7C8hSnFOagCWojPv4SJwn32ogRgHgaHq5PXnh3V1/Q3p9FyroHLc53UV48DfVTWIXyfa68wqMha5irlYE3tWfEKeSa/9tRsGTUHwydQdCDhy8dKHyKhKJlULsNDXbgJrG8/9sPqJ5hV4ypX//zJvoc2J35wQ/+t4/jRnPNz1njU4sNoRxei/nQWs8jDN/T2b4oLPDBBpOtOoDpjro3iTYB5NcyxXbXu8xsbvrk2V8APj97otLrwcn3nvovXTpFKPVnmGbwUUIdJz2Bvhz2bF2Vy0TPO8fh43LlbFeSAmgadTW/g8W7ubMNz5kf5tjQGuwj+GpTwBHlNCFmq8/F8B0b/Hw/G48GP+832IjioKyE6/i/R8ScyxdYFVo06S3u+tpapsahO8vADamCSykSdTIbEXe0M1+N/cIq6VRuAHNedJkVyANcx6QLs2qbF/IJvxTpQkzAELcSLfU0aL/gsLIwLKKjxvKTokpi+Ofet34NZj6ukp0n20vmPDUpCJCZ3T62uufUA6PMZxXBrWvADENQVyV9JKZakIH1Fm/RX9fYDjRvAEvpm7l68wucc2YmLQb2xoM5dl1oIXFWnp1apAxiqK9vUz5oFJPT3lVJMjZhyZXeqAcCfIA+U8YKzieKOVE41L0zbH4Rfq9aCVeFUzaGUOYMy/VG1Muf5Wztc5zMFXZeuHOjtnPngJgQ3dFeukHRDDBvi4bIeAHrLKgiGjg2BYrtu6uUjIg/Sc3YGYsVspnqsMd39sE8kXi5GF+6Sp7IacZXbrqVonxGNIBiRQq137JtBN628/CNNISkMScgigjEemvpYQE18YM/E0NDE+QczSgDXDfgYBLWYYUJDG7kRbh23k3AjVCHJXA8rRTd6h1n6iQuVlCVKT+pH2kOQUyRE9DqSXfEM+otIyTALdFvJKyAUV/JP966mvrZWf7A3CIJfUewfxEKlILCeUWwdP9ZK2IOWZ0rrCHOyzrprESkacAG1zUf48eZnKuuIKL0uaPWHStafKP4brJ5gv/UtNRBQOtQElglanu2mPM4a643F5GwXHtOUp2jg2gkGzNfPzvdQcrKgFrZ05xTzzI7lunEHQa/nau3No51GbZLhKcTfuHrN9Qg/yX/y4slPC0SU82YXsXF7nvUOMVK9OZ+duH3blRDs3307LX/4TgCPX3/7nM2K9GvM7deKP6xfufxcV9wgSUyepPfbqyrmY/jpyzZ8JCfK0aiUuHTpxpvRuzrmvu+Q8xncMfoqifrBC2Ts5jsB2DyhRTVJ6xu+dDdeIy4ufdnFpZXF9TMgizGlWcMPYbPilVM0AGNRJY1TlSQTjLqN/CfizGbsU01JlJ0Ti8fJVU8iJQSWMw/+X7yIz5plSc6bMh4HieqNvw//iUtyLdwYdz53CXeQu5HyboRTp6idaHBoIVzrAbEdMuc9kcjiPdTBoJyCUg/VX/aUC5i1Z24HPXO3ywWhwBIykDIN3SbRzxWvAH+qmrwP+Oz9EzCCfEKg+OTOkRXi337sGz+BcJnzzHXTKn/vtfQI9nbdPGIEJNvfvnPM1AW9ISaEYndHljZquhDS/ckwFsV90TCvas7nBi6P2cXK0mvika5rtWKTYhea1DzvN5BsGDz4GFS0RMlMKQ2Q92f7zNzI9pHDgwcPAeGxnb1LnB8q29asuVanR9jfldNQpAG/GRvf3mzYss8Y/FDWDoqYgdMgUuwGQwtLqtaw9JTe3t1zvmV29pV2fszUApmMZmRaJQFjY/znrYFZNIlpTw5LXgzXdaKiAamQwLTx1Nma0IWIbYYwwPLuLcwCmET5gcjKxuvEyriMJSXcmTraA3/Ysza0riW/Np30KcJFlYFdAoJLWloGQCAN/HCN893yhQIPl7XEW3Wzze5dba1uSQ2F7MFrKT6nngTO10bIVCMHwMGEzwYgbFgmID7MKAlhCkEQhdCGCn520lRR+jBMIgijUBfBBaLCXjEk55SkObjDdA2mGbWgqlc3bn4KJbkEt5xY6fqZE9tZ1DQScQgiUdaYKFfYCpsnZxA1YKZYQJOjmG+meTW8wpfTJLgtbfoxjl++GbhSxeblF0yFeFUwJNgq8pNDpHFD+I1x8uo4LtyRo2F5SatBMqNS8+2bmSix7XYiSvgJ/yW7seGk/UT+Wf6+ZR9wjo6i9AK5R9SCkMg9Nz+xQO4ZfldXQZU1cstHPHlHu+FjAnry5snbyKt7D/PSYefFea/Qgjcvn0evubLcam6y1hvKbZ+rN4UuWMj6IXGto8t8hCplybNdBJ1IYtgudtIQlEoZ3+ktE3/MRoBU1tNNExceCUHdkKiA9yHJ6+htCN12oXrhIfi8ENpWVPD/20KqbyiAZCkQWrOWlwRFlWSoD0nCEVVMY05REtKS4E8WJYMPBMRQ4f3If87vgry+2bI263xeH9qtmoIitrZCYjcw1d1DktmvWoUAvoaBguFPipqUThuCSHnIM5iH5jC88lhK2cJd+v7GH4u+WTJdl9ZiYiTKExKRhqW5EV3jD3ki76owazcwJOGn0YNXkxCYiYEtHwpBTSOQi5+4HF19vzNeC+raejVw/Ljhloa2HIDwyk1GEIGARoK81n5RbktqMVmSVDMpIFMT/brzRUuPGbwWahvWyR3d4M21kLv6QYQ/tvK6XPYjuykALzsK0QMH6sLRNoX8mildt3XLB5SAjr8hbigPbvjr9PIQrl2LSb7OkGag8J26JERjspbe06/ryNYmPuD6F7yEXkVLaCQdyfXTV6AeqzTUryCGkStyEut10SqFKTHCzEBfod5nau5eySL+zWxR0cX0WUu/J3zH+dau28PH/WZSXNkDj/esQLdVD0UyyL6Mxt7mTT+8YoO18TLoXe6PgzRz9yGqATipBcC2KyC8YhsM+Ks/KY0AMNZTSkWhepecMgl2MVPyvZsuw09seEDy7kjHq7+NpuCUq1JgupLr0EbuSu567hT3Ze5bGOOV6Yogk6SfJJKolGmiEKK4Jp4y5EzFAbKw/IBICI3uVQqSRURCKTBXTIolXItdLLA4L7IUiSxGfxnG0rNAjUOViF2hmrwiJsQkbQVdokRDR2ohk2wEv4bnXyOgTDY+ScXFGOl/FEUfQL0BOYyxvN4al8XQcIvu77FE//6LA6LV49dbhkOijCkMwK2QAr0I+LQdItBDvk29vgDiQ2KLKOTzii4M9eNZYssJQbDjPiEshRAK+Ho3+8K66CyJybYW6kjn7lSjaud4Pw/8+kgS9PsEMZPqH9YiQnT58qgQ0Yb7UxlR8PWD5IjuB3z/+MRessz3suP4Lgh3jdPj01jA9JdkpLfs7jQDSrJT93duSim8v9vPNzTQk5La1OnXO5NKwOzc3aIjueT3KfeqYVNEkUENI4fQPVDIZhXgS60RMOZJG7pPtfWlFg+ANhhBYjCsCElF4oU1Qe1iRWnzt43qFlSHJ/Ky7Rscard4n7YsEFim+XirfWjQZ8v5iWEVWvpom39TrdF7D4NDXqvx0fPJIXHFae4Q9xHuY3gOoU5i0R5yw+Qll5h4YTku62Dlil4Yfc4apoJTpX/uGdvTvOFFVKuHCVoIzzWCeEZcR7lG9vgwFDC/MQJKhD+h0UhdoGRH0EwrFuEFC/Q3Z5oHiORqGRndhB1h3oyj9OuqMNh8W8OQpL4eQglTTxdASE8bJujMXkvW27UIT5b+ljR+NRTQ0x1CHGmxbOh4cYlgIVu8zR+BlrCkeF8oG/NV9x/XDAhfw1InXC1p9xk2QK/zYBw8kV+mAr6dKjQ7st26Zendgi9ojC7rQkBImc7pS4p9AK+KS8CoVVQkczRPmZOhVtrgoDnEZIB0MCeL5ljeudBqSvpBX/OMHgYh/0xzH/AnmwIBI5s0wrIcNpJNmsvXvYx6sVRzHrcbc9TUEwOv6Jov7gjN9SJR5ZSfaA1cNwCRsi82db7BuL9mjxgm+oFCnmkKCpTvbgQ5IZyR+ol+ot/MmESltc6wRaMRwg0n2328P+ZDiQ/3KbzUpLe1B4VdAIKG7f5dn+xDMGWItrFVDwHVxugG3lXsB7YKzOpzZnuHlpN4ue9wXgh3HYbhKs/D09VDmglnMPqDzaHOFgQHBnNyzBZkiAUyjOhTfEAFgIfx9b6hYDtELZ2hZmgZ01isd77XtgSApa1gEAT1acMCAHP4SUvXs90NfLBtdBLscziCUJY43/VHGB/o+ZkX6+KGXasMWiQfzFy4sCvtPbRITpi0q7PwHnW+uHhemPq2NL4Pf6KFbaiXOM/t5uOt5Wka516k/nWL5Jqx3qMV8C8XyTkzeY7Wgd+dPe1M9d/eo9nz8kHYi0u8i0q0iwqtbt2v4LqHuQCN/MeMowFDKYgRDqbnOVefMT8Oj7rvoqHRU18/dWRi4gg7PUaM0oyIuwX4rdHx8SMnv37yCDs5fzfvZ1qgY/Ky+/0M8TcQsp2wbxj2pmDIgGiuMZ3QOgcbD7nddW05cmr3xo8eXLLk4EcfvZeeHnpX44brW3ZkHC1bcvD4Hx8nD9OTc/IsbWX5KkbhDMnrBzKuc4pr4XUdQDJMqKB+3Z5GliYWIWLdND0ZC3+st39kuCCJMLO8lCvERRezDUNAoaGqfQXKbmD8hUdGKpYr9AZFaGF8bdJIBDcpkE2TDM609mMU37rtG5msovpN5wvwzwYbm4YG8eRFanc5Eb3QD7IZOabFrHgDEA6ZfqsjcuC4Gg2pcFZuCMJRjIlP40peyGL0I8fNWbDWiVQqt4ztPDmBKWhMXXL/uv79bbv6+ytXdGq8Goo17WhPRW8ALaGEIPmjB+5SQ1G1OoqPNXpK9PCruG3UU4vSU3GOECYBDaD4w4hjvk4YrxfM0ekeAdNH3odh0NzUjEGBJKD6NvOaR/dsSvcS0BfPhqYp3Qvwk5i2hTDlPBXKxn3VP6YGOXKAwVrRJXvATHt0T1AaVSiF/KMtJQBKmJrllfnUzAjNUbPumlzujj+bW0fhFIkhUsgASvWpItFNzgmS/8Q5SXyVwGqwnqBRG+yFiuqcoDkh1znPuTiVxfT9A/w7bj13BeV/b+Bu5bhKNuc5szF9XqFYUxRR37xIzS2xRig9r3xXDeW6KeIhOddinHP/nUto8oYgbt2jGjdvy5eCMm/H5Gysa5cuj3U3rwoj0wfafSaKrG6JNBumT8vEIl12slEN0KDuv+no23rElPRQeLx1+PLGdxouGiBqDcpDeAXwY89fcswrZHxvfOJTz/N8Z1yLBQS1B8BHjh49KaLdm3267tuyi4fthfZrbj7QnMtBvsPAFQ0Kwp98YuK20uAoL1560e5LwOPzvkELo8wsdannHMG7/nSjnMWluCXcQaJLL+Zd92Y3PlQS8kLeixA9l8kZMbZwfmqvc3vTQB4h5zGf33OW9fucJ53nwARYhqkIxl1wkvrSMpvGqGvN+BVxfOtbr+LVu2EN8S5bW1rgOkMeGIVpMApNzVU+T2L+ZPTQkiUryEPvzC40VbtlGprSECS1KmvWkGC5ta6DTK3ytKv/eAEdxfLZGLeBm+Q+hOH2/kUyGnhM40ypPceT6eopI/X8LNKstCwetVzM02hn+jYV4ag0h6bevzhV2NMr6Eo+r/l79xQ8acx5YN1+CPevo8cvF3f3iEKDFBKxQLXXFxJ13TmEUOnC4lZNlyzfha4k1gh+Krx/USjbLgMlm/UhuT1bE6We8r6Jjw82tirggCVoS2wkyRam0Upb9saQJUvIHtQBH76cY3roMy+iz6BULc5qKcbC1y+eK/IPvj8vm0Kpd54Rk5ra8PBBmmGhxJq+9hIIL1nbjUX8ke6uUQBGwUF2i/3cNQLhSBf92elZdwkAl8x/g/wMly0Phd0fdq7gtSAK6O2DgL0XCatIFkS0gSRSe6EOYkQ+6Ga1dI84P1/sl2pjrZH0l9Eur63Oz1bYS9Lsp4l9qj8ehuJwG+1DV6LDlOOqiIRNNCnbnG9Dhut8PxmW839ICuV3/uL9ZUgG8zIgo7p8kDbNPVsfnVHnllicy7ZTlw7y0/PyY83LAlm93KgFyk3WMuQI874XZZBYjJOdIxvzPMTmteCFk3/F8391kh1rgSLMLlXfHFSpPXXyr77A2utM1Efyuf7rL6PlBA4KIAwWzXmHpyu1qBCxiCUloVnJvulMSZblu/a5sd4igHIwJPM/fpakJDEUMKWAh8ApmZcC6s+l6y7bflRULcwVKLcEnL8juUhU8Gkl6uULIt8cpjYsgpj6TcNNtFug9NiLDKBBAnhBA5cX7yNZYFjQNUyLouJ79sdIxksdgmLvyu/eQnr11W80Dn33I0YQ9Dl/RtKlWJYEpmTFmVJGIREjG81bFQnhlolHt19zHX5Cfm1vcSUMGv8C1oJNbaSK29QAllCdSTWqOPvV+TLI6ILZwqL5FogK3plkrel1JUg/CLuhf+F5wsoQoTb7cDsuIp++iB1vVAEmHldfShgd9cZ99JEFWe1qbxDqgv9CNxL78tVX4VWn3uonNxf4c68/R647l54Sx2ZGe4lC7j1cWRcVuWiav303EWlPuewq1oWLSBcuYkdqwSePnCtbHn7If6saD6pXXU1M2DeG3G7O9ZnSURKTAmdr8Tlc/j2k1/nxsnW88p7q2rZBAAbb4HP0XG0MhMMB+Bw5Lq3O1EJwnGDN8yGNnwa/ZW85atsgPBIOOCp5Afw2EHb9lJ2ZOT7Xy1M8wulYippgmdxMNggmwwImGx6SlaXfy7IgUecNL19DvS9fGwmvhtzWqyG8eutZErbh77KExaTwzHHaC5bOfOb4My/ip4H77hmS9I3kZTvDlUlipDLgymucU1QQn7rlSYSevIWV73s14DpjjARerc/zTPpUxj1y431YV/Lvvw91Wn7w1T+o3bPv2Ure1f2nXdvZzvfvOZjFgmXBfTIcKdEIAJpGh7p80/B2ojwpUwfWcEREyTmT2lSImtSYK2GdpenWvcTStDTU5Ncb0h14+gRVAC9XIqptXeY3wbLA/v2SCOwGJaeGZUvJh6G0iHXpyZtr1iXp1tO6rvoBGGiNZzQAJxXV2u9vCrUO3DqJy5I/BARbQhg3h/yy7q2dV+A0F6IZoUaIVxIVkUjuG4zOqBlNEknqinfdBNQjxr1N9GVFG2OU/03y3Sz9xOceXkpWbM/h+470qid0S9n1i/94cxeJnNn02uzrm1XwoKZMKkC2h1eN2DJUL1aWdvfaWDLEGG9oZGgJQWO9pf6Segrf2LX3gp3EI2bj1u2bFec+5Xwl5osnG5NqTDlP/nBHmzHn03MU47lOjANGiQ4BcxFSvtzfV8x7gU1kECO2UEtMV64IYs3dAKWoq1VfuRYlMefHBxJdpvOnfhH0mG0xd3mthkByfhzsjLPrYiMYE8DqCl07AwnirdhU/Znnfj7GbsyEgl+Kpy3zBX+wlgAxYn3bDLlXoWcCQbb4KqvhmPuyc9QNWnvUDZryfGHPoFmEMC/RgSWIa7h7SNQXC9eiCRlYsrQwZTszWcrGUG8lmsyBjKREdOjkNtH6sRRZ7m8sfXiG+UB59bm5w2t10tSEEjMASQakuoilbBkUEKcqKi8lk/mMirDA3tJRaIK6o+lKe09XJxHXs82FJiU4JmhC95LRsWURn6bFLaTawf6BSiloq0iFOhw0gmrRlNvaSt12g4rwXMhGK8tK3XprQL7f32Q1R+Px2PqM34SaNoknOoo0+yej8inclYSa397ZvSePv4XUzuuXDRxoEwS17QM3X9NOZLL8zgt2NmGe+BQPu1d97ptfmLA1EhEdU4P20oemHxiyg2pMFeRQVG0OqoN3rt7wsSUNUTUaQkoyOXFq19ZHlpvtfhX8WtOgmEynG+W4nivmzZsCFgyZN2U2143PELeDu4r7KPcl6n3UBQqVYWRTnXKlzKLeDepaRl0bvcSJWeIIQ0O+vNT9wv/dsQVVjJsmbQADSQbnaLPV5E/K0Q45agGpVUFKQJV0uHalYEh+nyApk2pBlaIhvLDawf//wz8TNG9KtodyMTYASRFqesPmdLeKzIRa0ht8ApCFXbsEWeVJ+240DBXiX7KYs/2/NDk8e/MMGsMUZy1eo0S3CypWjiXEZZuPYH7Q77p0utGhQMyTABk8UXJFiar9/GQjDMJ+49EseeENFRuMKkGJv/ZtzKkiCczSjUh2/CRgCZvAR37CZBD6U3VWhQdvQ1BEvMAjfOSRAOEkr+qCiHnywK22YsmipjyfKo76wj7Q7wtifnmWbkuyMxH4K3AH4aHxveqs0gk4+jYg/9Eqz3C6LUCf2tYZRFJ076ZNHq09Rfvdi+nK8vfd83rmlMRalYkba1/FJrn7/oDugu8MbYFwy9DQVgC2WuKVhpntOCFcphvZjvfsIUh7Lw4Nbbnf9F8pgY6soV8mgI45ueV2LCslKAdBlFUkEtD1pkYiDYHHqwkdxpLGv1egbIVlJy0Siejta3kpqOgqTEsIaorv9z5LRZKTlqygz3kdN0yFjXKwxtNiXoXwsztINjvgatndEI8MEwuZ10HbgkDrfC2sIRSxqJanwDAEFbv9tKU25mDwz8ANE2a6CY+xYfFwWPKerPezrHougXO5ZVmQevUbjOPCh72yHFRFUcs1N+c0URRD6uOGIQR9CC1tGAQBLaaLWlNLc86HfzPxg49qqhrV24JL4Exwsdy/Xo5kNyV19VU+oEXl8MqtK8NyVFMllEaRmA6A1vPB/WC3KNkxKbxy24qIFNNkFY2INl6rwZbOpZfUxm6MxWm/vxn5/mfde04tMqx6nS844URLmFfZwO2mOQuPcvdzj3KfI1xYnf4jU39RWvBLErjmd/LL3MW8X/Ls5Ma//Hcv7Mwc3+66jYOvsfPb7FR1L6/3nGTn375/3ukHZ7u5sS75DcmwOZe5avHy7DkOM3O5gv7ww2hNeGM85go6do1UezjfnxgUSKRVIwupIGuxUpbIcLHk2mZfF8gU650mPS/iTsWqzlhB9RY3tdEtyksC/bRwEXjtzlpjZudch8EPAwBkAt901rrhrl9/PvBlWXGWMylJle930/648uZHqG93D4nSXdBiUUL1TSwi5s1T14WCUP9GrdGX+2LKyxJtmfiiEosg6Ztu878lI4eFDdQ3Gdoy8p3hFNVrpE8GnA8FYr5/d9a5vXjmd774x+YCA7hazonTcIaLcFnM29OYr/w8PWst5K8+4q+4WJREfVT/8/fkW9EDB5nT2YqB4z6/qvhQ1aHubEyevr0G/o01LPfjOrS49etNeysHH0CsGpB+VhOVGPhwnTj+Yy/TCDvPzukCeDeerYkL4H5dyd1CItk7qULUVbdEyhWWNMVPdXJsRROmzVUpk2Bjb5nPKRMjkqe2O7tHJQWe7WWIqPn5oXFBiUYFfdcE0ZKqY7dd3Kq/+rEHX/VZgkyiwwSZybW60oovdefg+isguGzThssh4KGesBFCAB0/cOVH4VDpvBuCri9p+NFrMX9u/b2a8EMtN86c/fwwsBWU9KiqaMQBxQS57wfufR6hFz+mY3btbsM0jQ9qgl9hEq8aQIGrSZvukv3/A162CX8XXrbRCmm2oPu1hHb5vQgePzB2IJuc2qXbyNAu+SAApuE3l0kwkpDj24d1HYWNDVewWF48n6axzMtsACTrXaeb1QVTWYLVWMyykKmPYZ8rzyXHsM9SAlN1SdRhPT2rL1d7PSPdyLsK0MU30/OmC5hmMuB35p1q/iMkPw3NZwEWZo0g8YPEL29BPouYGleIavTXdNu9RkGTTOWMMlyfzuKPVfV12EMp/xtvEdHdeVMQgOGoMWfz3Bwm+61Mo1E0SfVvzVw7t4zoR9/Tj6UWydvdE6647IzH3uQzZgbOOqPe3ntsNwV7TgM068b3zdRtkuI8BEadGZI/DrlMQxWf0RHcfAp4hI/vzDIBejQ9hXvJPMQxeRgFsy5uT2M8Cbkg5u0aMZbp77EWugZ5za6QJnK4jW5INMtL+5+sXZ9xpsBUOo04/EvVDZpG+PzOy+zzMzBN4cbspn6aU86NQ3ov3WVtEOuMpmBejqGz5wWE0+cA51SdBZOwXc5f1sXS9S5CcEfnshO1EAsrfInZW5mO9B3Gz0HGOU7jn4/Mm9bT3gySXDiQ3HoZvBYHuRXML6JeM2u7BuGa4oaGWeY9moRnz7x8va6dgCaYkMRctrazn11PfUdr+Pzvmwi7lum7e0NNg93i3OOhbWb6Jiuil936o2kFEwoZqdO+mIlur/0O3bX6fI5wiZmewZoye+yDH/UeMjxlMMuhyAB/95SkYXI6JaNw7IH59GEONmuozvI9oeLpjPE8cuUAfNslEszrjxAWAyBqjfQY/veCxmu4SR/8tJ4iD6X0T39w/qU8rSJZ9fsUfDZj54KDs1gV7BL86ZQS82nSFEl3RHmXaXQHXiPEVjvAdOVEiUw1kGE3a5RLxDzS5nIqRP6RrGyhGOmt4M4ekq+Q4N5xGt4/vhdKV8iyqIu37zNXXbDKnLwDl529hFFXI6ovbaZ8ySVJX+oh+bmLbzse9ZNwfX/0+G0XPydpDZIwaPcuW9ZrD/JSA9xNxw+AKrACCAWsujYTu/6Od7eZxhEvBZ4PvsSodp+bTyZ8th5lJdfxjOLNs/RIlpAQ0ROpyM5JgNY3dnx274Wf7UyvQzlRjEbltrP19gbVR/vrO1tnTdFSdR9SwK3XbT/VFemDsD/SeWr73mUk9ZJv3QfOBggIGSiqnAsJz9eJ5Asr4XU9QmYvUcey5HG4ryEyG4n+tXI2e0CFzWehFLE7gVCulHCnp/djHiOoVb+jBwFC+zEjfOUOoXjtxNQcipqauLaZ33ElCL7z56t9odYyvD/kWy2V4WQm25DTAwE915DNBI1Lb4ZgyyW+o2yqHvVdsgXAmy/FtGB8qbx87dLxvjEvdspr/zjRKf/XewAKsNhXydgirPyX+wJuuuohBIAD0ENf+sN75fybAOALur/hBcd5kfWQ6ZFfQGN4vrIsPixCrFAsV6jvmWeml5gXms3IIeljxSzUI6NKXbnoFYhQkZ+XJ1VW8RSpNH9Azvl9jaqeFG/AFMQIxwBY1gaeaV2GOzdVM671eoJA8Ad1os9UHdGHY7IQaSA+NzAV0oAeTCLiSJ2IGB0NTkfbMlzpT1qd4WB9ILcrtD49h2fnYLCMW0+jE69dCIOsBwOa6LS81BU1Siztfy7j7RTlQgYxHQ2h5JSpEepUMnZdwIhUHzxSDxw17QGH0tEbwsWA2Rb5gE7y/uvOlBBtG5gD2YgdcDaYEYBxEPhGwHYuqkHw6RoEN9buzYOZTw+mIHBzn4JE0GwAlCgBsKR9DoAoYNsB8BMzYgc+ycA2Og+kC3x0JxZYmb10t8ShGuY8EzibL6brUku2finObU9FoD3PuNxBA8JHRQEKvHDjprRHrahTGklR1eLxLGxTWH5+Ss878VMQQF74mpdSn9YwOT9xJrcwP9vmxe3lFsmrwhY81Z95W8XVjSjJ9dToJgRj18XSOfZhHMKN8DpBOjTt+d2xfm66EfccCiLFDF3n8RO7z2E7/xvcG8rL4e7RkXe8bAZfE3gMCFKCu2vyw/dQhrOI7RYw3OYngQFk10qiG5MybM84M8OGjBoLiP2C7pXMnKFnruADavVpS7lTABJ4Qg34VfC473N1nr6vT6swGPO98ZovFoTqp79PZqL9W0UN/JtsydV/0wDQoOLPO7S1gPT9GElOpTz9tALDMeVYHU/ktTeCuaL2s7e5KBUl28XHpgJMFylX7EVa+vNf/GjlzA8Y7J3Pg08wR+XTP950ljb+7Lnn7M8TDu528GVnJSCM4uefn/Pln0GI4lLOQ52dntqVcPIjoCZO2BG29U89gvz8L40o1LaNVPYEhbBvVtVt/yEvTPyQ39adf65jweFLo8hvDK8EwuU5VcFCmOk7w/ktFHU+5/L6g1Fk+UHaZ1afdFfqXBtX0+ydbhvJBuKuPoDQrTC+XadoLvhBf4XphRfthUf5CGVk3fDtXGYXTS1miL7IQG7dddEv4R6wEPeoceg1XZNs/d09rN5XL2ywLi5dAwI+snewZGAst22i++ekX64WZor0+OVB3o5r5wbBqwzxM5n1FHoCy6xMB0s4tauI3+rcDuBihpq3h2k0kzhPZyYxhEAIvqsk6/cS+dYrmiySiInumOvuHz7irhqCD0Q0aVhAzZCdopSMUu3T8BEGMdutAguwjZCCxrFnET8k2WliJZ4i5uG0LQ3x6NnVNV59mSCoJgosVePq0gCGgI9Pi1l9zRo9K6ZJ7kC8cFIKDMXUpCwnsagP8WUsPOXKHfgQQc8e234ZH9+eG2B254Hc9jh/2fZjz1YHXUSZhZratUxRlnXpPtnWJ01ZW7tWk81J3XZ9Khks41w/ltwmuYPcIe4uTFRzjOutD+ijGUlqrm5ng6B1DphJovX+RsiaL+bVQe5YHUhvJFq7br6xBXi7wrQ08t0IPWCdA6S68LP3Hrje2vhcWA9RVA9rJMAHDy7fBHMHugaYhmCg60AObh47+KDzyUUBjlH36HuOqRf0Xrf/ehPdH7GmMT2r13obddme55I4ydKOoa/fw3oUdHe3mrrn684ptpM5PYJZlqLsvlf8VH2V9gjzKPS/8nHvKXxkufReQS/TvZpINoh+uvp2cZeSvc5BnUM9U2rW50+uj3Hw2IeFrGdpkTgIa7GYISyFT9ZorJsxkmBY5+2aXP90rfTQWUrO12rFry1C2El2faqPJ1/x5H+XDznLhWvn+iXveMTdQcvqo5bmYsY66E73hT663XMX6O5xecylhOrUawWKngqgD9VkzhRAJwCJxEKCKFFtxEc/2XFgWS3bXG/747gdM3XDhyT8ODH/IuKVdXc2X0t9t+JQ10dvpppy3llWNzNquXbGqO00QXaEzRct2rJGsCCHE1n/EmMUqdqmtv6JCwS449JfkERO52/diYIamkvU9O8YRMmjigkC6gWrVEuSNFncpzSpk5eS8MHrW+BnSNqmRwdW+cvJuaxMT5z6qfPUtw3j/o+aSIpqLwSg/+GHNd4f47y94l9Fy7kl3Pb6deNmpaolaq/PSkVSw7wrK1Xe3Q2KOuETCZ84VhLkFUGna4mpfHG/4Fu5brG8VDwM6vXdrX5Kkix11QW0x0clEkty6aSal/eJMniF1bDr0UF6v3tq9d3P8vyzd5MkVUDV9OYQSVIVNGSSokoNSgo0MDD+EiHz3vsNYLzgiwUE38N/5IeBb+vR978XOwiVaPgg2f4oQzj5XMbVTS3MxV+fZ+YITe0bt5QrAFUzOz84QLwvzrkB+YeBIJwgyujLSbJymun4hBR8F99+jrZadXuju/z7e2+RvgSdJQmxOi3x771VupfmmO6WXtunBJ/YHkdEozdvqyFhwfXC30G6Rl1A8GxFOMm02kzDPVOfLInYUudU/G6cFGuLxeVoTOhSjsvkat4FVB1fLJl0n8X3dW+uddeMjoKpxa8WKOCrs/XpIUdB2pn2thYmLR6FU54+9Ek3VnYLySBUIU5NJRKb1UttWDT1TwqQ5WeT8AtiASszBwiS+aKHbSkaFoPUnYbeTtGNzoapbEZOWcYJY36DCP4scp0FjblOEnhCHSGJyoTLhmks78Y74P9SHt1BI1tXHJIMC5odofHssgZekDf//bV77sjLQR9QBeXin6g+/Kt60bWJLT/czZtqNMSH1+1CujaTzaqmgiQfH5z8yUjFArwl5D/Yf+Hp1clBg9caxmKhylEy42HDsBqMqRuzgpDcSlyjx23eTFhvdm5Ot0+oIWl0E1gyoOTTQnMrCjvTr8mRmHLeU+s2X6EDo7C2EQSBEDMQUCxL1gaaQod3b1sLfC0KKOUAGC71JeWMLzZeQKK7P9SsuydRiVuF5YUt3IXczYtLxPYiXilUuTFvt0kmOM/tIVXvsXKuZDVgdpF9qVudmnrDc06hSUo3UkmCuZJQo1aqtjP1RXMLhhrL2btuAabrNqt2XqnbrPqJd7mnEO3BqLurO5XcyZ3NLNDiVZeWT8+rnRbm5aEj+50sozH89VEgtfySuTnPaRYrQwBDQ+siLHNjhYHnfar+IVcHurK7q9WdwP/nj+F2PfbnGGuTnsy7dK4n+sSvGG6Kpq8cnX8JuToQveRaMi86e1XepXN0kcrYZU2n9ApqxHzDKLHHDYNaRKxIFW9SKMK8mjC2Z7IG5nAYJ0FzBbtiR5idoDTagMA1l4iTlwCUWXvhMf7Jz/zoXkF8COwygvxN67SA1tIP0PZeEqKw9wAAS7rXPiSCoP621PvgSmP/QQCuurTymaWitmbp1i0AXbJ0eCWmQ3p4XANBbdyvZm8e3VyBdHfOKy5Yc19HzL9j0DCBp2N8nK6nFN3fdYTbc7Z95jFOIsgmwjZlna9umtv+Zi5O6Bzx6aO13eG8FXHSsBB/8np/7Ox70zcwzRk98u+KMF24c304oV9zR5S3AqBtsf3rnapXHT5+e15ttEDgIrv7/Gbe155/kiswLraX2bzf82ff6+xc78/7Hdwx01whCll3DzOmfKUkadEfwAvz9z0jyUDYG2e/DaZr1bSQSsmuZrXqqtw5fpz6r77I1tWreC5ejKG9nmq6qdsAi5gn7GrITX/B4oD8YG7zCRJp2mv3uK6C7Looki0fMS4nUVloFiSce5Ibk8caGsBNDZuSubgqT6ox9ffJDSllWImrjzc0XIfLjyvKPpXcN5qChYbJhobEQOJWLHQ7L9Ic82BcAR8tJsFNicQx/LRzTyLRlFBj8lZV/X1DgzqsKCeSG5LXNzScwFXuU/Bdw0hsxU/GKw10j0BMmlXnG2rMxbMncX9HueV0dl31fvrc3SMt7Hb/vG7TJ2gSc/x6XqJAoDlDCRgACZ9iCQiKC0CyueFdIIkcOxtMLkoSmFQ/OoHvXKcoxx4H/3Q3AdBxVSVncKPqTNG0/GA54YPBlecEl33Mg1cCf0RRwX/MAcz5l3FVvQ5/5tiJN4/hn24iRUVxjilxcCXmdBUSWh9TuRr/OkN5xijhsxdmTxFqYRQhMSdkC+/e8Cdso3UL9/R50k3VvBSze68ELB6cv6ehKxwvpwxL9ZHdfCDi3K16gLt1zwkvPGIMo9hYIPBptX6nnqBxxM0pMAZn6d4XZ/OM6S3TiMYKBuevMEL6FYVjWtA0TQBpBdykKL+GNDK8+savqUvnLC8IPEircQ+n/wP6YxTnwhirF7luKo17+Jk41rNwIhYxvCBp9Lu3JYTc0/8oCP/4dLKYBaCY3LxvCgn/6JyfLBaXFApXJQuFJcXi9+ZdoTh+HL+En07kE8kCgEf3/fEPnAOA/Lik8Kx7Bu75G+55To9OeI8AF+OyXJvXcjbl5zf6bG3FUg86fWJMTatjJ04joepcfDYPJTSKpaF732jco+t7Gt+4F8tFE97enQvONVpA2kT28W6n8BziVnJr2T6889JBi65MxwIp5jeX+BQJ9RdS/QXkAm6TX/T6EMBSG3rqXl3u6pL1e59CWDi9zXUxAu6unwnP5yjtdoT3OobS6NljNz1lQ9/YmA/aT9107FnnDs+rK50+S8mLA/w57muJm+DO4/a9Z/Ymmj+tLnkTcwcs1Rae6+rrJm0q5NwsTsy4UKEmKjS93m+Legqi9afafELATd0kSDm9vS0ong/RyhY3c5Mu2v6tlD71FeGdzWXCt1XjpSN5IdR9GKFge7uWkwQ45aXp0YnYqaWDXc0IDgw0ybGIIMFIX0Y3rKRA8jYhNFbwLSN5m5q7gmmN5mkK0rxNcLANDAZJHqeDGZquyc3eZDgn2Tbnibr8IKMsfzlVbc3fFYmubpeW1+QMuES8+VOQSd9kPyQqj8MPXSjuupqy7Q+gNHzwBmcbk+YxSaEyPvjizoMQXL3LESkE/uODD9RyitTvfTZE99Oek2EW7u2BL+uduSo1Y+Fc+5DrwtIJiyTWmsV4VEja0bpcJNQ0SnfgYP6Baj0SxGd+4c5l66rP0lFZh8tEThn/2d4BJPj0WDTc1HjhCvxVnUe+IGwtQzOkmJ3FrkbENw7gMfQm+89w7Y6LoQHG0NXfsurB/1fbe8BJVpV5w/ecc3PdWLdy6gpdVZ1TdVVN6OnumelJPREGZ5hIzwzDBMlRkNCAKCC4AyiLCNKElWUBBVSMSCMKKIuifvIu/kTHsLvvuosJdX+Gunwn3FtdPUF593s/6Ln33FD33pOe88T/46Vc+z15bCbiXkIb6IODy91ZtL49bkFeNHF9bjCMMAJGQNohymJAE9WFiba815GA+rxei/sxSfMRnQBWNUIxMODNc+ipNJCSV5Emw1lTDfDh64BYet+m1nhIU5VEYKjmWR/x426u8WI9F7zzSM/jXWLfKToqeJLAy2sLVuswSP1bza3vBA30BYpSWTo4SjArjbVX+3qsGZTigtxi7gDx12ZmDoZSQ4O36oTlL/f5LtCYc/FD48eYXwIxiVCAa8LdioWyWPafUPNx+8JNAYo6E+L23pMIxnULhfSlN4ekWEwR09f/3Ah2KxrT5eok6Y/uqF+/7e++pvUoWtD9bTinRqJbHT2ZFTuS9f1xAC7cH9p/Pmpbsfdq6BjwYiMOLjsKIXSSFpCCWV3WYlollwsa51rICjA1sa0YF5NhdIOl6ke+zPNfuNXkLfUGI3hEtQoRHgDId9WzSFDUSKTjwEUIXXxg+aMjqjlZNUIhozrZ9KN+Ca3jItw53H3c637edoLfXi/7WWbIojEwWKsOLARMXU7+RBP5RCTKFJiUAxyDBAZUpAnO6MRksB34KsW/rNG8T7QAmJ6aZbolXRT18QtobF+0CRxUyJclWijTnqT5Pfxuxb8uDHq8ZJ7hhNCQIg8R208zjwZ19TXCic3mniW07DVF2aj+EpIkTTxCCG59cjmED6jqXszjLZggzMwONaEsqH4QwrbJDtHQQDosYX5RgTxcSS5PYHbGiul9I1AQIMn2BN3/p6dsCoHTc6drWSke7i4dHP6lFS+lVpQ7S6YY2JbbpuWkRLg7uaLclnnTjpVTK3qTQ6EUFqB5CQQkRy1uTIccuFrVdXWDoqxKDAbTho0vur/DF9s3pB2HpKPHlzqV1wi9fTb3LOHVv4+/dKOCOvECRz4FjxqQLyzD1cH88V6FVAfT6B24UL0ZL1AFXlA1mG7HK0mnw/NoJWmV5aqipKNaSQDE1QPw/F++GpSz2um5rZpoLri4uxS3fjV8oJxM21JO25bbHhCNhZf0YPb4l8MHO5LpceA4mQ0lxZFxPRBvG6nQUHINbmL8BaucYGYduYRrgXgLXxpIrFSUDbgmPk/8HOYz09wwRYfAc6ybGinp4k1ccfFU8xOalD27OmKOvHQ0YXpfbHE+R89hAe6LpFN4XjclXrXdUzppimqGlDfOEPKymPp+qtAvqYj/Ryzf/eVtlpmHKsMYoh6ZPlpfxhACJF+ju5fKhGVoBB0TfNwI5ttKRoAJ48E5fAIyl9Zi/r7OHSLWmvkSICgNUgtGc9IsBp5IxKYGriAFXhdodHzdN43gIS2VPAXqWDNlEx37da+A7vw+XqQ3qnhYkPHh3gdOf3L5w4qyFx8umFB0oCt41EwgXpD1UHQkp1oCr4AzpVxgOx6VolnqKq9IlmO0j7vCMdzHW3On4z7u6Kbn7Tcz2dLKZHdox2us48jsUZLw+6BQWPYJ1RtlZEYl1OVyQNbtWDSJQEDRYxcYYmB7/nQ88u10snxg+JdmvNR98QK8Gmyl88RJJzsOVt9U08meS7i5uPqfejqNFRzn2F6cOcuXIAotx4QcH3vstCQEyVX9nOLjTMumq9/EvT3vYCkNGcct9LJu725gXpXyN6RfQTt80T0q11cBsKoOulXd0N2fKLVVEK6qgR7cqkA/7kRjPWhPMk0l2ybbfV//Z9Bn4BOYzhJff+ITuR6P9qFoM85EYimAiRKrzPii4Voza9fcMkzSdGFmvkiNu9Ru2yzBu00z+tjF130KLV3UdnZqOGWYKrqjFgyH25PJrwdTqUI4DG9Af3/2+XdAeMf5sb7oadGBxe7DmuNodjh8lxYMasFQCLwM918D0T2XTZzXvXehqIJc+7m374yUIvjvVLZz/3TmByD8wJn7PwBVcfDU4tSeUDzU/GP6R9yPR/G8LnKDLCsQHuXtZZGnK0NFCoWjg8TwxVP0fBLCPVibZ3c6SqJkV7zNfeQjb3MryGQkqbsBXAHImRWQnnCzLXo3MK1AURA//EkIP3kHJoJyACETIZ6euB3xQAb837do1byxxr5xAc3++g6/sxwaDFNTcD/wswAUT6R8fkd1WDr64+uu+zGJwGJ7d6qlThNegqN3UDUJgGs/CuFd1/E82X/0WuH+lsq6Xp7zOTpF7Moyll6XUd8BLwn9yY3LZED2AykSDhmQeDwNs3XaS+ICfpQolbAMJZ3AzJz/MjEzx4kOoFy1nWLfcF+wVAr2JYqZG8lC2gG+UKqUitUi+IBnbbaqx1ibP0swLDqG0/lEX9FxnPJZHUHHuZHAGXbMq88ibge1BLwjq3OZwAQca3VGFHSbUF0xRPzIR2F1uFz32Jt6bRiJ3oxEs3NGaGL5bTFCi4EWI7TDQ2eeyf3nmEbemCkmWCMM4wrZ1TJthw7l+85wqYQbYvZ/mjAJbFTVGx0n2HFWGbdTsS+RTw93EHano0ONu/87SBt6zt/uOdx0MZqzxsOd8QWxCklOXomMAZrgjdkouwFLqZQmuHqeQYSY52sUY5Q9AFLtbrWr8QbbF3RFNQPXg5+RHG9xx9Gzpo0mhcCDJCTt7osUVeSRpBGY0fqDREF+L/uZu6+8AMyotgCMT4Ojdjpom+6DZLUlHhRLFvEk49p2AU8fwVDPAYNlsKuj7vvMszotouvvyWqFO98L2mwGTkk5qQuIBRPkw1IVC43/V+p9B+LFcd0hcGtk6z6IAA8R7sNNOjznf94kSyDA3Mu99JH7NAfQ6MGLdmkm+Mf/s7YisdS2j51b8OGUhIyfg5zGTwksCWfBofHeRWZKx1w3PWK3SmAWQvenBCMVf3Ge7t2nDRt/ZY5s7yfIegbAvJNtNPQQsnSACDtV7chmYa0DEisLKdBop7fxsG5gZiyL9yQIqtFuJUIgTSKi8GqdAlYSH5HIqZmOGvSxCVkOJhaXuMbzpZsXkxhtKTstNtOi7zOFZbpc9WS4AMj358yVWwO6c60HuImpHfO4wMVXmp7k4F6WmwuzlI3xoM4Sd3W0oD732Yw7hbOeq737SbYHHiCTn7536ZwvuW1SToNaVVsxpBs5qmI4OnNsyjGymVsHnkfLqS+Z53ledmg0TYBC2UUdqYXvoMlCjkdxFCgyS5PEomDttPDq34hSLC7+8GUsDcvCT04Jv2sBw0isvSty8X5n22J61PgwwzykuIjgN6l+yxSbh1mwoPcIeFGLa5Lm7gX3akQCdhf+/cBiwDAeF/a/8Up1GaAgi+5PfUhH8ut4pM0K+kecZ49/zsv7yWI1Jrkt3HmE//I6kFi/HLZjp5ymaowMGF9dVhsuA1/UxQuE0OKxLswfVASCNwPqoBJmWLyAPpWOCqqa69WZgi74OV3dTNZGvMmSZeAMsml8j+VUjTsKfI2oCHWiLfzLU9QBhQCswt6ndNW9k6Cwgr03uP9EINTBGQoWXTx/PLxpzOJ76Q+MIPizupk8DW9C7uVk5TyDLAvgu0T4o7lV/52NKE+emVHce5mBZNv73XvwL1VwjqJ/2gjO6RPhPzHbgEmUKZJnDqrX6tUo3dkl1G9b3wI5y502DDAtByULfItuAXxAVm+5wAmq7p/VvOL+SUCqc+GtZAtVp/n8/yCIDwpZsW3ipELNDYMuZ2UBsCRbhpwJPgYmlGCw8Z6gygtgQs0zvhPOwmna1/Ozu+bmZXedMuZBLEz7EZ0tjoy0zNbKH6IHUBu1VTQzQEbDYoQGswCqZWwyfTe4f8xszrhf6MwAfvLi941s7Qd5wzQbTzJeDkvXXDLpzpZGqkf27QJLhkCnUewsupd6WSh9+8IDmDaTnJ9lQp2LTS18k1UriKV6dS7RaYgqPRzR/7I6hbwBZMCWwHL2ahaqEtz4vosnEWjrBKsym9NAwt9muD/qP32HpbpfaLcB6t78vtJ4fxJIquL+Ea8Z7LuuIYM1GXR/B3bvu7W6uAzGE4m3OaO9q6i7rw8uwWRbcWfz7YVbNw3B3oEE0NQ2FdCYccZn/wzOUl/a02je8GO1l03Fom/vwlzbvEQ8fT5ALFUFZ3xM2JCndCSW52LN5/UoqT9B9P5QDZ5TGQNM+wiWVCd2BT2MOeeKzZuvcFDY0E1o73Y/BbetWEFSeZDt1erIQCKFy2SFxgtzR14zeEOrTqhEYWlajSRv6G1lNNxp2o6+YgtMxvpGVe/B6kRVM0A6fWCM6S7HDqST562hofanEFDaU/ALUdhcc96Pmu+D224bmIzElpZX7YIkwH9hT7kqo4iuWUBd3KdhKTN0uxER5Gq5ZyFZ3cHONeWlscjkAH1q32LVZmPobeqf5mOlcPOGf6X1oH7yWTLNhsxbbPcdtmt4c6bVy4yUiWmelGe8ELOWlHyszNacN9BPUIEzMPUgeRREjrDaEc5zisKyV63d89toAbL2/AznGHE4+ln3qZAkhcCGzz75Js+/+eTl7q/WrgX25XeSxO8FNa4ePkg9JA8S7dch6u94+LCC8lH3sXY5ohTcx6L4V0++2eACf9iz5w8B/qU773wJ/ErBvyBEEf8uHlIOUr/Kw4eUBOflgZ3GcsYklTGYqrEP+LD6tAiJHhwzEyEKlb6YJd8mvjUl4i3HNJZ09DKYCaI9/r2EKSFJcrHyc6bsWApAYk5NWaUzwraMJH4AAXHHOlkGxKEVIahYOTOQlGO8vOoDCKrBkFRdyF8OPy8ixVYzi2IH7lUEoNiK9osLQkUtYgICobP/Eh6dfl8fHzRkUS/ofG82kNJlXuu4ttb7vjVKkHjQVa5Y/cpLnp3h8+ghNMV9gNB3plONYhpfMmA0Inm2tJYQYprwtuRhGmLSH4oQRjtSpz5EGejNa/yb2rzfhjz4eO9yOBQm/6JhPKnDWCJrA0PhSoSJn/A1NSRLEq/wqz4WkCwdC1XvV6JyUIkDlHbsjBx7962CxMu6IAkaunkyJMdNR0W6GjIfUTsPtSPVtkQnBLsnoHpLfPd5ePkwAaplU90izYSFCtFk1do6MIyILhiz6BA4gvDe6wX0D/BpvLZJYbxkfvgAgLxqSdc+XeqSJSjE2le0ty1vv/CpdRDIghaX+A23bmhb2JZK48erFuKNbz4Ynb5c1gResHtjlbvedfOha/+8gQd4kVu2q5xb06uFEAzqbQtSuS0Lt/zuEGHjdQjYNwCI5QTAL//UgX/4d9+f63kazz3QihFBoX5z86AOfGwDAj3pwTOJKNvwnZBaVrkmqLv7Od1RwAPU8WO3Ou7zo9Tx3jNUevwsSWFOeI2PU5s+gfc9Bg+68FdwclujB04KyNyi/pgHDv2Xb7SgMcNEqybnWB/m3r/iw+zl3aL8HPVIIXzeSb2Xw0Rav5FZQXWRZKuZOXkiT/fLKlA+eBP1Zp1R8RjiH1ATrXlq4qTvCEp0gaqBCUXzDJqUsDlEkMhVm9hRnniB6u5PPJQRZw56ZAwzeDSUlMJzBMHvQc7DGAmpLzeorzWsEPAR9/uYG5z2RRAPHIjhit+PaVkIy3+clzRCQiLNVFakvh3MqWeYhBFEQujOPxAHmqoElyBN0REP2lUR/FBxNUxpnyaoyU+rcMVvFcXtlBT3s5YuA7AUieCXasLNqcqjCpbhlMcIGfXe/QB9d3b+uyveu0tNuu+AKLrrv5WkQl49ijRV4xEoKhJ+NXDt9xKe9oLvVMAnv9HycltTwFIo4XfH3XHK7J7XD2zwha/78Qn+WD3pSJ0/Ok82IhsPzxuEIq3XjOf324fljM3cTualfqKgZeCHu3vpqr34Vydn50jKVpbOPRJ2cg4hkoyhQczRsU7M49V6LhpqAZ+Y27hPjbNZnmXLLvEaPJdAvMAsKEeBYVs6TDYmkwBpVtBIFbCs1ZGBX4wXwfLGWigC+BUAp+dF19BgVJ9ykOJRdwqYPSUswdiQN90K+DamyTaWbHryjZ+194PO3ghQJUMzm74pX/V8z7M0j+027hCT0E8iZ3uKGTSHDkRgOhnAUzjkK+zKVBL1PctbFHmYeZxPE0uoYFfgJ92HCBpiXwHspHtbld2HZFWVwU5ZnW36N38qk6IxILn2QkG1FTkgSpkMbMgJzHQliRU/jVcZGa+2+QIABfenLZAvfbOzKItf0DiTvQjeU+hrOOQV8B6ybTzAHEZBoWd7J1UcDpxbHb+iZgpyPNB3CKjUuaRze0/9UF8gLgtm7Yrx6rkfbxVL3HEw7clI04BgMc3LCY+mGsuJvAif0SkAnGedQtT+QHAlI15Em+T7gMwlrxouiShfEHkpyEVrnFNqRyUOsSkBOfjSf9CsVVc383YBgOnRK4Kwzf2OZYHBnTtBzTbcH14w4v7K4l/+0JFvCbb7nzD5X4eJlHodW1bxusaTfAogpU1tc/+Xe5GsgNtA+2l7/vJKAOzF3Oz6RHJ92v2V+3F/zduLx007y7gleUp3JjkQ9VSGGu0R1c3jXgY5u4/C/hjNmFp0imXBBZ2diwAvbKsv2C0qAZDKThY71zmTQ/XVyHCPujNEENftoA7uI9a/v8gKjEIYwytwBsI04rFgNGU7RhjASCAJYRZzE2Am2GCE12hwVI5v5uLB3/xj/M2Lj/GdyJeOyYRbbs2Ni4e044cQ1+rOKEA/ohoNAPpLhcl4bHN/vgOA1dXaKgg685UNTn5jG+a42D3ZRATq8HMvvfg5zH2GEm1wKcs00bFYWbEPXj9tLinXiA2rVl5i3ngxQPtGlMUd7JZsxXCXWYq0hOdHRcUGz5gVL//lUZTBdZjgTuV20Jl6XF2qfXMIaeU+MO/M/LqUmeyaZ7BDRHLrIg7Kgm/l8gDOCXEbcoLkZ+jHgOXu6C/l18Zjpw7kO2nlcd2HNgbzm9pKA+yGbDICdPj5F/2q35fsTOI/94ZCtQDa4khE8Tb3W3jOdSYS8PuJh26//aGEmdnQu2f/wf0dkxk4Tpp4rL9zkTqxD10/bS0pV4k1r9oxYt14MUR7R9TFHeyWbMV0l9uKOIpbSlIs8BVzyEthcVGyUEjG8gjlY4yANF40ypD4JfX1TgCguf8F4KpBP2bhLtSN+YACV6OYKBTpwM9URcKV/DyqwHeuzuGmIZmUPUsmhRkWjj+FrtPlaX56KnjGNJqWdZsf6Yabu0b4xiPw4Prg+oPQnQ4H45qiOZoaiIG7grGAisuKFofdsq5MXYPQNVOKpjT+u4v4Z3fB8oYDJEuq8p8gFgyEhJ1qIKDuFEKBYAwcd4bz8ivPoiU0x+4gW1kJxt7xpqTWSO96K84W4cG2n3YacgKIl1RtLkTxiufJPCOb/hZSi5ZQE8mi4eDSnBKU5DlzUXk+wgb7NpYnMEmRJ3PzGSyp5Ysk6tVeP3ayev5V+Oun3+ZoJhS8dW7NkiLeOK+A9mQF5cvz0lZfE+YDUJfACzx8hiWoNTH9vpelmV1OcM9QzGjmq55zxpJMbw76uep78Ir5rpPztIiBzBM0ajwiGCatWGZw9OxkpHmSpoX3QKvZuZPyvmfqjtrV09NFyPdwrTasnE0Q6hOpVJJoGwulYkE5h4J5hYBDwKsC4Wg0rCzFD3m2wfONZ33u+F8E4V9ImvsbCJz1gQsPdJJlZOiaW68eUpZivjG5auOqJI0GK+4+uKtdPZXgeVl9FsGxku2+4T5b8vn752g89nISvVb04XUIofHzc5bz3okci0OggzBaYRqiSLRcGoXUtyhKaZVE+9sDVZmLB+kDLAkJ23suUJ6dEz3W/b86nVxAEUQUMQpnLorWEoVV7amoaZptT5xFgJxUd+s9r/IK7NtUjlScsSqviKmumCSH9ixs7+Bf7aEKWaaWdZJeYiu6rUzSjFfriLJ13ceDp6nQtIy0IWccI6IOpToWgZBWG9jyGYN4gKoW/AT/6j1dHWC8JzagREU11NsZxXMr0nfh2D2vukTJnCUblo2LrFBZspkkapDJSdKBk9w8uanCXcbdTen8/Oxh0UrY3zPdOHWqJPgsbE9QtvBKNLeSRcmiXC612Fxbu0r0u0qc31VSTiJ0kIxOr78yoE69qSkEGKGE8C4loa4j0QnKGhpnND5XuaWktJRuK2sV4gdb3tI/BHAT3fsqZjtCSQuzH49de+2jPBjsB7mhQEsnLozhTlxZTEVMw27/xkHwI9yJVXcZ2PBYVgJAhHYtnhnLj19QzgadoBYIl6XIA6fAOxWgsiRla5qNzQw6zcZejWWfoGTlK9Mr7v02z3/73lhMN1HIcELXPobw14xf0IN0CyLL0jO63BYEZlitJDsWkUzgw707vyiznr47m5UeWBsi4cyVRG6REbMAhHzeiA9qQBjNvdv3p38W89icZ+GgyOGewYJB488TN4u+KYyQwFZS0kQOrzHkcKQSedL9V8UJWOjPvvw5Pxh243zEcNPK980AnkKGAwqIB9IW0NQ/Ee3Cy43v0p8NvOrZt4wTQYZr+wlkuEzp9o/gn7gRbhN3kJvm7uUe4Z7ivki0hhkquDN9Esv4RgaUn0iB+k6x9Bv9JL6G5nukHgu4alFRIt6g0Vp1TndXpDBVVJtMlFnDXl6A4aIH7uLj+zPaUSt5CQIIsIuXHoC8uhKhLz7GGaSM2zIv1stUHSbCLRIIxaSumNhmzk8P4KdhkICqRmXVkWxhSkEhU9LhqpVCQDKxSPUwyCtWKCilAabLJGNAvujqWALv6+/rEbBwLKhqrlhqV+CiVE5NmkBJxQYqpm1E5ViMX9goVuoLqiUVhWJqLLZofHzRAI+fG1CQGoNB1o2jpwBwyijuOiAckMzlh40gKYNNBPBfGc5uSunz0wZcZgdhyMafIAHFwPLZpXoqxNIHhFK6uHoMES+XsdVjF/XRjJ+du55QlL7zLj+vT8D/qTG1ePqe09vV+L58jCJzRFOLPrS2e2NJS9iVsxdsfajxnyO3zdy+uETROkLxiU98/uGJAR4CQ03KzpHm9y455Uegp2CqZ6HKYYHk1PSwambRz/GcGMGr5zncB7h/5L7MNJonHBh0jvzVUTXqB6c0E6lS5iZaH64V6XA5fhQJzYCW1pEUweODMXEsk4SvFg2TcURVp2QYtei//egpuFKNSaojW8cPjU4pFJM7Y0LWKDrleCIeL4fwsJJiU/iYDCsL/DiW7O0kaZalfPtCGWqqkpUbn8WjBfdLz2DLAIIvCBIfiY7UySCykZqKDlRATnMafdUFC6oO5vuQgns8FhtZioeQrtARFIUfw+duJqu7Oi5ogqHMKECfNyq2b6ejooK/AaqV3KaUpkMxk81mRKhrqU25S+lY0uLVzq0DZMCQBBilXZWdG9SELIKsIH5+kIyVkNpz3nsv6KEDKK62b/+IoAgDB6vbHpzIxfBvkjIdRFvWC4HDi2/bsOn2xaGAhG80kByKrXxk9048gvAYISMIr4fqTZ0kyew4ftaMGpvDDn226U9QP0ZPRPP2hA2SZLbYUhbo1ssvMsQ8zsHbLbzVLqJfAHTjHp0rg4e6Lr3xki4ZReJKdsfhnTk5EUbzs5U9hQWN0Hg4mQyPN0tfrS1aWA0kLIR5tN6uALISx377AJbeDs7/dkA8BUmYxFCEOE1SxgdfjjJUGOrgni+dqCL1ubsosh/zOWRPinpPmldZd7kipfK48xXQEZdkWYoVBQK2Kcl8ISYp4OcnqLRI7lFEhC/Tm9gTdLyclxOiosxvkwdEtZAWVVVM5SC5B+ZjWGpQJT6RBcp/Htc4/zLvuqEU0vT59LdNneQVWEaYpAi6wx7oKEkHU6ZKBSww0H7GU5ldy7DQAf/YBCGKeuDRiyhz1RwlVIXA6I6RQGM8gyMU9g1dCrLdOVzXAGAFTYG0AIAcwMVcdxaTzUSxaDqFcnJiIJMLX7hm88e6M9YX3y8oiA+A6DLMv1ynYLK9TFXA2D33JpLJxHdUFYSJYTaRuGpwbQDP07WHJsmFjZ/YoCqqump6VTQaifzkssPl0TYNgEUd+1eW+traweKJ2nuUZyUgGucE5a8EVP0cj34yfOwgF+bKHtKyhxnXqrcbLkcpujJT24WJgpPYDlscIk6GCI4umxU00cdXppjIsxddNNXwAnyDxkyw8VsWBEx03BtOAqgMt87yQqv7C6efdRGBxSBZ0KnKzAhCbp5U2JJXTvCwMcbxbK9j6WIHzRpC8pP4Iea4t325nAYmOZUW+IA5MIGKY4C5WhO5hNBv8gRK1Ydqx6Q+o4sPCxmsUL0IuhVzfrdKl51ubbtMOoKlLUdc1ge39i0TL288Fkkj5xxi7t2y3BrfCoNp+xwLpd0pJlcSb7IvdxMlBE0kmj8/FNfC2kW6A8bN88/HMyoZUm0hgRfchBSUQkkgwXHdYTZp22y82b8EgCX9vfg28Osp8sQjk3sg3DN5BylPuU4kAbNMcJ1NI5TG93bnz44DVTvfKKT6l9xyzjmyLYXiohRR1YgkYgnP8PVhb6D3IYHEdxYx51kmPJFA5ogYtkuFPFXkURsitR0uAbWyXTzuArqGeNKGdTdrGJj5zZRzSwbtYEDWVwxksz0jAZJWZ6atnB2dOzuy9CoI4BQSdBNugmGD5wX3VDOUj8SrifZu1aznJUXQdfDHFW547nToVEZD38CypsBpXIJmGeGKzSQv9VodVIt21KsIHhjhE9eiCmhUM4tpFuEhWfK/zNTdq8DMuFchXRYz8z6cVQdymtrIErsKPKo6/yDL7PsEEV6prHDbR+ESr2aq+5dXj6/Wv7nvVeAsEbQb43jr5YJ4Cv6cUziHI+hXi6j2ifpGhnPhnAfAWm1FCivUW0IgCwwfjIx3fICebIs2VFxjtPcvHwepMHTD6cb3/0UzTY1u6u5vyA6YAdMMvFIj5VrAsgLw8WgbAG3Rs2vu2nA6HT7fwqJz1DrHjJoAmKTM9s24Rfg18D3cD5hrIwKLp6uGs7zs3iXL4qcFjf+MCF6WLem7PP9dqfmbt6lenMVfRMjEhV9h98oyOIj/dXxXEL4rkXfNx19tO2atZ27PhFdkOQpD5nykI+qEfB9PjLbSDBFwbpoPnvoM8Vye4XmoONLHyb03MnvI79AtSKNx4DmuyC3FK/UO7vDx9hDJV5EW/AI1DxXywzSdVagbSJU65WULJFwGVurRgkDsQxWS/KKK7yrQGBJMoEjONEJlCDwYXrTQhsaZCWK+SMB76H4C91TENE8LkD4wb2lcCm9u/LcQM+PvkVBKhO9GgqkKfeadjuwgdMrB+DnAiI/EgpOID8l8WymkCMPbwhnVDKa1WEBfUsTrtYaf3vqWlayD2R9+geNeaEbL5WBI04CR+PVbaSxua7/5wHnDXdvw4oREzZrhwdnjsfh7CuGEIE7sNoyUH1sAX4NbOY6OjDLxHxki7HYpD+Gdo6NLH1k2OrrsEXDdnV5p6SjXjEmYhbNcCre577lWbm3ypu9aMwYafcqyziNLy1FvaSHov+dT/wHQWOqF3l8pKyu62HV/LSsvE3g1CGadTzeDtFHz/UNcjWJ6l0xIs5SFJXue4Yt6qp7os1C5StxzyQ15ET1hWTMIQeIs0IpbRcrHf+zY1FSjGQiLP3gK0xiBpDTzMK5mm8g8x9Qg6J618I2F5WbajGbM1oyHQjg3aitsiRvyEhqyMTzPV7RVg3l2gwBEg/7Ci4lOdRFvhyx+kdoZf7F9AICBxoOtvqHntWTzhveB/nZ3dXs/SMVuIzro22IpfAZ8vr3fvc7PBd7fkhecOIGKLd+8ENO+5V68x1/9ckQYXurXQhUoUqHFMjmXZ7rYLP31Gpma8mJAWKQNjAxoiwT9RTmgyvB1RfvUJtA70dc30es+Tkq9+O+vVLHxeyUAArelcrnUbQGgyeDzshZQvpQnP+vNsx3XyruZdLT30TqfzN7K6lT24SeaBQKy0zQs+qFIc64kXg6Lf8S82H10DO0xgg+Eif0l+aUQ3YGvuVQnBp7VHSfNzqHsMY7K7hS+mAwG38LiUCrFxCKyd3OA+RyCa1LErpI6zs/jqr/i50HMVLj3ylIGYpkbc+KoH2LBHRJvg0IVz6ayAUmPlqO1yiisV8IF0Q9arRbClWqhRijmGJ6bleoY5uUr9RqT3Yew9H5ypXmA1yUeyWYIybFsWMHcvBlUSCguQHxmwYA9aPMXVYYyC865cJGVqMZ10w4PLUiLQjEjK44sKHBqijcjlpbKicIK09Q1LRA3HRERfyB4cs+TNB5LUG3D0jsinJIQactbbbqsmJkED2G7Isir7aiJeFChYUgVWUEQX+BB19FbJEHA4jx4C7g0IkkiNmhBCRYMz7f+bdzegMbuq5h3yHlSwAnGP8hFaTRFlEEwSX5mLKJGZ9ZaNs9w24uI4YhQDSV81R/47qeaU+AWFy4HX1LUugL63MgiQXtJ1jRJqQbDYKDwEplfgtYf+jPRlmMOiTgo3zFvEoD+cU1xt1WtEJ42A+5VR7QAmSz6UKAYdVcX6NTShF4TPE+U4Y1xsm3lBcokLoZw6Z5Vs8BQQUNU3A8z6a7CsuMOlwSqS8xL1Qg9LldoZoOhepi5oUbRdCYPLz29e236c+n1PadfCvMZeqJnffoz3gl3yCJ3FIvd+MjaY7ccgNKT6XW9uASyqWN/5j/nG+zWKfaQcs+2S6C1ix348Yd+vZgc927usndeP+T74ZLIw5ZyKzZs/a+3QVvrOvAO2uOTnlaZbN1dvoq4eYopja8/aZvNttz7TtoP/K5FES20lBuw5WD05K083nLbXI5h4OmQllKckqjXRMRZlOYpZU0EWuZCkUYVEuoEmhGINPxwiMyaufhEKUrU9MQxVvIjE8uDNbhrVIDbJ6LhJenObvxPZIfuPQTvEB5ViH/fOTTasG9dX9dEnMUkAoFEJFbPGhiaBLf5IYuH9wxNbpy7NcaiFcFHFjvOxHYoLRbKL+N/aXYIo3OTqJPGIO6Z6C3tqvmxisYdj8N4dLANZP1ARtA30EaCFBG9scpiGBl9Z+2W4BbQ6F9cdVJzgsoyPK9VosVjGiMaam0K1Cp+lUgFD++dCUfxxwqfn6s5enauvh+P+Fe9yk5TEcyJUxEMTOE6gP6PSrhBneATpZ3NygXn6nQXuRoKPolrxCOIa+TeNE8M83inn8CjXIjGoGCZGFPMkMgQtOgMGcKdSq1nQ7hW+J9foROFptaHw/VaZDjKGql1gq0JjXRqylmarZ0l6wB0joQi97TD5ZXOtmxHKhYPet15XHwqzU4LSHNtPfWRFse3HzodbXY0cEDXD0iJYFuHE7mo3FeZALGY1t7J6ho8PkaV50lYFACk6bL3z3fZpHPkKI2/ZdzJDhKRUyxhrmewPFyt53G12+sRnirEqarN8/zBK3SE9zIzt9a5bAAWGwGaEUk0pQF1tyZsNl7x21geaAbHj2+CHKk6T91taVgu4FaQFZQG6fiRuauAcLse5k29vXiC2FzBCMtntYHFPV2Zts6exSAYOCiHt9gRoJNE9NFcIKIklWggCz/5YdVEKCBLd5A2+jBuLKhg5kgXWLwuEm6/OwzNZBiKsyeI3HWhrhzIkReAVArg1yVz2iFF/xWI5Iwzz1Q0Bb8RvwqoEdXTu9wNL0FnkRgaP5jNi1XkBpdBuGyQbtF+sGywkRlcBvAe/nRwWTO+h8QOJPH8Y61LNZ1zsWBEOdAHphkHUlhUQLedzTJBpguF9IOvg2nGmJAjdh5v8W38676O+scUtzCF5/i7KHo5lurJgwdx59SJZqXsOUoSv39hkGhfPZ9d2smVKM0PROI0yU+GSbpn8mlYzK0MEk0cdactm9QmPUjkq6jEmA/PYo0FxWt09ZskgtYgUwHvf0K64q5v4YluGMFvkCn79SN60DZ+BKEeBMHGBD36MaBH9BYs2fee6BHE/xccpT8nZ70HpOhDjwaNv6c30Jcn534Ijs4/Zt+SUN8+4WNaZFmTeDsfx9c3ZUkgkrlgACrYEMw2LGmiHY3J7oUALOyGT7N9Y9IKhy34uPvPgYz+ezVhQ/W3ZqncjiXkMJzFN7hd7EbwWvfCxv1hC7xmhd3/jQWQb8skxcgrpmkaII55mLBvi57xMIR8rfE7xBGaSwCTF1vz5c5L94PmQQsZhqjbMP7opeJlDx4DLfQl25whCswZzXl2zm/HNhtUSjZt5yRIQw9d3kQakq7+uknUnvbZdjoYTNvTbNfUG8+gCbzCt3E9mF/cfHK9MaiwAmrNtiAQFllsSdhQr1ECRXwfWjLxoZuBox2Wbt4fOvOD0mGiFuaX9sHT+paJ7pbQmrMkd1o661b6kQ44sl0I8aZ6/rgYjSvCVmhJjnr+ciGmG8oI09/C5VTvy19D9L6/HiTIA4PwVRp65D5gm+OkfcY159xZPBPuuFVT1Jj+jKQgYNx5RJN5FJ2mN5BN095EYm+J19cGYm+isQmYbPjZBvwWmPP7imLhbF5iWc/0xBJl0Xo3FesiOkH7UFuthHobj/cvE3FzaPSbphyUicDNkTSK7CPH07ilIvz4H5n9AHc2yaZ6cF1o3UESVoVuORA6dDOy/8HCjUWgpPityJRCyvnLxVhMEbar5jhY0g8juoM73LUimOYS3ThpQ9pscC8eBfjSdNDwVOVHyHuO7H8/hO/ff0Rz3C+z9gtEW9pPjeqzeAzSsTODptAezB92cTVuGW47DvjCK54pRRJJOVyulWi2tDTwfOkyXlIC1JLAsTWZYytDDqZbkIXBoc0CULSvu8skHaoA7uobBvwLd975Aj/2HBsX7lFPv98Cbwta4Y5fPSKqdxskYZ4gG3fzkvCJvitX4gfgx2x6P/5mXPtnSLs/47W3beLZOIdtS2XJe9BeXOcM5oi7m3G4HKj7PkAnqGsNi/DlakUQpWolTDK0E+iNMjiJ2D/Pif/NzRDkYo0vCJowr8ZwLLs+su9tbtno0diA+9IUlNFmkGWEgGwfupx9M8tEzJK70BaA4hFB4u+OqqDZBAPvXe01wU0/uF7/t1kQ/8Ergjz7ByTAI40B74FkC944GS62xwthev41zAsRH/luikdyPD4omzCkq6lkLbR4T4KTJo7b11hC0ASqXfB5um/U5voJ7mrQjoJkPrvfwXOGThzTBtkWcgmPgnqHy3lP4TrqDzT72hszIMto5Hns0McVm4KNZu7pudoM1Sr1KJMsvaXK/9byScqIcxHTFwkKfPPXgijQb7nZpR8PKDE6SRk2CCzD9fh+dMcdkFbgqq6qy7MPnZ63a/pRse/uob2w6eRfHhKJFFegeUTLTcXgSUyd88yeJ66Pamh/wGVVfEs1CcIDXqCm/8dVbLRrNroTAf5OZGvwKtJju05caWne2Oufy6j7t6IzgJfd3kPIiBAlWrG1ynMG4EqrBfi4IalikrqEjsPnTbsx1aQifVddBdMtA/HvvNFJDlsG7nHjs3E/vUZ/iMkao0j4qc9cNevRuHk77q/bgATiLVQule0aQTIWiKF2nvqPpmbH/UasSVJQwl8KxPm+CsV7iQYQs5bjjioIDyuOPLd2knc63iwh8erzXyQJohOunyyIDszMf60ivc2JkQf3nUQ3OXvMNyD8WeV/3ucuP5la0Y9du5/myF7FLGrHZf+Aw5VaSWIgKa3jw0+6fqyNBQ+AO2fUWEg95L5C+7JySA2m5BmAJEBNz42jtPsYTSFj+6jXtVm8twH+cSimHsbXDpOnPAigHP2Vx5LAOe5knP2oMc32+Jynz3wOXYuGOYsb4VbgVXcrd4C7guPqJKhILLDYc6KxKkpiqRoRJVyF+uBQlXpkUY41UqsTrOoxWKvWSHogUSr6CtB6s+BHPBBnMMzPkTh9ql8rknBnYvUnQn0QP7RQOoqlzz4e7ajVh5bnY6VesD5b7rGDWmnzZAEBE4l4JVu/OBJIy0SShgLmfRZVVqxzd4NUTzrdkzoDRAuxWCF6kxky8Z/7dKk9vkVXohAsaV9XevA1eHnZ/VzU0pJKaoGlVF8LC5qmTilFudjBx1L5CwYcMHxGpR2gylJNxRwS0GNyMNa1AEvEMQJrCKGJQHVs443V9394TwS/MZ2+Jxgl79ytkhfiGbb0koEeB3YsAuATeOn4wdu97oq26KKgaOtp5yxwV49p817bE7lgOeYUN3HbuL3c33F3co80Y6nDIampgxQl6kDBYgb8pvfihYn75SjwYZ0gg3jyAk9oMLLjW8jqTB+QxzwijR3DtzDQAC9XcChSxcdV0csbzDD1amUFX6yWiUaBvZzFNePhgbbLyRAvLUortrJsG+TRwlEsuTla35ZOieR3gpjpGu5wHC0ix2Iw1xjRJMlx+OduCxbjUcHU7e7QY//Gh2OCJfNStxdudgbzRHkFdMqBcpfpXoHHMw9RbqUmqiJCuoPJjSTH13e1LUmUZZi5Gky5f+DhJpRZlcHT35JEAUGx09gGNHiRyptJ9dT3rB6FAG5arEaUOAEZAjAcQQFBMgTHyfYAIPKy1rNnYOUV7rQcU0uTpduf4zGdM+NRAiUk/Ovj/Vt7JQXTFRbgcqXnq3sq7A11xgTHtfBA1JIaFCDs7M+VA/hXvKVi+Vy1hWAWJFLDhxX1bPC8q/IADryZBYagCLGiIkUsLGUOhEcoXXkCPYT2cinuFIYHQZBrpULJQ2kmTjN8PdJe94zg3cBPfnpM3gZ/P99RPwyfyAwCkMseGFsysjubA7A/9e5p3D/ZCy8EOR2870uURDBCgbn4Fj/88W2EvGzaRPwMp+DyzCl91VxGJxXOLRzYlF744kUvbVWUrS9d8vVXsASQxf+Wk6csx0/J4n/OFvLD9euJsX+n3vRjQDPwDUznuSIoFQYG81IAEKRqTCZHwTC6050J5fOhzzyiAhMLaGRZmoHZdNp9033LzJM1Kt+0X99PdYdRGsVCIJiSxHtoYJCCgEiiAnJoqjFO5Bv18U/LKTMfAlMqHvfuFe4MnMUXMLeiA8e005jK5s08PKNx1Fv/Pofp4kHMkV9zov7wkNTKdEZGKzStoIfBQedORCyLhOzVqUu0AcKs9/DCwFB0vIUj7KemOWEWvaq/h0dS/ZD03vjIol249/gNmQBRSnQOAKCg4Jr+5ZXTggIPBnskAfHmrtt5+NBXvvIQXDpCnYxXrtdBjnX09R8jHYF7E68U21p7GffbeMsYgJNp3NH5jA6hmsktXHYgqqBQUiqua4s50BABkKyAEkmvbRctyQzkH7/64n0A7Lt4zY016hg9NnM6GxWXfm0fiUlev5441W51vEHBRog3XPSmHXMar/1Brr3Ja5HIViFSLxJxiISqS0KRJBNt+tkJ72QmEM/NlogVZq01A+BMUQQ7Ayao9Wim+wn3E2bUN+G6R1uiKQiq1LygFODE1DXraVQKIsgAU5oNxyH+s7Wpzpr7AwWNjpKUolkPX+Co+SsPR8hraHYwqcYcmQRMJNQ1jPdx8VrAUbtinsgH9YJPtp08hXGv1yo854QkCpWBpWHIgeYFqu1nF6p94C3fargzX9BN5OhtbXit3CpBYCcdTKsk933uz9oLuiGEjHTmxs9i4cxIhpHIv76JGQvhhxByEjbmQNxHXLcjbDjI1i0nC9LgSvffJRROGFBAn70xndbDgmHkC4Q3YvP6ecq/cSzIJRTxZgP1nEWzgR/cZUUdoz68ZCoR4UE4HQHPffR1DYQzYcBHEmeMVuqGE23Gjd6DnzWOD2oEnFCiXqZ0ZYvmyRysG17YKIldyhOFHqyHIwaM5mp9kHrl0sAHdHo0zq/cgieAdmEObFnJx2PiqJ346EqYAWAJZi/xBvHlaCi5fwyIGSSDc2WUEQFqgys/mrCXwIerUzxf5Q1JMvCOn6pecsUFmxHoKsOwHqxAYciIOIXsojbjEkCSYdDNC+UugDZfcMUlTb0Y4WtjmL/awX2Ee4K1T95D/mDWReplgdfbEMsWJtLQXkxAqEPxKOoHc4s/8cWnfBk5ifueNBAu4CbA1Akxu4AnhhFrCfOqr9WjQ5FKlKSa9xguEn5h0ojEKKVRxeE6w2TxA45IUlUCN42ZfgLvOHLBQPuC0ILFuGikTXFoY9tZl4/19cS3W1p7BC/3hyAvt2miZQdUJYaEkXjnYkFsw6RGnhwYVxUkhC7TM+aDr7v/LUFBtgQ9VXfKuX8VkJyrJlRJ0M2iaSga4mHWCsUyNTwsewuWJFysRNRJOykFwqXeCczg20U7abjfSxv9WS2qGB1GshwNLCtAxdbCGtG2Y+a9LekMxkY/upnkZUC5yOJvXr3y6iG9SxFEskwfkCwYsyVBUMx1WaSX9GhvSh1aJCFpU7Yg2GpIjAsC/3rj19mFIUEW9UQs5gDMqWq1MQHy1r7xEJ5WmBNM6LquZJHqqJZkCZMSr6zX4rKqRWLVAiazfCC0cP2GseouQ0CCtjDWPQhgSLfQ5i4ImO6frDPfRg+gQeo7REYFiQgr4NVDEgkIDGGWK6VatF5rgj55Ys/9gyFo/LDvRuHsJ0Y1GDx85ZrAP4/eLJz36OIAtPe535vYDsD2iQkCnwTTpxZRQLvPfjJ/IMSjR296jw4ftZ/InxlE/BeeIXexe7fPYZnNUiwzlnqRYplVaMgFzcpIRdZs483/IHyB+zPiYpEm8Q1B5RfQMm0HzPyCrC7uURVfPioI+K5fEKmS6RJIzr0sN8xNcKtpRkxviftb6nBPwvK04scFrFYrUoujMeKuJwvMTbGPHmqGnkJTp4j7j14svvcBqhZfd1HUfZx64+yCV+zWdl8Br26RrftnZ6f9cFbgQA7XYO+VsKkaN8KtIPzg9FX4OsXh/xl1PsYb3ZmdnvIFara+3YjG6Pq2EVN3ys/XmiEFfsJBiuw2Opf0hUFe4ymdJ1SO+ORIRMRiDLrvdo2baYZ8pSbfNiFoqi5gjv20T8LPBh7booCAklRW/p2sO3Z/1ckrTmVH58IJACVDRgK/esHmPY6SD1f6rj81jb80feoN1xMGGaWXk/Q0alzdXEB8+2ZcUJTlWQRsQ7cf2/HyaY7lHBwGxNkOiMP784APnvbyjrU7VGZeUHc0/eJ+Rv0LxykO7QljiCMM9qn4/xeiGa8KhgQ5M8BDezfo/78PXmapgow5el1ec578/xWojM2/a+E/cWEP64/kTye6gjGyTFDMvwvdaSsHvoX/gRwFFATTBrgbiGrQueAWvGn8wQkyOEEgKnnf9+1reN71YBl/CbfG0zJTDosNKZoUdNiPUcUNX/GKmLVizkueipUsQHiISk6hRTcvtB6gKXcg2w9eIIo3EDT2IS8mDe5jBcz6oVrjaaq3Eg63qybuZOf8Vg/F/zof79nRwBjKgt789n0Alte4zxhBXhKYI4sg8RYrWbYJ93XU3WtJjw6M6zwUAqa7yX/AMVtPz3QfXY8zeC4u4pZi2QGvtF6eGy/QRZTKc14ozOwE6GKdQf6UreMTIFIX8+UIenobllIPyHD3clA9rQq687sICYRH5VTQJaTDfQNf5SGedddP2at2rrKLK9KNBh43KJ2OTcTSta0AKk/vufqDUaurWu2yjPwWQl0b43gLP0P1dt/b87SCl0hVXRCpjIxUpLAKfhGruX2Az+d53458K1qI1nk+NutxvYZxbeh8G6o5LWWBlWkEc52hjxl0tTcAFaJsEg8/RDwKbC8jEo3eOtdKZVMmAPlKDrQUj5CyRYpLQDYpP75lcjFoz4THNo9F2gqFtgguhDPt/YNbzwCldNua02uClbLwXzyfh//eLNbtpGUlbVyK52rWQ1eGw13ddnjNpoGBTWvCkPNL7jfDRmz97ujG07rMpR425DSmq8PcKm4vReYoz5nLif9qgTirFjCfV6hTI5wHZ4tlYkp+RgGJIyRa937iQs5wIisSiVwJ+8nDfUA3loYYT8MoyZlEsouW0VUVuZLXSQ/pmEL03i0ZQm2mFjDv7kW2xs7nK3JtAN8F3sKlLLzG1fFC1HUzvul5cvfNCWS7g8vpurFEtQUoKl+UQvLzmio6r2xR9GldAV3/kS8DLCsZ2guysGmTCV7QDEJBuvJvam8WO/D+11B2/4gvbzKALGx+RdGhFwmjK5idmeb5aTHk6JcuRJY6O4u/lNGF19HDqIz50kFuBc3JeoggH9N0TzT3JUVPiEZCFNoO5emOIfmxwI5heuuxuSOpDdPDC2BYAnOREtI8hIstG9deks3lspes3fjYhnWsuG7DlrUTS89KptPJs5ZOfGRi2f5UOp3av2zigsVmzFxs4P8exf9++YhmWRrZqM1S0r2EFMEH8bZEH/XYsS9AoVRq/mM/gl+WSn33q7ZlW1/VQhr+OwVYMQv/XY7/AVL+EDtmcsnt6NfoYppvWWTYfcTvhnrelPz/66U6dZclK3lTBIqgXwGeT4ROWdw/tGPn0mV9O3pXD5YsTZTwIgpkKdxxQaU2Nj1eGTpt44JVwaAYANeNjW3dPHJKxJIMiBdbw4gs6F/U2b14cX//+nXLxy/sdmSFx7yklIlsWlCpn8GZTWw1k9rgF3IrPfTnq7hbuXu5x7lnuFe4N3Avnzhj5WIP7rcAWu3yldaDcuuBdNKD+Yb9AjvyzXXO33i7dMz9f+trj70fTM9PkulHzBk+zO2FbGew3Yfm7byT7nd9sODg0EmeNt68A/z2b96SbV6luzHvBhKOd3QOmHgOkrrl5PgcmNnMXBFwQYMlQKWnm9DG4yd9UQsA8vQ7ucnHin6KyvQhPJ56MR+3n7uSeJpT/RrBj68z4pgn0dz1DKL6fBKegaVw76xDrIIS9S8v96FyyUMKKPfBQr6JmukZEmssnryMaBgZvtDyQFgGvyt2SbxjSVrA4PX1qyQzKgbtzq6JPktBQVvU8elAeOnuhZIZkYIW5jGUbFENajImiqWVSwZsKEpLYzkzqqkxJxBJ2WdLfNf2+uWTpcnC0rVCe0rLjfAreEQea40fXh3Tvaeitk8/DH4uj5esFA8k1Vp9sQ2CbSl0tdy/8pROO4lPKtai8/aOa8DOJnn3XFVsV8KENzpt974hSUdJtf2UNSnHETT+jMOJ79+++T3dsQjqlfJt0ZKW64bwDPo8Y9W5Vy21Ugizc9Y/AbPsyYhv0fgomyKVDWVguDU+xlvSMJ/WEmG6GNgsS3MFjVjpiNaTa9zQ3tPdDh6xTNOqgwWWrls/tDTNwr+3DMNCmhZO243353v7C/A9bf2NXWbcggg8a0Ut/OcuFay4SfGLOXQIATweipibXM/t4c7mLuFu4m7GXxaiK8MoHCa0ME8pYygD6QlIDx1yWGNLBz7FqGe05R5YD3nZfGoMI8BAntGCprvyNWLl+XfR/BRhUHKy0fBAT97y9rL0sJkulosp00yVyu1pSdluxHLFrCGqSNRjeVqC4m8C4XRbOhygu5D2z6ocSupxxVEVvI8F1d35/ny+31ZkCcSIZSn2LpIxStR4xd/DD8a687ISzHX3s3049qdQ87WGkXYs981gLq7pWMSQrPZ8TDdIyT7bSkUCeBji15PmXzf3WjUIgBqM3RPL5wfywFLCdwSj0fZY7IzW9/KCZDK+74/87Sjo8X1kZSplJdGibqGQ8HS+55RD1mkClOqXvfP8rt2NvqlKZQq+OjUMGu8HTjoUSoWfSnenAcCb20P4OB2CP6pUTm387tRhUN0MNfcWkjbtdbJxfx9JpyNgCdm6vzcdx3ydbLj/F1knyIsAAHicY2BkYGAAYrv7dnrx/DZfGbhZGEDghsO8jQj6fy/LJOYSIJeDgQkkCgAjQAqrAHicY2BkYGBu+N/AEMOqxAAELJMYGBlQAKM6AFVxA0YAeJxjYWBgYBnFo3gUj+JBhFmVGBgArlwEwAAAAAAAAAAAfACqAOABTAHAAfoCWgKuAuQDSAP0BDQEhgTIBR4FVgWgBegGygb6Bz4HZAemCAIIUAjcCSwJpAnWCjQKpgsyC3QLzAxEDOINkA4ADm4PBg+iD8YQfBFCEeQSEhKUE8YUIBSQFRAVlhYiFmIW+Bc4F4gX3BgKGG4YnBj6GaYaEhqwG1gb1hxEHLIdAB10HbIeMh76H4If7iBYILIhcCH2IlYivCNUI/YkbCWQJlwm+idAJ3Yn0igAKEAolijEKTgpxCnqKqArPCv2LLIs/C00LYItvC4ULnAu4C84L6Iv9DB+MOQxXDIsMy4zqjQYNEo09jU4NhY2cDbQNz43+DhgOKA5BDk8OcA6TjrOOyg7rjwOPIA9Aj2kPgg+gD7YPyY/eD/6QKBBbkG4QlpCsEMKQ45D5EQ4RH5E1kWMRj5Gzkc0R8BIekjySZhJ7koeSnxKxks8S9RMFEy4TOpNSE3iTyJPiFAqUJZRDlFgUdxSRFLeU0hT3lREVOBVVFX8VixWSlZ0VqxXFFfOWBpYeFjsWbZaBFpGWpRa3lscW1pbiFwUXL5c1l0wXYpd7F6YXwZfVF+uYDZg4mHGYjBjUGRsZMplZmXwZmRnEmdsZ9ZoMGhKaGRonGk8aVhpmGn8alZqzms6a/JsamzWbY5uKm6abyBvzm/scBxwvnEMcYByAnKecxhzpnQOdGp05HVmdaB18nZadxh4HniUeLh45nmeeh56gHqmewx8GnxifJB9Dn2IfiJ+TH7Uf0B/uoBYgPKBQoJqgyyDcoQ8hIp4nGNgZGBgVGe4x8DPAAJMQMwFhAwM/8F8BgAjigIsAHicZY9NTsMwEIVf+gekEqqoYIfkBWIBKP0Rq25YVGr3XXTfpk6bKokjx63UA3AejsAJOALcgDvwSCebNpbH37x5Y08A3OAHHo7fLfeRPVwyO3INF7gXrlN/EG6QX4SbaONVuEX9TdjHM6bCbXRheYPXuGL2hHdhDx18CNdwjU/hOvUv4Qb5W7iJO/wKt9Dx6sI+5l5XuI1HL/bHVi+cXqnlQcWhySKTOb+CmV7vkoWt0uqca1vEJlODoF9JU51pW91T7NdD5yIVWZOqCas6SYzKrdnq0AUb5/JRrxeJHoQm5Vhj/rbGAo5xBYUlDowxQhhkiMro6DtVZvSvsUPCXntWPc3ndFsU1P9zhQEC9M9cU7qy0nk6T4E9XxtSdXQrbsuelDSRXs1JErJCXta2VELqATZlV44RelzRiT8oZ0j/AAlabsgAAAB4nG1WBZTruBWdqxiTzMyH3b/MWNi2u2VmZuZOZVtJtLEtjyQnM1tmZmZmZmZmZmZm5grsyd+ezjkT3SfJ0tN99z1pjaz5v+Ha//3DWSAYIECICDESpBhihDHWsYFN7MN+HMBBHIEjcQhH4Wgcg2NxHI7HCTgRJ+FknIJTcRpOxxk406x1Ni6Ci+JiuDjOwSVwSVwK5+I8XBqXwWVxOVweV8AVcSVcGVfBVXE1XB3XwDVxLVwb18F1cT1cHzfADXEj3Bg3wU1xM9wct8AtcSvcGrfBbXE73B53wB1xJ9wZd8FdcTds4e6gyJCjAMMEU8zAcT7mKFGhhkCDbUgoaLRYYIkd7OIC3AP3xL1wb9wH98X9cH88AA/Eg/BgPAQPxcPwcDwCj8Sj8Gg8Bo/F4/B4PAFPxJPwZDwFT8XT8HQ8A8/Es/BsPAfPxfPwfLwAL8SL8GK8BC/Fy/ByvAKvxKvwarwGr8Xr8Hq8AW/Em/BmvAVvxdvwdrwD78S78G68B+/F+/B+fAAfxIfwYXwEH8XH8HF8Ap/Ep/BpfAafxefweXwBX8SX8GV8BV/F1/B1fAPfxLfwbXwH38X38H38AD/Ej/Bj/AQ/xc/wc/wCv8Sv8Gv8Br/F7/B7/AF/xJ/wZ/wFf8Xf8Hf8A//Ev/Bv/IesERBCBiQgIYlITBKSkiEZkTFZJxtkk+wj+8kBcpAcQY4kh8hR5GhyDDmWHEeOJyeQE8lJ5GRyCjmVnEZOJ2eQM8lZ5Oy1IW0ayXJONQvzGcvnYV4KxQJWcB2ySpzP0wldCDnhZRk6FJeCFryejkuRU81FbYeS3gibmajZhhRtXbj17OhwZXYjdo/DRqzpRySfzvRqxJmRYlTms0DTHZ5oXrkvAwuitp6IskiWVDo3AguGOa2YpNaOPBzloqpY7daNO5yUfO4XsmBfLTSf8NWBxod3hEIWTCaKdltbEBes5AvTyxa0bA19g4buBorVRaBmook0z+dMBxnN50lOVU4LppKCq1yYj8yeSgeVkCwwI3WimNaGUjXebpna47Q3Erug23giZDVoeB4ZSzOZToTQjeS1HmjRJE1bloVY1pEFbRM68mLJJpKp2cjuRg2jghdD4zvT7iyRGTY8BzmVOtqWuSiY6ap4XUR+UtxIYSayYCYqlthpjp7+JM5RO+S4rZhSdMpGtCjMnioTYm6OWpsfkc9NsGwzWPAmXDKeiYTmmi+43l2fSG6IM1/ZVdI9a+zRhFaiVZE3wqkQhUqVcS635MRspynN0YyfzLCvN9V2S42ie+1F3h4d1h06aY3db7dn0hsD83/oQmIQMuNuzqjbqYtEWQRTo4NUsqKhNtbrez45LhSveEnlxirB3EbcrOhWsGBkVjeSdcvHHR5bL6mc+um9ERvWDPlFuBA8Z6n7dU71FJnMDJbG61CZ+SxaulGyZGlpVUBbLUYO+fP4XhdJnyJSaFsCXHecUSeEzUlJ1cx1+Qxd2aJh9dCnpZVyrJhcGI8CJaQOnAYrkRnVDH3jDpyLZnc9NzxrO8FFes8aWsr9iSIPR22jNPUsxB1OMprturUsSDNp9OwKk0Mb+cyyUhvhuQKyMkfGfT1jyue/x+PcpIORn6e5N6IJq2jJkjnbzYShO7BWXLOlnTUwrUsycyCdWuAyLDGbO6kFFgwyWqSeUyOlcCLyVg27IJk563tD7gsjDpU2lPvaFDoUmwR3kekyl0oploYqo72S1SqpqPTbWTDqZN/lcsNoGdIya6thw0TjmY88HHVB6qdSLgOb2UOPXUA0FTuciqY1AuI7vF6nWpvVO02ne5arqB37cYfXbdvWJp+72HZWYLgtTOUobVLLQd7qsKJTno9tbezVnzQl9aFVRlyxibZj3LTh1ORmM6AmovaDrirNhDvywLRBI5QNQsFFJnZSl8lOgm1jr6p0KbnPvdChcT/TM97W+czmzJyZerwwCqYTNu4Lkz+I7OQaOpS6AuRyryt3Dndl0s1T1oWRakSt/M0Zd9gIObM1MF4y16ZL1tYeubvWzt3wyKaaU4FDWevJ0WxHD70DNuPTqlVeLJse7RUrW9CLfVpyWk9L1ifcRt/RuvvkgOPKqtla59gENYWt1qHm2ukiFz46kYfrdlGXF56Y3krsvdTlOK83V7OcO8Ocy7xTooebK1W5GQf/x3a+rfr698fGhbsi56VKed69SIJJ67KCl534bWkaO7a6DE56I61YQUsXLIcS0+djakEnrrjDgW3TBS+Yq9yhQwHb4TpRc+4fHhaMK/P02c28dEeteeEYf3z98jjpJ2zsXRpbLsaqzVQueeNu++4050ZTrmdtFk1LkVEzp3sjuA9sJmz1t7m5l+xta3JwvX+MuGWHLnMc3G/Ta6u7Yfye3fvFGQd8zd3y9G/1b415YErR3FzW9QU8ZmXJG8XibbllL4e4MEqatTTg+crn8waZrtfW/gthnmJTAAAA') format('woff'),
-		url('//at.alicdn.com/t/font_533566_yfq2d9wdij.ttf?t=1545239985831') format('truetype'),
-		/* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
-		url('//at.alicdn.com/t/font_533566_yfq2d9wdij.svg?t=1545239985831#cuIconfont') format('svg');
-	/* iOS 4.1- */
-}
-
-.cuIcon-appreciate:before {
-	content: "\e644";
-}
-
-.cuIcon-check:before {
-	content: "\e645";
-}
-
-.cuIcon-close:before {
-	content: "\e646";
-}
-
-.cuIcon-edit:before {
-	content: "\e649";
-}
-
-.cuIcon-emoji:before {
-	content: "\e64a";
-}
-
-.cuIcon-favorfill:before {
-	content: "\e64b";
-}
-
-.cuIcon-favor:before {
-	content: "\e64c";
-}
-
-.cuIcon-loading:before {
-	content: "\e64f";
-}
-
-.cuIcon-locationfill:before {
-	content: "\e650";
-}
-
-.cuIcon-location:before {
-	content: "\e651";
-}
-
-.cuIcon-phone:before {
-	content: "\e652";
-}
-
-.cuIcon-roundcheckfill:before {
-	content: "\e656";
-}
-
-.cuIcon-roundcheck:before {
-	content: "\e657";
-}
-
-.cuIcon-roundclosefill:before {
-	content: "\e658";
-}
-
-.cuIcon-roundclose:before {
-	content: "\e659";
-}
-
-.cuIcon-roundrightfill:before {
-	content: "\e65a";
-}
-
-.cuIcon-roundright:before {
-	content: "\e65b";
-}
-
-.cuIcon-search:before {
-	content: "\e65c";
-}
-
-.cuIcon-taxi:before {
-	content: "\e65d";
-}
-
-.cuIcon-timefill:before {
-	content: "\e65e";
-}
-
-.cuIcon-time:before {
-	content: "\e65f";
-}
-
-.cuIcon-unfold:before {
-	content: "\e661";
-}
-
-.cuIcon-warnfill:before {
-	content: "\e662";
-}
-
-.cuIcon-warn:before {
-	content: "\e663";
-}
-
-.cuIcon-camerafill:before {
-	content: "\e664";
-}
-
-.cuIcon-camera:before {
-	content: "\e665";
-}
-
-.cuIcon-commentfill:before {
-	content: "\e666";
-}
-
-.cuIcon-comment:before {
-	content: "\e667";
-}
-
-.cuIcon-likefill:before {
-	content: "\e668";
-}
-
-.cuIcon-like:before {
-	content: "\e669";
-}
-
-.cuIcon-notificationfill:before {
-	content: "\e66a";
-}
-
-.cuIcon-notification:before {
-	content: "\e66b";
-}
-
-.cuIcon-order:before {
-	content: "\e66c";
-}
-
-.cuIcon-samefill:before {
-	content: "\e66d";
-}
-
-.cuIcon-same:before {
-	content: "\e66e";
-}
-
-.cuIcon-deliver:before {
-	content: "\e671";
-}
-
-.cuIcon-evaluate:before {
-	content: "\e672";
-}
-
-.cuIcon-pay:before {
-	content: "\e673";
-}
-
-.cuIcon-send:before {
-	content: "\e675";
-}
-
-.cuIcon-shop:before {
-	content: "\e676";
-}
-
-.cuIcon-ticket:before {
-	content: "\e677";
-}
-
-.cuIcon-back:before {
-	content: "\e679";
-}
-
-.cuIcon-cascades:before {
-	content: "\e67c";
-}
-
-.cuIcon-discover:before {
-	content: "\e67e";
-}
-
-.cuIcon-list:before {
-	content: "\e682";
-}
-
-.cuIcon-more:before {
-	content: "\e684";
-}
-
-.cuIcon-scan:before {
-	content: "\e689";
-}
-
-.cuIcon-settings:before {
-	content: "\e68a";
-}
-
-.cuIcon-questionfill:before {
-	content: "\e690";
-}
-
-.cuIcon-question:before {
-	content: "\e691";
-}
-
-.cuIcon-shopfill:before {
-	content: "\e697";
-}
-
-.cuIcon-form:before {
-	content: "\e699";
-}
-
-.cuIcon-pic:before {
-	content: "\e69b";
-}
-
-.cuIcon-filter:before {
-	content: "\e69c";
-}
-
-.cuIcon-footprint:before {
-	content: "\e69d";
-}
-
-.cuIcon-top:before {
-	content: "\e69e";
-}
-
-.cuIcon-pulldown:before {
-	content: "\e69f";
-}
-
-.cuIcon-pullup:before {
-	content: "\e6a0";
-}
-
-.cuIcon-right:before {
-	content: "\e6a3";
-}
-
-.cuIcon-refresh:before {
-	content: "\e6a4";
-}
-
-.cuIcon-moreandroid:before {
-	content: "\e6a5";
-}
-
-.cuIcon-deletefill:before {
-	content: "\e6a6";
-}
-
-.cuIcon-refund:before {
-	content: "\e6ac";
-}
-
-.cuIcon-cart:before {
-	content: "\e6af";
-}
-
-.cuIcon-qrcode:before {
-	content: "\e6b0";
-}
-
-.cuIcon-remind:before {
-	content: "\e6b2";
-}
-
-.cuIcon-delete:before {
-	content: "\e6b4";
-}
-
-.cuIcon-profile:before {
-	content: "\e6b7";
-}
-
-.cuIcon-home:before {
-	content: "\e6b8";
-}
-
-.cuIcon-cartfill:before {
-	content: "\e6b9";
-}
-
-.cuIcon-discoverfill:before {
-	content: "\e6ba";
-}
-
-.cuIcon-homefill:before {
-	content: "\e6bb";
-}
-
-.cuIcon-message:before {
-	content: "\e6bc";
-}
-
-.cuIcon-addressbook:before {
-	content: "\e6bd";
-}
-
-.cuIcon-link:before {
-	content: "\e6bf";
-}
-
-.cuIcon-lock:before {
-	content: "\e6c0";
-}
-
-.cuIcon-unlock:before {
-	content: "\e6c2";
-}
-
-.cuIcon-vip:before {
-	content: "\e6c3";
-}
-
-.cuIcon-weibo:before {
-	content: "\e6c4";
-}
-
-.cuIcon-activity:before {
-	content: "\e6c5";
-}
-
-.cuIcon-friendaddfill:before {
-	content: "\e6c9";
-}
-
-.cuIcon-friendadd:before {
-	content: "\e6ca";
-}
-
-.cuIcon-friendfamous:before {
-	content: "\e6cb";
-}
-
-.cuIcon-friend:before {
-	content: "\e6cc";
-}
-
-.cuIcon-goods:before {
-	content: "\e6cd";
-}
-
-.cuIcon-selection:before {
-	content: "\e6ce";
-}
-
-.cuIcon-explore:before {
-	content: "\e6d2";
-}
-
-.cuIcon-present:before {
-	content: "\e6d3";
-}
-
-.cuIcon-squarecheckfill:before {
-	content: "\e6d4";
-}
-
-.cuIcon-square:before {
-	content: "\e6d5";
-}
-
-.cuIcon-squarecheck:before {
-	content: "\e6d6";
-}
-
-.cuIcon-round:before {
-	content: "\e6d7";
-}
-
-.cuIcon-roundaddfill:before {
-	content: "\e6d8";
-}
-
-.cuIcon-roundadd:before {
-	content: "\e6d9";
-}
-
-.cuIcon-add:before {
-	content: "\e6da";
-}
-
-.cuIcon-notificationforbidfill:before {
-	content: "\e6db";
-}
-
-.cuIcon-explorefill:before {
-	content: "\e6dd";
-}
-
-.cuIcon-fold:before {
-	content: "\e6de";
-}
-
-.cuIcon-game:before {
-	content: "\e6df";
-}
-
-.cuIcon-redpacket:before {
-	content: "\e6e0";
-}
-
-.cuIcon-selectionfill:before {
-	content: "\e6e1";
-}
-
-.cuIcon-similar:before {
-	content: "\e6e2";
-}
-
-.cuIcon-appreciatefill:before {
-	content: "\e6e3";
-}
-
-.cuIcon-infofill:before {
-	content: "\e6e4";
-}
-
-.cuIcon-info:before {
-	content: "\e6e5";
-}
-
-.cuIcon-forwardfill:before {
-	content: "\e6ea";
-}
-
-.cuIcon-forward:before {
-	content: "\e6eb";
-}
-
-.cuIcon-rechargefill:before {
-	content: "\e6ec";
-}
-
-.cuIcon-recharge:before {
-	content: "\e6ed";
-}
-
-.cuIcon-vipcard:before {
-	content: "\e6ee";
-}
-
-.cuIcon-voice:before {
-	content: "\e6ef";
-}
-
-.cuIcon-voicefill:before {
-	content: "\e6f0";
-}
-
-.cuIcon-friendfavor:before {
-	content: "\e6f1";
-}
-
-.cuIcon-wifi:before {
-	content: "\e6f2";
-}
-
-.cuIcon-share:before {
-	content: "\e6f3";
-}
-
-.cuIcon-wefill:before {
-	content: "\e6f4";
-}
-
-.cuIcon-we:before {
-	content: "\e6f5";
-}
-
-.cuIcon-lightauto:before {
-	content: "\e6f6";
-}
-
-.cuIcon-lightforbid:before {
-	content: "\e6f7";
-}
-
-.cuIcon-lightfill:before {
-	content: "\e6f8";
-}
-
-.cuIcon-camerarotate:before {
-	content: "\e6f9";
-}
-
-.cuIcon-light:before {
-	content: "\e6fa";
-}
-
-.cuIcon-barcode:before {
-	content: "\e6fb";
-}
-
-.cuIcon-flashlightclose:before {
-	content: "\e6fc";
-}
-
-.cuIcon-flashlightopen:before {
-	content: "\e6fd";
-}
-
-.cuIcon-searchlist:before {
-	content: "\e6fe";
-}
-
-.cuIcon-service:before {
-	content: "\e6ff";
-}
-
-.cuIcon-sort:before {
-	content: "\e700";
-}
-
-.cuIcon-down:before {
-	content: "\e703";
-}
-
-.cuIcon-mobile:before {
-	content: "\e704";
-}
-
-.cuIcon-mobilefill:before {
-	content: "\e705";
-}
-
-.cuIcon-copy:before {
-	content: "\e706";
-}
-
-.cuIcon-countdownfill:before {
-	content: "\e707";
-}
-
-.cuIcon-countdown:before {
-	content: "\e708";
-}
-
-.cuIcon-noticefill:before {
-	content: "\e709";
-}
-
-.cuIcon-notice:before {
-	content: "\e70a";
-}
-
-.cuIcon-upstagefill:before {
-	content: "\e70e";
-}
-
-.cuIcon-upstage:before {
-	content: "\e70f";
-}
-
-.cuIcon-babyfill:before {
-	content: "\e710";
-}
-
-.cuIcon-baby:before {
-	content: "\e711";
-}
-
-.cuIcon-brandfill:before {
-	content: "\e712";
-}
-
-.cuIcon-brand:before {
-	content: "\e713";
-}
-
-.cuIcon-choicenessfill:before {
-	content: "\e714";
-}
-
-.cuIcon-choiceness:before {
-	content: "\e715";
-}
-
-.cuIcon-clothesfill:before {
-	content: "\e716";
-}
-
-.cuIcon-clothes:before {
-	content: "\e717";
-}
-
-.cuIcon-creativefill:before {
-	content: "\e718";
-}
-
-.cuIcon-creative:before {
-	content: "\e719";
-}
-
-.cuIcon-female:before {
-	content: "\e71a";
-}
-
-.cuIcon-keyboard:before {
-	content: "\e71b";
-}
-
-.cuIcon-male:before {
-	content: "\e71c";
-}
-
-.cuIcon-newfill:before {
-	content: "\e71d";
-}
-
-.cuIcon-new:before {
-	content: "\e71e";
-}
-
-.cuIcon-pullleft:before {
-	content: "\e71f";
-}
-
-.cuIcon-pullright:before {
-	content: "\e720";
-}
-
-.cuIcon-rankfill:before {
-	content: "\e721";
-}
-
-.cuIcon-rank:before {
-	content: "\e722";
-}
-
-.cuIcon-bad:before {
-	content: "\e723";
-}
-
-.cuIcon-cameraadd:before {
-	content: "\e724";
-}
-
-.cuIcon-focus:before {
-	content: "\e725";
-}
-
-.cuIcon-friendfill:before {
-	content: "\e726";
-}
-
-.cuIcon-cameraaddfill:before {
-	content: "\e727";
-}
-
-.cuIcon-apps:before {
-	content: "\e729";
-}
-
-.cuIcon-paintfill:before {
-	content: "\e72a";
-}
-
-.cuIcon-paint:before {
-	content: "\e72b";
-}
-
-.cuIcon-picfill:before {
-	content: "\e72c";
-}
-
-.cuIcon-refresharrow:before {
-	content: "\e72d";
-}
-
-.cuIcon-colorlens:before {
-	content: "\e6e6";
-}
-
-.cuIcon-markfill:before {
-	content: "\e730";
-}
-
-.cuIcon-mark:before {
-	content: "\e731";
-}
-
-.cuIcon-presentfill:before {
-	content: "\e732";
-}
-
-.cuIcon-repeal:before {
-	content: "\e733";
-}
-
-.cuIcon-album:before {
-	content: "\e734";
-}
-
-.cuIcon-peoplefill:before {
-	content: "\e735";
-}
-
-.cuIcon-people:before {
-	content: "\e736";
-}
-
-.cuIcon-servicefill:before {
-	content: "\e737";
-}
-
-.cuIcon-repair:before {
-	content: "\e738";
-}
-
-.cuIcon-file:before {
-	content: "\e739";
-}
-
-.cuIcon-repairfill:before {
-	content: "\e73a";
-}
-
-.cuIcon-taoxiaopu:before {
-	content: "\e73b";
-}
-
-.cuIcon-weixin:before {
-	content: "\e612";
-}
-
-.cuIcon-attentionfill:before {
-	content: "\e73c";
-}
-
-.cuIcon-attention:before {
-	content: "\e73d";
-}
-
-.cuIcon-commandfill:before {
-	content: "\e73e";
-}
-
-.cuIcon-command:before {
-	content: "\e73f";
-}
-
-.cuIcon-communityfill:before {
-	content: "\e740";
-}
-
-.cuIcon-community:before {
-	content: "\e741";
-}
-
-.cuIcon-read:before {
-	content: "\e742";
-}
-
-.cuIcon-calendar:before {
-	content: "\e74a";
-}
-
-.cuIcon-cut:before {
-	content: "\e74b";
-}
-
-.cuIcon-magic:before {
-	content: "\e74c";
-}
-
-.cuIcon-backwardfill:before {
-	content: "\e74d";
-}
-
-.cuIcon-playfill:before {
-	content: "\e74f";
-}
-
-.cuIcon-stop:before {
-	content: "\e750";
-}
-
-.cuIcon-tagfill:before {
-	content: "\e751";
-}
-
-.cuIcon-tag:before {
-	content: "\e752";
-}
-
-.cuIcon-group:before {
-	content: "\e753";
-}
-
-.cuIcon-all:before {
-	content: "\e755";
-}
-
-.cuIcon-backdelete:before {
-	content: "\e756";
-}
-
-.cuIcon-hotfill:before {
-	content: "\e757";
-}
-
-.cuIcon-hot:before {
-	content: "\e758";
-}
-
-.cuIcon-post:before {
-	content: "\e759";
-}
-
-.cuIcon-radiobox:before {
-	content: "\e75b";
-}
-
-.cuIcon-rounddown:before {
-	content: "\e75c";
-}
-
-.cuIcon-upload:before {
-	content: "\e75d";
-}
-
-.cuIcon-writefill:before {
-	content: "\e760";
-}
-
-.cuIcon-write:before {
-	content: "\e761";
-}
-
-.cuIcon-radioboxfill:before {
-	content: "\e763";
-}
-
-.cuIcon-punch:before {
-	content: "\e764";
-}
-
-.cuIcon-shake:before {
-	content: "\e765";
-}
-
-.cuIcon-move:before {
-	content: "\e768";
-}
-
-.cuIcon-safe:before {
-	content: "\e769";
-}
-
-.cuIcon-activityfill:before {
-	content: "\e775";
-}
-
-.cuIcon-crownfill:before {
-	content: "\e776";
-}
-
-.cuIcon-crown:before {
-	content: "\e777";
-}
-
-.cuIcon-goodsfill:before {
-	content: "\e778";
-}
-
-.cuIcon-messagefill:before {
-	content: "\e779";
-}
-
-.cuIcon-profilefill:before {
-	content: "\e77a";
-}
-
-.cuIcon-sound:before {
-	content: "\e77b";
-}
-
-.cuIcon-sponsorfill:before {
-	content: "\e77c";
-}
-
-.cuIcon-sponsor:before {
-	content: "\e77d";
-}
-
-.cuIcon-upblock:before {
-	content: "\e77e";
-}
-
-.cuIcon-weblock:before {
-	content: "\e77f";
-}
-
-.cuIcon-weunblock:before {
-	content: "\e780";
-}
-
-.cuIcon-my:before {
-	content: "\e78b";
-}
-
-.cuIcon-myfill:before {
-	content: "\e78c";
-}
-
-.cuIcon-emojifill:before {
-	content: "\e78d";
-}
-
-.cuIcon-emojiflashfill:before {
-	content: "\e78e";
-}
-
-.cuIcon-flashbuyfill:before {
-	content: "\e78f";
-}
-
-.cuIcon-text:before {
-	content: "\e791";
-}
-
-.cuIcon-goodsfavor:before {
-	content: "\e794";
-}
-
-.cuIcon-musicfill:before {
-	content: "\e795";
-}
-
-.cuIcon-musicforbidfill:before {
-	content: "\e796";
-}
-
-.cuIcon-card:before {
-	content: "\e624";
-}
-
-.cuIcon-triangledownfill:before {
-	content: "\e79b";
-}
-
-.cuIcon-triangleupfill:before {
-	content: "\e79c";
-}
-
-.cuIcon-roundleftfill-copy:before {
-	content: "\e79e";
-}
-
-.cuIcon-font:before {
-	content: "\e76a";
-}
-
-.cuIcon-title:before {
-	content: "\e82f";
-}
-
-.cuIcon-recordfill:before {
-	content: "\e7a4";
-}
-
-.cuIcon-record:before {
-	content: "\e7a6";
-}
-
-.cuIcon-cardboardfill:before {
-	content: "\e7a9";
-}
-
-.cuIcon-cardboard:before {
-	content: "\e7aa";
-}
-
-.cuIcon-formfill:before {
-	content: "\e7ab";
-}
-
-.cuIcon-coin:before {
-	content: "\e7ac";
-}
-
-.cuIcon-cardboardforbid:before {
-	content: "\e7af";
-}
-
-.cuIcon-circlefill:before {
-	content: "\e7b0";
-}
-
-.cuIcon-circle:before {
-	content: "\e7b1";
-}
-
-.cuIcon-attentionforbid:before {
-	content: "\e7b2";
-}
-
-.cuIcon-attentionforbidfill:before {
-	content: "\e7b3";
-}
-
-.cuIcon-attentionfavorfill:before {
-	content: "\e7b4";
-}
-
-.cuIcon-attentionfavor:before {
-	content: "\e7b5";
-}
-
-.cuIcon-titles:before {
-	content: "\e701";
-}
-
-.cuIcon-icloading:before {
-	content: "\e67a";
-}
-
-.cuIcon-full:before {
-	content: "\e7bc";
-}
-
-.cuIcon-mail:before {
-	content: "\e7bd";
-}
-
-.cuIcon-peoplelist:before {
-	content: "\e7be";
-}
-
-.cuIcon-goodsnewfill:before {
-	content: "\e7bf";
-}
-
-.cuIcon-goodsnew:before {
-	content: "\e7c0";
-}
-
-.cuIcon-medalfill:before {
-	content: "\e7c1";
-}
-
-.cuIcon-medal:before {
-	content: "\e7c2";
-}
-
-.cuIcon-newsfill:before {
-	content: "\e7c3";
-}
-
-.cuIcon-newshotfill:before {
-	content: "\e7c4";
-}
-
-.cuIcon-newshot:before {
-	content: "\e7c5";
-}
-
-.cuIcon-news:before {
-	content: "\e7c6";
-}
-
-.cuIcon-videofill:before {
-	content: "\e7c7";
-}
-
-.cuIcon-video:before {
-	content: "\e7c8";
-}
-
-.cuIcon-exit:before {
-	content: "\e7cb";
-}
-
-.cuIcon-skinfill:before {
-	content: "\e7cc";
-}
-
-.cuIcon-skin:before {
-	content: "\e7cd";
-}
-
-.cuIcon-moneybagfill:before {
-	content: "\e7ce";
-}
-
-.cuIcon-usefullfill:before {
-	content: "\e7cf";
-}
-
-.cuIcon-usefull:before {
-	content: "\e7d0";
-}
-
-.cuIcon-moneybag:before {
-	content: "\e7d1";
-}
-
-.cuIcon-redpacket_fill:before {
-	content: "\e7d3";
-}
-
-.cuIcon-subscription:before {
-	content: "\e7d4";
-}
-
-.cuIcon-loading1:before {
-	content: "\e633";
-}
-
-.cuIcon-github:before {
-	content: "\e692";
-}
-
-.cuIcon-global:before {
-	content: "\e7eb";
-}
-
-.cuIcon-settingsfill:before {
-	content: "\e6ab";
-}
-
-.cuIcon-back_android:before {
-	content: "\e7ed";
-}
-
-.cuIcon-expressman:before {
-	content: "\e7ef";
-}
-
-.cuIcon-evaluate_fill:before {
-	content: "\e7f0";
-}
-
-.cuIcon-group_fill:before {
-	content: "\e7f5";
-}
-
-.cuIcon-play_forward_fill:before {
-	content: "\e7f6";
-}
-
-.cuIcon-deliver_fill:before {
-	content: "\e7f7";
-}
-
-.cuIcon-notice_forbid_fill:before {
-	content: "\e7f8";
-}
-
-.cuIcon-fork:before {
-	content: "\e60c";
-}
-
-.cuIcon-pick:before {
-	content: "\e7fa";
-}
-
-.cuIcon-wenzi:before {
-	content: "\e6a7";
-}
-
-.cuIcon-ellipse:before {
-	content: "\e600";
-}
-
-.cuIcon-qr_code:before {
-	content: "\e61b";
-}
-
-.cuIcon-dianhua:before {
-	content: "\e64d";
-}
-
-.cuIcon-cuIcon:before {
-	content: "\e602";
-}
-
-.cuIcon-loading2:before {
-	content: "\e7f1";
-}
-
-.cuIcon-btn:before {
-	content: "\e601";
-}
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/colorui/main.css b/CoreCms.Net.Uni-App/CoreShop/static/colorui/main.css
deleted file mode 100644
index fade3b29ebfbd820a0f3e56aafeb4b8524b91abb..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/colorui/main.css
+++ /dev/null
@@ -1,3912 +0,0 @@
-/*
-  ColorUi for uniApp  v2.1.6 | by 文晓港 2019-05-31 10:44:24
-  仅供学习交流，如作它用所承受的法律责任一概与作者无关  
-  
-  *使用ColorUi开发扩展与插件时，请注明基于ColorUi开发 
-  
-  （QQ交流群：240787041）
-*/
-
-/* ==================
-        初始化
- ==================== */
-body {
-	background-color: #f1f1f1;
-	font-size: 28upx;
-	color: #333333;
-	font-family: Helvetica Neue, Helvetica, sans-serif;
-}
-
-view,
-scroll-view,
-swiper,
-button,
-input,
-textarea,
-label,
-navigator,
-image {
-	box-sizing: border-box;
-}
-
-.round {
-	border-radius: 5000upx;
-}
-
-.radius {
-	border-radius: 6upx;
-}
-
-/* ==================
-          图片
- ==================== */
-
-image {
-	max-width: 100%;
-	display: inline-block;
-	position: relative;
-	z-index: 0;
-}
-
-image.loading::before {
-	content: "";
-	background-color: #f5f5f5;
-	display: block;
-	position: absolute;
-	width: 100%;
-	height: 100%;
-	z-index: -2;
-}
-
-image.loading::after {
-	content: "\e7f1";
-	font-family: "cuIcon";
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 32upx;
-	height: 32upx;
-	line-height: 32upx;
-	right: 0;
-	bottom: 0;
-	z-index: -1;
-	font-size: 32upx;
-	margin: auto;
-	color: #ccc;
-	-webkit-animation: cuIcon-spin 2s infinite linear;
-	animation: cuIcon-spin 2s infinite linear;
-	display: block;
-}
-
-.response {
-	width: 100%;
-}
-
-/* ==================
-         开关
- ==================== */
-
-switch,
-checkbox,
-radio {
-	position: relative;
-}
-
-switch::after,
-switch::before {
-	font-family: "cuIcon";
-	content: "\e645";
-	position: absolute;
-	color: #ffffff !important;
-	top: 0%;
-	left: 0upx;
-	font-size: 26upx;
-	line-height: 26px;
-	width: 50%;
-	text-align: center;
-	pointer-events: none;
-	transform: scale(0, 0);
-	transition: all 0.3s ease-in-out 0s;
-	z-index: 9;
-	bottom: 0;
-	height: 26px;
-	margin: auto;
-}
-
-switch::before {
-	content: "\e646";
-	right: 0;
-	transform: scale(1, 1);
-	left: auto;
-}
-
-switch[checked]::after,
-switch.checked::after {
-	transform: scale(1, 1);
-}
-
-switch[checked]::before,
-switch.checked::before {
-	transform: scale(0, 0);
-}
-
-/* #ifndef MP-ALIPAY */
-radio::before,
-checkbox::before {
-	font-family: "cuIcon";
-	content: "\e645";
-	position: absolute;
-	color: #ffffff !important;
-	top: 50%;
-	margin-top: -8px;
-	right: 5px;
-	font-size: 32upx;
-	line-height: 16px;
-	pointer-events: none;
-	transform: scale(1, 1);
-	transition: all 0.3s ease-in-out 0s;
-	z-index: 9;
-}
-
-radio .wx-radio-input,
-checkbox .wx-checkbox-input,
-radio .uni-radio-input,
-checkbox .uni-checkbox-input {
-	margin: 0;
-	width: 24px;
-	height: 24px;
-}
-
-checkbox.round .wx-checkbox-input,
-checkbox.round .uni-checkbox-input {
-	border-radius: 100upx;
-}
-
-/* #endif */
-
-switch[checked]::before {
-	transform: scale(0, 0);
-}
-
-switch .wx-switch-input,
-switch .uni-switch-input {
-	border: none;
-	padding: 0 24px;
-	width: 48px;
-	height: 26px;
-	margin: 0;
-	border-radius: 100upx;
-}
-
-switch .wx-switch-input:not([class*="bg-"]),
-switch .uni-switch-input:not([class*="bg-"]) {
-	background: #8799a3 !important;
-}
-
-switch .wx-switch-input::after,
-switch .uni-switch-input::after {
-	margin: auto;
-	width: 26px;
-	height: 26px;
-	border-radius: 100upx;
-	left: 0upx;
-	top: 0upx;
-	bottom: 0upx;
-	position: absolute;
-	transform: scale(0.9, 0.9);
-	transition: all 0.1s ease-in-out 0s;
-}
-
-switch .wx-switch-input.wx-switch-input-checked::after,
-switch .uni-switch-input.uni-switch-input-checked::after {
-	margin: auto;
-	left: 22px;
-	box-shadow: none;
-	transform: scale(0.9, 0.9);
-}
-
-radio-group {
-	display: inline-block;
-}
-
-
-
-switch.radius .wx-switch-input::after,
-switch.radius .wx-switch-input,
-switch.radius .wx-switch-input::before,
-switch.radius .uni-switch-input::after,
-switch.radius .uni-switch-input,
-switch.radius .uni-switch-input::before {
-	border-radius: 10upx;
-}
-
-switch .wx-switch-input::before,
-radio.radio::before,
-checkbox .wx-checkbox-input::before,
-radio .wx-radio-input::before,
-switch .uni-switch-input::before,
-radio.radio::before,
-checkbox .uni-checkbox-input::before,
-radio .uni-radio-input::before {
-	display: none;
-}
-
-radio.radio[checked]::after,
-radio.radio .uni-radio-input-checked::after {
-	content: "";
-	background-color: transparent;
-	display: block;
-	position: absolute;
-	width: 8px;
-	height: 8px;
-	z-index: 999;
-	top: 0upx;
-	left: 0upx;
-	right: 0;
-	bottom: 0;
-	margin: auto;
-	border-radius: 200upx;
-	/* #ifndef MP */
-	border: 7px solid #ffffff !important;
-	/* #endif */
-
-	/* #ifdef MP */
-	border: 8px solid #ffffff !important;
-	/* #endif */
-}
-
-.switch-sex::after {
-	content: "\e71c";
-}
-
-.switch-sex::before {
-	content: "\e71a";
-}
-
-.switch-sex .wx-switch-input,
-.switch-sex .uni-switch-input {
-	background: #e54d42 !important;
-	border-color: #e54d42 !important;
-}
-
-.switch-sex[checked] .wx-switch-input,
-.switch-sex.checked .uni-switch-input {
-	background: #0081ff !important;
-	border-color: #0081ff !important;
-}
-
-switch.red[checked] .wx-switch-input.wx-switch-input-checked,
-checkbox.red[checked] .wx-checkbox-input,
-radio.red[checked] .wx-radio-input,
-switch.red.checked .uni-switch-input.uni-switch-input-checked,
-checkbox.red.checked .uni-checkbox-input,
-radio.red.checked .uni-radio-input {
-	background-color: #e54d42 !important;
-	border-color: #e54d42 !important;
-	color: #ffffff !important;
-}
-
-switch.orange[checked] .wx-switch-input,
-checkbox.orange[checked] .wx-checkbox-input,
-radio.orange[checked] .wx-radio-input,
-switch.orange.checked .uni-switch-input,
-checkbox.orange.checked .uni-checkbox-input,
-radio.orange.checked .uni-radio-input {
-	background-color: #f37b1d !important;
-	border-color: #f37b1d !important;
-	color: #ffffff !important;
-}
-
-switch.yellow[checked] .wx-switch-input,
-checkbox.yellow[checked] .wx-checkbox-input,
-radio.yellow[checked] .wx-radio-input,
-switch.yellow.checked .uni-switch-input,
-checkbox.yellow.checked .uni-checkbox-input,
-radio.yellow.checked .uni-radio-input {
-	background-color: #fbbd08 !important;
-	border-color: #fbbd08 !important;
-	color: #333333 !important;
-}
-
-switch.olive[checked] .wx-switch-input,
-checkbox.olive[checked] .wx-checkbox-input,
-radio.olive[checked] .wx-radio-input,
-switch.olive.checked .uni-switch-input,
-checkbox.olive.checked .uni-checkbox-input,
-radio.olive.checked .uni-radio-input {
-	background-color: #8dc63f !important;
-	border-color: #8dc63f !important;
-	color: #ffffff !important;
-}
-
-switch.green[checked] .wx-switch-input,
-switch[checked] .wx-switch-input,
-checkbox.green[checked] .wx-checkbox-input,
-checkbox[checked] .wx-checkbox-input,
-radio.green[checked] .wx-radio-input,
-radio[checked] .wx-radio-input,
-switch.green.checked .uni-switch-input,
-switch.checked .uni-switch-input,
-checkbox.green.checked .uni-checkbox-input,
-checkbox.checked .uni-checkbox-input,
-radio.green.checked .uni-radio-input,
-radio.checked .uni-radio-input {
-	background-color: #39b54a !important;
-	border-color: #39b54a !important;
-	color: #ffffff !important;
-	border-color: #39B54A !important;
-}
-
-switch.cyan[checked] .wx-switch-input,
-checkbox.cyan[checked] .wx-checkbox-input,
-radio.cyan[checked] .wx-radio-input,
-switch.cyan.checked .uni-switch-input,
-checkbox.cyan.checked .uni-checkbox-input,
-radio.cyan.checked .uni-radio-input {
-	background-color: #1cbbb4 !important;
-	border-color: #1cbbb4 !important;
-	color: #ffffff !important;
-}
-
-switch.blue[checked] .wx-switch-input,
-checkbox.blue[checked] .wx-checkbox-input,
-radio.blue[checked] .wx-radio-input,
-switch.blue.checked .uni-switch-input,
-checkbox.blue.checked .uni-checkbox-input,
-radio.blue.checked .uni-radio-input {
-	background-color: #0081ff !important;
-	border-color: #0081ff !important;
-	color: #ffffff !important;
-}
-
-switch.purple[checked] .wx-switch-input,
-checkbox.purple[checked] .wx-checkbox-input,
-radio.purple[checked] .wx-radio-input,
-switch.purple.checked .uni-switch-input,
-checkbox.purple.checked .uni-checkbox-input,
-radio.purple.checked .uni-radio-input {
-	background-color: #6739b6 !important;
-	border-color: #6739b6 !important;
-	color: #ffffff !important;
-}
-
-switch.mauve[checked] .wx-switch-input,
-checkbox.mauve[checked] .wx-checkbox-input,
-radio.mauve[checked] .wx-radio-input,
-switch.mauve.checked .uni-switch-input,
-checkbox.mauve.checked .uni-checkbox-input,
-radio.mauve.checked .uni-radio-input {
-	background-color: #9c26b0 !important;
-	border-color: #9c26b0 !important;
-	color: #ffffff !important;
-}
-
-switch.pink[checked] .wx-switch-input,
-checkbox.pink[checked] .wx-checkbox-input,
-radio.pink[checked] .wx-radio-input,
-switch.pink.checked .uni-switch-input,
-checkbox.pink.checked .uni-checkbox-input,
-radio.pink.checked .uni-radio-input {
-	background-color: #e03997 !important;
-	border-color: #e03997 !important;
-	color: #ffffff !important;
-}
-
-switch.brown[checked] .wx-switch-input,
-checkbox.brown[checked] .wx-checkbox-input,
-radio.brown[checked] .wx-radio-input,
-switch.brown.checked .uni-switch-input,
-checkbox.brown.checked .uni-checkbox-input,
-radio.brown.checked .uni-radio-input {
-	background-color: #a5673f !important;
-	border-color: #a5673f !important;
-	color: #ffffff !important;
-}
-
-switch.grey[checked] .wx-switch-input,
-checkbox.grey[checked] .wx-checkbox-input,
-radio.grey[checked] .wx-radio-input,
-switch.grey.checked .uni-switch-input,
-checkbox.grey.checked .uni-checkbox-input,
-radio.grey.checked .uni-radio-input {
-	background-color: #8799a3 !important;
-	border-color: #8799a3 !important;
-	color: #ffffff !important;
-}
-
-switch.gray[checked] .wx-switch-input,
-checkbox.gray[checked] .wx-checkbox-input,
-radio.gray[checked] .wx-radio-input,
-switch.gray.checked .uni-switch-input,
-checkbox.gray.checked .uni-checkbox-input,
-radio.gray.checked .uni-radio-input {
-	background-color: #f0f0f0 !important;
-	border-color: #f0f0f0 !important;
-	color: #333333 !important;
-}
-
-switch.black[checked] .wx-switch-input,
-checkbox.black[checked] .wx-checkbox-input,
-radio.black[checked] .wx-radio-input,
-switch.black.checked .uni-switch-input,
-checkbox.black.checked .uni-checkbox-input,
-radio.black.checked .uni-radio-input {
-	background-color: #333333 !important;
-	border-color: #333333 !important;
-	color: #ffffff !important;
-}
-
-switch.white[checked] .wx-switch-input,
-checkbox.white[checked] .wx-checkbox-input,
-radio.white[checked] .wx-radio-input,
-switch.white.checked .uni-switch-input,
-checkbox.white.checked .uni-checkbox-input,
-radio.white.checked .uni-radio-input {
-	background-color: #ffffff !important;
-	border-color: #ffffff !important;
-	color: #333333 !important;
-}
-
-/* ==================
-          边框
- ==================== */
-
-/* -- 实线 -- */
-
-.solid,
-.solid-top,
-.solid-right,
-.solid-bottom,
-.solid-left,
-.solids,
-.solids-top,
-.solids-right,
-.solids-bottom,
-.solids-left,
-.dashed,
-.dashed-top,
-.dashed-right,
-.dashed-bottom,
-.dashed-left {
-	position: relative;
-}
-
-.solid::after,
-.solid-top::after,
-.solid-right::after,
-.solid-bottom::after,
-.solid-left::after,
-.solids::after,
-.solids-top::after,
-.solids-right::after,
-.solids-bottom::after,
-.solids-left::after,
-.dashed::after,
-.dashed-top::after,
-.dashed-right::after,
-.dashed-bottom::after,
-.dashed-left::after {
-	content: " ";
-	width: 200%;
-	height: 200%;
-	position: absolute;
-	top: 0;
-	left: 0;
-	border-radius: inherit;
-	transform: scale(0.5);
-	transform-origin: 0 0;
-	pointer-events: none;
-	box-sizing: border-box;
-}
-
-.solid::after {
-	border: 1upx solid rgba(0, 0, 0, 0.1);
-}
-
-.solid-top::after {
-	border-top: 1upx solid rgba(0, 0, 0, 0.1);
-}
-
-.solid-right::after {
-	border-right: 1upx solid rgba(0, 0, 0, 0.1);
-}
-
-.solid-bottom::after {
-	border-bottom: 1upx solid rgba(0, 0, 0, 0.1);
-}
-
-.solid-left::after {
-	border-left: 1upx solid rgba(0, 0, 0, 0.1);
-}
-
-.solids::after {
-	border: 8upx solid #eee;
-}
-
-.solids-top::after {
-	border-top: 8upx solid #eee;
-}
-
-.solids-right::after {
-	border-right: 8upx solid #eee;
-}
-
-.solids-bottom::after {
-	border-bottom: 8upx solid #eee;
-}
-
-.solids-left::after {
-	border-left: 8upx solid #eee;
-}
-
-/* -- 虚线 -- */
-
-.dashed::after {
-	border: 1upx dashed #ddd;
-}
-
-.dashed-top::after {
-	border-top: 1upx dashed #ddd;
-}
-
-.dashed-right::after {
-	border-right: 1upx dashed #ddd;
-}
-
-.dashed-bottom::after {
-	border-bottom: 1upx dashed #ddd;
-}
-
-.dashed-left::after {
-	border-left: 1upx dashed #ddd;
-}
-
-/* -- 阴影 -- */
-
-.shadow[class*='white'] {
-	--ShadowSize: 0 1upx 6upx;
-}
-
-.shadow-lg {
-	--ShadowSize: 0upx 40upx 100upx 0upx;
-}
-
-.shadow-warp {
-	position: relative;
-	box-shadow: 0 0 10upx rgba(0, 0, 0, 0.1);
-}
-
-.shadow-warp:before,
-.shadow-warp:after {
-	position: absolute;
-	content: "";
-	top: 20upx;
-	bottom: 30upx;
-	left: 20upx;
-	width: 50%;
-	box-shadow: 0 30upx 20upx rgba(0, 0, 0, 0.2);
-	transform: rotate(-3deg);
-	z-index: -1;
-}
-
-.shadow-warp:after {
-	right: 20upx;
-	left: auto;
-	transform: rotate(3deg);
-}
-
-.shadow-blur {
-	position: relative;
-}
-
-.shadow-blur::before {
-	content: "";
-	display: block;
-	background: inherit;
-	filter: blur(10upx);
-	position: absolute;
-	width: 100%;
-	height: 100%;
-	top: 10upx;
-	left: 10upx;
-	z-index: -1;
-	opacity: 0.4;
-	transform-origin: 0 0;
-	border-radius: inherit;
-	transform: scale(1, 1);
-}
-
-/* ==================
-          按钮
- ==================== */
-
-.cu-btn {
-	position: relative;
-	border: 0upx;
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	box-sizing: border-box;
-	padding: 0 30upx;
-	font-size: 28upx;
-	height: 64upx;
-	line-height: 1;
-	text-align: center;
-	text-decoration: none;
-	overflow: visible;
-	margin-left: initial;
-	transform: translate(0upx, 0upx);
-	margin-right: initial;
-}
-
-.cu-btn::after {
-	display: none;
-}
-
-.cu-btn:not([class*="bg-"]) {
-	background-color: #f0f0f0;
-}
-
-.cu-btn[class*="line"] {
-	background-color: transparent;
-}
-
-.cu-btn[class*="line"]::after {
-	content: " ";
-	display: block;
-	width: 200%;
-	height: 200%;
-	position: absolute;
-	top: 0;
-	left: 0;
-	border: 1upx solid currentColor;
-	transform: scale(0.5);
-	transform-origin: 0 0;
-	box-sizing: border-box;
-	border-radius: 12upx;
-	z-index: 1;
-	pointer-events: none;
-}
-
-.cu-btn.round[class*="line"]::after {
-	border-radius: 1000upx;
-}
-
-.cu-btn[class*="lines"]::after {
-	border: 6upx solid currentColor;
-}
-
-.cu-btn[class*="bg-"]::after {
-	display: none;
-}
-
-.cu-btn.sm {
-	padding: 0 20upx;
-	font-size: 20upx;
-	height: 48upx;
-}
-
-.cu-btn.lg {
-	padding: 0 40upx;
-	font-size: 32upx;
-	height: 80upx;
-}
-
-.cu-btn.cuIcon.sm {
-	width: 48upx;
-	height: 48upx;
-}
-
-.cu-btn.cuIcon {
-	width: 64upx;
-	height: 64upx;
-	border-radius: 500upx;
-	padding: 0;
-}
-
-button.cuIcon.lg {
-	width: 80upx;
-	height: 80upx;
-}
-
-.cu-btn.shadow-blur::before {
-	top: 4upx;
-	left: 4upx;
-	filter: blur(6upx);
-	opacity: 0.6;
-}
-
-.cu-btn.button-hover {
-	transform: translate(1upx, 1upx);
-}
-
-.block {
-	display: block;
-}
-
-.cu-btn.block {
-	display: flex;
-}
-
-.cu-btn[disabled] {
-	opacity: 0.6;
-	color: #ffffff;
-}
-
-/* ==================
-          徽章
- ==================== */
-
-.cu-tag {
-	font-size: 24upx;
-	vertical-align: middle;
-	position: relative;
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	box-sizing: border-box;
-	padding: 0upx 16upx;
-	height: 48upx;
-	font-family: Helvetica Neue, Helvetica, sans-serif;
-	white-space: nowrap;
-}
-
-.cu-tag:not([class*="bg"]):not([class*="line"]) {
-	background-color: #f1f1f1;
-}
-
-.cu-tag[class*="line-"]::after {
-	content: " ";
-	width: 200%;
-	height: 200%;
-	position: absolute;
-	top: 0;
-	left: 0;
-	border: 1upx solid currentColor;
-	transform: scale(0.5);
-	transform-origin: 0 0;
-	box-sizing: border-box;
-	border-radius: inherit;
-	z-index: 1;
-	pointer-events: none;
-}
-
-.cu-tag.radius[class*="line"]::after {
-	border-radius: 12upx;
-}
-
-.cu-tag.round[class*="line"]::after {
-	border-radius: 1000upx;
-}
-
-.cu-tag[class*="line-"]::after {
-	border-radius: 0;
-}
-
-.cu-tag+.cu-tag {
-	margin-left: 10upx;
-}
-
-.cu-tag.sm {
-	font-size: 20upx;
-	padding: 0upx 12upx;
-	height: 32upx;
-}
-
-.cu-capsule {
-	display: inline-flex;
-	vertical-align: middle;
-}
-
-.cu-capsule+.cu-capsule {
-	margin-left: 10upx;
-}
-
-.cu-capsule .cu-tag {
-	margin: 0;
-}
-
-.cu-capsule .cu-tag[class*="line-"]:last-child::after {
-	border-left: 0upx solid transparent;
-}
-
-.cu-capsule .cu-tag[class*="line-"]:first-child::after {
-	border-right: 0upx solid transparent;
-}
-
-.cu-capsule.radius .cu-tag:first-child {
-	border-top-left-radius: 6upx;
-	border-bottom-left-radius: 6upx;
-}
-
-.cu-capsule.radius .cu-tag:last-child::after,
-.cu-capsule.radius .cu-tag[class*="line-"] {
-	border-top-right-radius: 12upx;
-	border-bottom-right-radius: 12upx;
-}
-
-.cu-capsule.round .cu-tag:first-child {
-	border-top-left-radius: 200upx;
-	border-bottom-left-radius: 200upx;
-	text-indent: 4upx;
-}
-
-.cu-capsule.round .cu-tag:last-child::after,
-.cu-capsule.round .cu-tag:last-child {
-	border-top-right-radius: 200upx;
-	border-bottom-right-radius: 200upx;
-	text-indent: -4upx;
-}
-
-.cu-tag.badge {
-	border-radius: 200upx;
-	position: absolute;
-	top: -10upx;
-	right: -10upx;
-	font-size: 20upx;
-	padding: 0upx 10upx;
-	height: 28upx;
-	color: #ffffff;
-}
-
-.cu-tag.badge:not([class*="bg-"]) {
-	background-color: #dd514c;
-}
-
-.cu-tag:empty:not([class*="cuIcon-"]) {
-	padding: 0upx;
-	width: 16upx;
-	height: 16upx;
-	top: -4upx;
-	right: -4upx;
-}
-
-.cu-tag[class*="cuIcon-"] {
-	width: 32upx;
-	height: 32upx;
-	top: -4upx;
-	right: -4upx;
-}
-
-/* ==================
-          头像
- ==================== */
-
-.cu-avatar {
-	font-variant: small-caps;
-	margin: 0;
-	padding: 0;
-	display: inline-flex;
-	text-align: center;
-	justify-content: center;
-	align-items: center;
-	background-color: #ccc;
-	color: #ffffff;
-	white-space: nowrap;
-	position: relative;
-	width: 64upx;
-	height: 64upx;
-	background-size: cover;
-	background-position: center;
-	vertical-align: middle;
-	font-size: 1.5em;
-}
-
-.cu-avatar.sm {
-	width: 48upx;
-	height: 48upx;
-	font-size: 1em;
-}
-
-.cu-avatar.lg {
-	width: 96upx;
-	height: 96upx;
-	font-size: 2em;
-}
-
-.cu-avatar.xl {
-	width: 128upx;
-	height: 128upx;
-	font-size: 2.5em;
-}
-
-.cu-avatar .avatar-text {
-	font-size: 0.4em;
-}
-
-.cu-avatar-group {
-	direction: rtl;
-	unicode-bidi: bidi-override;
-	padding: 0 10upx 0 40upx;
-	display: inline-block;
-}
-
-.cu-avatar-group .cu-avatar {
-	margin-left: -30upx;
-	border: 4upx solid #f1f1f1;
-	vertical-align: middle;
-}
-
-.cu-avatar-group .cu-avatar.sm {
-	margin-left: -20upx;
-	border: 1upx solid #f1f1f1;
-}
-
-/* ==================
-         进度条
- ==================== */
-
-.cu-progress {
-	overflow: hidden;
-	height: 28upx;
-	background-color: #ebeef5;
-	display: inline-flex;
-	align-items: center;
-	width: 100%;
-}
-
-.cu-progress+view,
-.cu-progress+text {
-	line-height: 1;
-}
-
-.cu-progress.xs {
-	height: 10upx;
-}
-
-.cu-progress.sm {
-	height: 20upx;
-}
-
-.cu-progress view {
-	width: 0;
-	height: 100%;
-	align-items: center;
-	display: flex;
-	justify-items: flex-end;
-	justify-content: space-around;
-	font-size: 20upx;
-	color: #ffffff;
-	transition: width 0.6s ease;
-}
-
-.cu-progress text {
-	align-items: center;
-	display: flex;
-	font-size: 20upx;
-	color: #333333;
-	text-indent: 10upx;
-}
-
-.cu-progress.text-progress {
-	padding-right: 60upx;
-}
-
-.cu-progress.striped view {
-	background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-	background-size: 72upx 72upx;
-}
-
-.cu-progress.active view {
-	animation: progress-stripes 2s linear infinite;
-}
-
-@keyframes progress-stripes {
-	from {
-		background-position: 72upx 0;
-	}
-
-	to {
-		background-position: 0 0;
-	}
-}
-
-/* ==================
-          加载
- ==================== */
-
-.cu-load {
-	display: block;
-	line-height: 3em;
-	text-align: center;
-}
-
-.cu-load::before {
-	font-family: "cuIcon";
-	display: inline-block;
-	margin-right: 6upx;
-}
-
-.cu-load.loading::before {
-	content: "\e67a";
-	animation: cuIcon-spin 2s infinite linear;
-}
-
-.cu-load.loading::after {
-	content: "加载中...";
-}
-
-.cu-load.over::before {
-	content: "\e64a";
-}
-
-.cu-load.over::after {
-	content: "没有更多了";
-}
-
-.cu-load.erro::before {
-	content: "\e658";
-}
-
-.cu-load.erro::after {
-	content: "加载失败";
-}
-
-.cu-load.load-cuIcon::before {
-	font-size: 32upx;
-}
-
-.cu-load.load-cuIcon::after {
-	display: none;
-}
-
-.cu-load.load-cuIcon.over {
-	display: none;
-}
-
-.cu-load.load-modal {
-	position: fixed;
-	top: 0;
-	right: 0;
-	bottom: 140upx;
-	left: 0;
-	margin: auto;
-	width: 260upx;
-	height: 260upx;
-	background-color: #ffffff;
-	border-radius: 10upx;
-	box-shadow: 0 0 0upx 2000upx rgba(0, 0, 0, 0.5);
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	justify-content: center;
-	font-size: 28upx;
-	z-index: 9999;
-	line-height: 2.4em;
-}
-
-.cu-load.load-modal [class*="cuIcon-"] {
-	font-size: 60upx;
-}
-
-.cu-load.load-modal image {
-	width: 70upx;
-	height: 70upx;
-}
-
-.cu-load.load-modal::after {
-	content: "";
-	position: absolute;
-	background-color: #ffffff;
-	border-radius: 50%;
-	width: 200upx;
-	height: 200upx;
-	font-size: 10px;
-	border-top: 6upx solid rgba(0, 0, 0, 0.05);
-	border-right: 6upx solid rgba(0, 0, 0, 0.05);
-	border-bottom: 6upx solid rgba(0, 0, 0, 0.05);
-	border-left: 6upx solid #f37b1d;
-	animation: cuIcon-spin 1s infinite linear;
-	z-index: -1;
-}
-
-.load-progress {
-	pointer-events: none;
-	top: 0;
-	position: fixed;
-	width: 100%;
-	left: 0;
-	z-index: 2000;
-}
-
-.load-progress.hide {
-	display: none;
-}
-
-.load-progress .load-progress-bar {
-	position: relative;
-	width: 100%;
-	height: 4upx;
-	overflow: hidden;
-	transition: all 200ms ease 0s;
-}
-
-.load-progress .load-progress-spinner {
-	position: absolute;
-	top: 10upx;
-	right: 10upx;
-	z-index: 2000;
-	display: block;
-}
-
-.load-progress .load-progress-spinner::after {
-	content: "";
-	display: block;
-	width: 24upx;
-	height: 24upx;
-	-webkit-box-sizing: border-box;
-	box-sizing: border-box;
-	border: solid 4upx transparent;
-	border-top-color: inherit;
-	border-left-color: inherit;
-	border-radius: 50%;
-	-webkit-animation: load-progress-spinner 0.4s linear infinite;
-	animation: load-progress-spinner 0.4s linear infinite;
-}
-
-@-webkit-keyframes load-progress-spinner {
-	0% {
-		-webkit-transform: rotate(0);
-		transform: rotate(0);
-	}
-
-	100% {
-		-webkit-transform: rotate(360deg);
-		transform: rotate(360deg);
-	}
-}
-
-@keyframes load-progress-spinner {
-	0% {
-		-webkit-transform: rotate(0);
-		transform: rotate(0);
-	}
-
-	100% {
-		-webkit-transform: rotate(360deg);
-		transform: rotate(360deg);
-	}
-}
-
-/* ==================
-          列表
- ==================== */
-.grayscale {
-	filter: grayscale(1);
-}
-
-.cu-list+.cu-list {
-	margin-top: 30upx
-}
-
-.cu-list>.cu-item {
-	transition: all .6s ease-in-out 0s;
-	transform: translateX(0upx)
-}
-
-.cu-list>.cu-item.move-cur {
-	transform: translateX(-260upx)
-}
-
-.cu-list>.cu-item .move {
-	position: absolute;
-	right: 0;
-	display: flex;
-	width: 260upx;
-	height: 100%;
-	transform: translateX(100%)
-}
-
-.cu-list>.cu-item .move view {
-	display: flex;
-	flex: 1;
-	justify-content: center;
-	align-items: center
-}
-
-.cu-list.menu-avatar {
-	overflow: hidden;
-}
-
-.cu-list.menu-avatar>.cu-item {
-	position: relative;
-	display: flex;
-	padding-right: 10upx;
-	height: 140upx;
-	background-color: #ffffff;
-	justify-content: flex-end;
-	align-items: center
-}
-
-.cu-list.menu-avatar>.cu-item>.cu-avatar {
-	position: absolute;
-	left: 30upx
-}
-
-.cu-list.menu-avatar>.cu-item .flex .text-cut {
-	max-width: 510upx
-}
-
-.cu-list.menu-avatar>.cu-item .content {
-	position: absolute;
-	left: 146upx;
-	width: calc(100% - 96upx - 60upx - 120upx - 20upx);
-	line-height: 1.6em;
-}
-
-.cu-list.menu-avatar>.cu-item .content.flex-sub {
-	width: calc(100% - 96upx - 60upx - 20upx);
-}
-
-.cu-list.menu-avatar>.cu-item .content>view:first-child {
-	font-size: 30upx;
-	display: flex;
-	align-items: center
-}
-
-.cu-list.menu-avatar>.cu-item .content .cu-tag.sm {
-	display: inline-block;
-	margin-left: 10upx;
-	height: 28upx;
-	font-size: 16upx;
-	line-height: 32upx
-}
-
-.cu-list.menu-avatar>.cu-item .action {
-	width: 100upx;
-	text-align: center
-}
-
-.cu-list.menu-avatar>.cu-item .action view+view {
-	margin-top: 10upx
-}
-
-.cu-list.menu-avatar.comment>.cu-item .content {
-	position: relative;
-	left: 0;
-	width: auto;
-	flex: 1;
-}
-
-.cu-list.menu-avatar.comment>.cu-item {
-	padding: 30upx 30upx 30upx 120upx;
-	height: auto
-}
-
-.cu-list.menu-avatar.comment .cu-avatar {
-	align-self: flex-start
-}
-
-.cu-list.menu>.cu-item {
-	position: relative;
-	display: flex;
-	padding: 0 30upx;
-	min-height: 100upx;
-	background-color: #ffffff;
-	justify-content: space-between;
-	align-items: center
-}
-
-.cu-list.menu>.cu-item:last-child:after {
-	border: none
-}
-
-.cu-list.menu-avatar>.cu-item:after,
-.cu-list.menu>.cu-item:after {
-	position: absolute;
-	top: 0;
-	left: 0;
-	box-sizing: border-box;
-	width: 200%;
-	height: 200%;
-	border-bottom: 1upx solid #ddd;
-	border-radius: inherit;
-	content: " ";
-	transform: scale(.5);
-	transform-origin: 0 0;
-	pointer-events: none
-}
-
-.cu-list.menu>.cu-item.grayscale {
-	background-color: #f5f5f5
-}
-
-.cu-list.menu>.cu-item.cur {
-	background-color: #fcf7e9
-}
-
-.cu-list.menu>.cu-item.arrow {
-	padding-right: 90upx
-}
-
-.cu-list.menu>.cu-item.arrow:before {
-	position: absolute;
-	top: 0;
-	right: 30upx;
-	bottom: 0;
-	display: block;
-	margin: auto;
-	width: 30upx;
-	height: 30upx;
-	color: #8799a3;
-	content: "\e6a3";
-	text-align: center;
-	font-size: 34upx;
-	font-family: cuIcon;
-	line-height: 30upx
-}
-
-.cu-list.menu>.cu-item button.content {
-	padding: 0;
-	background-color: transparent;
-	justify-content: flex-start
-}
-
-.cu-list.menu>.cu-item button.content:after {
-	display: none
-}
-
-.cu-list.menu>.cu-item .cu-avatar-group .cu-avatar {
-	border-color: #ffffff
-}
-
-.cu-list.menu>.cu-item .content>view:first-child {
-	display: flex;
-	align-items: center
-}
-
-.cu-list.menu>.cu-item .content>text[class*=cuIcon] {
-	display: inline-block;
-	margin-right: 10upx;
-	width: 1.6em;
-	text-align: center
-}
-
-.cu-list.menu>.cu-item .content>image {
-	display: inline-block;
-	margin-right: 10upx;
-	width: 1.6em;
-	height: 1.6em;
-	vertical-align: middle
-}
-
-.cu-list.menu>.cu-item .content {
-	font-size: 30upx;
-	line-height: 1.6em;
-	flex: 1
-}
-
-.cu-list.menu>.cu-item .content .cu-tag.sm {
-	display: inline-block;
-	margin-left: 10upx;
-	height: 28upx;
-	font-size: 16upx;
-	line-height: 32upx
-}
-
-.cu-list.menu>.cu-item .action .cu-tag:empty {
-	right: 10upx
-}
-
-.cu-list.menu {
-	display: block;
-	overflow: hidden
-}
-
-.cu-list.menu.sm-border>.cu-item:after {
-	left: 30upx;
-	width: calc(200% - 120upx)
-}
-
-.cu-list.grid>.cu-item {
-	position: relative;
-	display: flex;
-	padding: 20upx 0 30upx;
-	transition-duration: 0s;
-	flex-direction: column
-}
-
-.cu-list.grid>.cu-item:after {
-	position: absolute;
-	top: 0;
-	left: 0;
-	box-sizing: border-box;
-	width: 200%;
-	height: 200%;
-	border-right: 1px solid rgba(0, 0, 0, .1);
-	border-bottom: 1px solid rgba(0, 0, 0, .1);
-	border-radius: inherit;
-	content: " ";
-	transform: scale(.5);
-	transform-origin: 0 0;
-	pointer-events: none
-}
-
-.cu-list.grid>.cu-item text {
-	display: block;
-	margin-top: 10upx;
-	color: #888;
-	font-size: 26upx;
-	line-height: 40upx
-}
-
-.cu-list.grid>.cu-item [class*=cuIcon] {
-	position: relative;
-	display: block;
-	margin-top: 20upx;
-	width: 100%;
-	font-size: 48upx
-}
-
-.cu-list.grid>.cu-item .cu-tag {
-	right: auto;
-	left: 50%;
-	margin-left: 20upx
-}
-
-.cu-list.grid {
-	background-color: #ffffff;
-	text-align: center
-}
-
-.cu-list.grid.no-border>.cu-item {
-	padding-top: 10upx;
-	padding-bottom: 20upx
-}
-
-.cu-list.grid.no-border>.cu-item:after {
-	border: none
-}
-
-.cu-list.grid.no-border {
-	padding: 20upx 10upx
-}
-
-.cu-list.grid.col-3>.cu-item:nth-child(3n):after,
-.cu-list.grid.col-4>.cu-item:nth-child(4n):after,
-.cu-list.grid.col-5>.cu-item:nth-child(5n):after {
-	border-right-width: 0
-}
-
-.cu-list.card-menu {
-	overflow: hidden;
-	margin-right: 30upx;
-	margin-left: 30upx;
-	border-radius: 20upx
-}
-
-
-/* ==================
-          操作条
- ==================== */
-
-.cu-bar {
-	display: flex;
-	position: relative;
-	align-items: center;
-	min-height: 100upx;
-	justify-content: space-between;
-}
-
-.cu-bar .action {
-	display: flex;
-	align-items: center;
-	height: 100%;
-	justify-content: center;
-	max-width: 100%;
-}
-
-.cu-bar .action.border-title {
-	position: relative;
-	top: -10upx;
-}
-
-.cu-bar .action.border-title text[class*="bg-"]:last-child {
-	position: absolute;
-	bottom: -0.5rem;
-	min-width: 2rem;
-	height: 6upx;
-	left: 0;
-}
-
-.cu-bar .action.sub-title {
-	position: relative;
-	top: -0.2rem;
-}
-
-.cu-bar .action.sub-title text {
-	position: relative;
-	z-index: 1;
-}
-
-.cu-bar .action.sub-title text[class*="bg-"]:last-child {
-	position: absolute;
-	display: inline-block;
-	bottom: -0.2rem;
-	border-radius: 6upx;
-	width: 100%;
-	height: 0.6rem;
-	left: 0.6rem;
-	opacity: 0.3;
-	z-index: 0;
-}
-
-.cu-bar .action.sub-title text[class*="text-"]:last-child {
-	position: absolute;
-	display: inline-block;
-	bottom: -0.7rem;
-	left: 0.5rem;
-	opacity: 0.2;
-	z-index: 0;
-	text-align: right;
-	font-weight: 900;
-	font-size: 36upx;
-}
-
-.cu-bar.justify-center .action.border-title text:last-child,
-.cu-bar.justify-center .action.sub-title text:last-child {
-	left: 0;
-	right: 0;
-	margin: auto;
-	text-align: center;
-}
-
-.cu-bar .action:first-child {
-	margin-left: 30upx;
-	font-size: 30upx;
-}
-
-.cu-bar .action text.text-cut {
-	text-align: left;
-	width: 100%;
-}
-
-.cu-bar .cu-avatar:first-child {
-	margin-left: 20upx;
-}
-
-.cu-bar .action:first-child>text[class*="cuIcon-"] {
-	margin-left: -0.3em;
-	margin-right: 0.3em;
-}
-
-.cu-bar .action:last-child {
-	margin-right: 30upx;
-}
-
-.cu-bar .action>text[class*="cuIcon-"],
-.cu-bar .action>view[class*="cuIcon-"] {
-	font-size: 36upx;
-}
-
-.cu-bar .action>text[class*="cuIcon-"]+text[class*="cuIcon-"] {
-	margin-left: 0.5em;
-}
-
-.cu-bar .content {
-	position: absolute;
-	text-align: center;
-	width: calc(100% - 340upx);
-	left: 0;
-	right: 0;
-	bottom: 0;
-	top: 0;
-	margin: auto;
-	height: 60upx;
-	font-size: 32upx;
-	line-height: 60upx;
-	cursor: none;
-	pointer-events: none;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	overflow: hidden;
-}
-
-.cu-bar.ios .content {
-	bottom: 7px;
-	height: 30px;
-	font-size: 32upx;
-	line-height: 30px;
-}
-
-.cu-bar.btn-group {
-	justify-content: space-around;
-}
-
-.cu-bar.btn-group button {
-	padding: 20upx 32upx;
-}
-
-.cu-bar.btn-group button {
-	flex: 1;
-	margin: 0 20upx;
-	max-width: 50%;
-}
-
-.cu-bar .search-form {
-	background-color: #f5f5f5;
-	line-height: 64upx;
-	height: 64upx;
-	font-size: 24upx;
-	color: #333333;
-	flex: 1;
-	display: flex;
-	align-items: center;
-	margin: 0 30upx;
-}
-
-.cu-bar .search-form+.action {
-	margin-right: 30upx;
-}
-
-.cu-bar .search-form input {
-	flex: 1;
-	padding-right: 30upx;
-	height: 64upx;
-	line-height: 64upx;
-	font-size: 26upx;
-	background-color: transparent;
-}
-
-.cu-bar .search-form [class*="cuIcon-"] {
-	margin: 0 0.5em 0 0.8em;
-}
-
-.cu-bar .search-form [class*="cuIcon-"]::before {
-	top: 0upx;
-}
-
-.cu-bar.fixed,
-.nav.fixed {
-	position: fixed;
-	width: 100%;
-	top: 0;
-	z-index: 1024;
-	box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1);
-}
-
-.cu-bar.foot {
-	position: fixed;
-	width: 100%;
-	bottom: 0;
-	z-index: 1024;
-	box-shadow: 0 -1upx 6upx rgba(0, 0, 0, 0.1);
-}
-
-.cu-bar.tabbar {
-	padding: 0;
-	height: calc(100upx + env(safe-area-inset-bottom) / 2);
-	padding-bottom: calc(env(safe-area-inset-bottom) / 2);
-}
-
-.cu-tabbar-height {
-	min-height: 100upx;
-	height: calc(100upx + env(safe-area-inset-bottom) / 2);
-}
-
-.cu-bar.tabbar.shadow {
-	box-shadow: 0 -1upx 6upx rgba(0, 0, 0, 0.1);
-}
-
-.cu-bar.tabbar .action {
-	font-size: 22upx;
-	position: relative;
-	flex: 1;
-	text-align: center;
-	padding: 0;
-	display: block;
-	height: auto;
-	line-height: 1;
-	margin: 0;
-	background-color: inherit;
-	overflow: initial;
-}
-
-.cu-bar.tabbar.shop .action {
-	width: 140upx;
-	flex: initial;
-}
-
-.cu-bar.tabbar .action.add-action {
-	position: relative;
-	z-index: 2;
-	padding-top: 50upx;
-}
-
-.cu-bar.tabbar .action.add-action [class*="cuIcon-"] {
-	position: absolute;
-	width: 70upx;
-	z-index: 2;
-	height: 70upx;
-	border-radius: 50%;
-	line-height: 70upx;
-	font-size: 50upx;
-	top: -35upx;
-	left: 0;
-	right: 0;
-	margin: auto;
-	padding: 0;
-}
-
-.cu-bar.tabbar .action.add-action::after {
-	content: "";
-	position: absolute;
-	width: 100upx;
-	height: 100upx;
-	top: -50upx;
-	left: 0;
-	right: 0;
-	margin: auto;
-	box-shadow: 0 -3upx 8upx rgba(0, 0, 0, 0.08);
-	border-radius: 50upx;
-	background-color: inherit;
-	z-index: 0;
-}
-
-.cu-bar.tabbar .action.add-action::before {
-	content: "";
-	position: absolute;
-	width: 100upx;
-	height: 30upx;
-	bottom: 30upx;
-	left: 0;
-	right: 0;
-	margin: auto;
-	background-color: inherit;
-	z-index: 1;
-}
-
-.cu-bar.tabbar .btn-group {
-	flex: 1;
-	display: flex;
-	justify-content: space-around;
-	align-items: center;
-	padding: 0 10upx;
-}
-
-.cu-bar.tabbar button.action::after {
-	border: 0;
-}
-
-.cu-bar.tabbar .action [class*="cuIcon-"] {
-	width: 100upx;
-	position: relative;
-	display: block;
-	height: auto;
-	margin: 0 auto 10upx;
-	text-align: center;
-	font-size: 40upx;
-}
-
-.cu-bar.tabbar .action .cuIcon-cu-image {
-	margin: 0 auto;
-}
-
-.cu-bar.tabbar .action .cuIcon-cu-image image {
-	width: 50upx;
-	height: 50upx;
-	display: inline-block;
-}
-
-.cu-bar.tabbar .submit {
-	align-items: center;
-	display: flex;
-	justify-content: center;
-	text-align: center;
-	position: relative;
-	flex: 2;
-	align-self: stretch;
-}
-
-.cu-bar.tabbar .submit:last-child {
-	flex: 2.6;
-}
-
-.cu-bar.tabbar .submit+.submit {
-	flex: 2;
-}
-
-.cu-bar.tabbar.border .action::before {
-	content: " ";
-	width: 200%;
-	height: 200%;
-	position: absolute;
-	top: 0;
-	left: 0;
-	transform: scale(0.5);
-	transform-origin: 0 0;
-	border-right: 1upx solid rgba(0, 0, 0, 0.1);
-	z-index: 3;
-}
-
-.cu-bar.tabbar.border .action:last-child:before {
-	display: none;
-}
-
-.cu-bar.input {
-	padding-right: 20upx;
-	background-color: #ffffff;
-}
-
-.cu-bar.input input {
-	overflow: initial;
-	line-height: 64upx;
-	height: 64upx;
-	min-height: 64upx;
-	flex: 1;
-	font-size: 30upx;
-	margin: 0 20upx;
-}
-
-.cu-bar.input .action {
-	margin-left: 20upx;
-}
-
-.cu-bar.input .action [class*="cuIcon-"] {
-	font-size: 48upx;
-}
-
-.cu-bar.input input+.action {
-	margin-right: 20upx;
-	margin-left: 0upx;
-}
-
-.cu-bar.input .action:first-child [class*="cuIcon-"] {
-	margin-left: 0upx;
-}
-
-.cu-custom {
-	display: block;
-	position: relative;
-}
-
-.cu-custom .cu-bar .content {
-	width: calc(100% - 440upx);
-}
-
-/* #ifdef MP-ALIPAY */
-.cu-custom .cu-bar .action .cuIcon-back {
-	opacity: 0;
-}
-
-/* #endif */
-
-.cu-custom .cu-bar .content image {
-	height: 60upx;
-	width: 240upx;
-}
-
-.cu-custom .cu-bar {
-	min-height: 0px;
-	/* #ifdef MP-WEIXIN */
-	padding-right: 220upx;
-	/* #endif */
-	/* #ifdef MP-ALIPAY */
-	padding-right: 150upx;
-	/* #endif */
-	box-shadow: 0upx 0upx 0upx;
-	z-index: 9999;
-}
-
-.cu-custom .cu-bar .border-custom {
-	position: relative;
-	background: rgba(0, 0, 0, 0.15);
-	border-radius: 1000upx;
-	height: 30px;
-}
-
-.cu-custom .cu-bar .border-custom::after {
-	content: " ";
-	width: 200%;
-	height: 200%;
-	position: absolute;
-	top: 0;
-	left: 0;
-	border-radius: inherit;
-	transform: scale(0.5);
-	transform-origin: 0 0;
-	pointer-events: none;
-	box-sizing: border-box;
-	border: 1upx solid #ffffff;
-	opacity: 0.5;
-}
-
-.cu-custom .cu-bar .border-custom::before {
-	content: " ";
-	width: 1upx;
-	height: 110%;
-	position: absolute;
-	top: 22.5%;
-	left: 0;
-	right: 0;
-	margin: auto;
-	transform: scale(0.5);
-	transform-origin: 0 0;
-	pointer-events: none;
-	box-sizing: border-box;
-	opacity: 0.6;
-	background-color: #ffffff;
-}
-
-.cu-custom .cu-bar .border-custom text {
-	display: block;
-	flex: 1;
-	margin: auto !important;
-	text-align: center;
-	font-size: 34upx;
-}
-
-/* ==================
-         导航栏
- ==================== */
-
-.nav {
-	white-space: nowrap;
-}
-
-::-webkit-scrollbar {
-	display: none;
-}
-
-.nav .cu-item {
-	height: 90upx;
-	display: inline-block;
-	line-height: 90upx;
-	margin: 0 10upx;
-	padding: 0 20upx;
-}
-
-.nav .cu-item.cur {
-	border-bottom: 4upx solid;
-}
-
-/* ==================
-         时间轴
- ==================== */
-
-.cu-timeline {
-	display: block;
-	background-color: #ffffff;
-}
-
-.cu-timeline .cu-time {
-	width: 120upx;
-	text-align: center;
-	padding: 20upx 0;
-	font-size: 26upx;
-	color: #888;
-	display: block;
-}
-
-.cu-timeline>.cu-item {
-	padding: 30upx 30upx 30upx 120upx;
-	position: relative;
-	display: block;
-	z-index: 0;
-}
-
-.cu-timeline>.cu-item:not([class*="text-"]) {
-	color: #ccc;
-}
-
-.cu-timeline>.cu-item::after {
-	content: "";
-	display: block;
-	position: absolute;
-	width: 1upx;
-	background-color: #ddd;
-	left: 60upx;
-	height: 100%;
-	top: 0;
-	z-index: 8;
-}
-
-.cu-timeline>.cu-item::before {
-	font-family: "cuIcon";
-	display: block;
-	position: absolute;
-	top: 36upx;
-	z-index: 9;
-	background-color: #ffffff;
-	width: 50upx;
-	height: 50upx;
-	text-align: center;
-	border: none;
-	line-height: 50upx;
-	left: 36upx;
-}
-
-.cu-timeline>.cu-item:not([class*="cuIcon-"])::before {
-	content: "\e763";
-}
-
-.cu-timeline>.cu-item[class*="cuIcon-"]::before {
-	background-color: #ffffff;
-	width: 50upx;
-	height: 50upx;
-	text-align: center;
-	border: none;
-	line-height: 50upx;
-	left: 36upx;
-}
-
-.cu-timeline>.cu-item>.content {
-	padding: 30upx;
-	border-radius: 6upx;
-	display: block;
-	line-height: 1.6;
-}
-
-.cu-timeline>.cu-item>.content:not([class*="bg-"]) {
-	background-color: #f1f1f1;
-	color: #333333;
-}
-
-.cu-timeline>.cu-item>.content+.content {
-	margin-top: 20upx;
-}
-
-/* ==================
-         聊天
- ==================== */
-
-.cu-chat {
-	display: flex;
-	flex-direction: column;
-}
-
-.cu-chat .cu-item {
-	display: flex;
-	padding: 30upx 30upx 70upx;
-	position: relative;
-}
-
-.cu-chat .cu-item>.cu-avatar {
-	width: 80upx;
-	height: 80upx;
-}
-
-.cu-chat .cu-item>.main {
-	max-width: calc(100% - 260upx);
-	margin: 0 40upx;
-	display: flex;
-	align-items: center;
-}
-
-.cu-chat .cu-item>image {
-	height: 320upx;
-}
-
-.cu-chat .cu-item>.main .content {
-	padding: 20upx;
-	border-radius: 6upx;
-	display: inline-flex;
-	max-width: 100%;
-	align-items: center;
-	font-size: 30upx;
-	position: relative;
-	min-height: 80upx;
-	line-height: 40upx;
-	text-align: left;
-}
-
-.cu-chat .cu-item>.main .content:not([class*="bg-"]) {
-	background-color: #ffffff;
-	color: #333333;
-}
-
-.cu-chat .cu-item .date {
-	position: absolute;
-	font-size: 24upx;
-	color: #8799a3;
-	width: calc(100% - 320upx);
-	bottom: 20upx;
-	left: 160upx;
-}
-
-.cu-chat .cu-item .action {
-	padding: 0 30upx;
-	display: flex;
-	align-items: center;
-}
-
-.cu-chat .cu-item>.main .content::after {
-	content: "";
-	top: 27upx;
-	transform: rotate(45deg);
-	position: absolute;
-	z-index: 100;
-	display: inline-block;
-	overflow: hidden;
-	width: 24upx;
-	height: 24upx;
-	left: -12upx;
-	right: initial;
-	background-color: inherit;
-}
-
-.cu-chat .cu-item.self>.main .content::after {
-	left: auto;
-	right: -12upx;
-}
-
-.cu-chat .cu-item>.main .content::before {
-	content: "";
-	top: 30upx;
-	transform: rotate(45deg);
-	position: absolute;
-	z-index: -1;
-	display: inline-block;
-	overflow: hidden;
-	width: 24upx;
-	height: 24upx;
-	left: -12upx;
-	right: initial;
-	background-color: inherit;
-	filter: blur(5upx);
-	opacity: 0.3;
-}
-
-.cu-chat .cu-item>.main .content:not([class*="bg-"])::before {
-	background-color: #333333;
-	opacity: 0.1;
-}
-
-.cu-chat .cu-item.self>.main .content::before {
-	left: auto;
-	right: -12upx;
-}
-
-.cu-chat .cu-item.self {
-	justify-content: flex-end;
-	text-align: right;
-}
-
-.cu-chat .cu-info {
-	display: inline-block;
-	margin: 20upx auto;
-	font-size: 24upx;
-	padding: 8upx 12upx;
-	background-color: rgba(0, 0, 0, 0.2);
-	border-radius: 6upx;
-	color: #ffffff;
-	max-width: 400upx;
-	line-height: 1.4;
-}
-
-/* ==================
-         卡片
- ==================== */
-
-.cu-card {
-	display: block;
-	overflow: hidden;
-}
-
-.cu-card>.cu-item {
-	display: block;
-	background-color: #ffffff;
-	overflow: hidden;
-	border-radius: 10upx;
-	margin: 30upx;
-}
-
-.cu-card>.cu-item.shadow-blur {
-	overflow: initial;
-}
-
-.cu-card.no-card>.cu-item {
-	margin: 0upx;
-	border-radius: 0upx;
-}
-
-.cu-card .grid.grid-square {
-	margin-bottom: -20upx;
-}
-
-.cu-card.case .image {
-	position: relative;
-}
-
-.cu-card.case .image image {
-	width: 100%;
-}
-
-.cu-card.case .image .cu-tag {
-	position: absolute;
-	right: 0;
-	top: 0;
-}
-
-.cu-card.case .image .cu-bar {
-	position: absolute;
-	bottom: 0;
-	width: 100%;
-	background-color: transparent;
-	padding: 0upx 30upx;
-}
-
-.cu-card.case.no-card .image {
-	margin: 30upx 30upx 0;
-	overflow: hidden;
-	border-radius: 10upx;
-}
-
-.cu-card.dynamic {
-	display: block;
-}
-
-.cu-card.dynamic>.cu-item {
-	display: block;
-	background-color: #ffffff;
-	overflow: hidden;
-}
-
-.cu-card.dynamic>.cu-item>.text-content {
-	padding: 0 30upx 0;
-	max-height: 6.4em;
-	overflow: hidden;
-	font-size: 30upx;
-	margin-bottom: 20upx;
-}
-
-.cu-card.dynamic>.cu-item .square-img {
-	width: 100%;
-	height: 200upx;
-	border-radius: 6upx;
-}
-
-.cu-card.dynamic>.cu-item .only-img {
-	width: 100%;
-	height: 320upx;
-	border-radius: 6upx;
-}
-
-/* card.dynamic>.cu-item .comment {
-  padding: 20upx;
-  background-color: #f1f1f1;
-  margin: 0 30upx 30upx;
-  border-radius: 6upx;
-} */
-
-.cu-card.article {
-	display: block;
-}
-
-.cu-card.article>.cu-item {
-	padding-bottom: 30upx;
-}
-
-.cu-card.article>.cu-item .title {
-	font-size: 30upx;
-	font-weight: 900;
-	color: #333333;
-	line-height: 100upx;
-	padding: 0 30upx;
-}
-
-.cu-card.article>.cu-item .content {
-	display: flex;
-	padding: 0 30upx;
-}
-
-.cu-card.article>.cu-item .content>image {
-	width: 240upx;
-	height: 6.4em;
-	margin-right: 20upx;
-	border-radius: 6upx;
-}
-
-.cu-card.article>.cu-item .content .desc {
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-between;
-}
-
-.cu-card.article>.cu-item .content .text-content {
-	font-size: 28upx;
-	color: #888;
-	height: 4.8em;
-	overflow: hidden;
-}
-
-/* ==================
-         表单
- ==================== */
-
-.cu-form-group {
-	background-color: #ffffff;
-	padding: 1upx 30upx;
-	display: flex;
-	align-items: center;
-	min-height: 100upx;
-	justify-content: space-between;
-}
-
-.cu-form-group+.cu-form-group {
-	border-top: 1upx solid #eee;
-}
-
-.cu-form-group .title {
-	text-align: justify;
-	padding-right: 30upx;
-	font-size: 30upx;
-	position: relative;
-	height: 60upx;
-	line-height: 60upx;
-}
-
-.cu-form-group input {
-	flex: 1;
-	font-size: 30upx;
-	color: #555;
-	padding-right: 20upx;
-}
-
-.cu-form-group>text[class*="cuIcon-"] {
-	font-size: 36upx;
-	padding: 0;
-	box-sizing: border-box;
-}
-
-.cu-form-group textarea {
-	margin: 32upx 0 30upx;
-	height: 4.6em;
-	width: 100%;
-	line-height: 1.2em;
-	flex: 1;
-	font-size: 28upx;
-	padding: 0;
-}
-
-.cu-form-group.align-start .title {
-	height: 1em;
-	margin-top: 32upx;
-	line-height: 1em;
-}
-
-.cu-form-group picker {
-	flex: 1;
-	padding-right: 40upx;
-	overflow: hidden;
-	position: relative;
-}
-
-.cu-form-group picker .picker {
-	line-height: 100upx;
-	font-size: 28upx;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	overflow: hidden;
-	width: 100%;
-	text-align: right;
-}
-
-.cu-form-group picker::after {
-	font-family: cuIcon;
-	display: block;
-	content: "\e6a3";
-	position: absolute;
-	font-size: 34upx;
-	color: #8799a3;
-	line-height: 100upx;
-	width: 60upx;
-	text-align: center;
-	top: 0;
-	bottom: 0;
-	right: -20upx;
-	margin: auto;
-}
-
-.cu-form-group textarea[disabled],
-.cu-form-group textarea[disabled] .placeholder {
-	color: transparent;
-}
-
-/* ==================
-         模态窗口
- ==================== */
-
-.cu-modal {
-	position: fixed;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	z-index: 1110;
-	opacity: 0;
-	outline: 0;
-	text-align: center;
-	-ms-transform: scale(1.185);
-	transform: scale(1.185);
-	backface-visibility: hidden;
-	perspective: 2000upx;
-	background: rgba(0, 0, 0, 0.6);
-	transition: all 0.3s ease-in-out 0s;
-	pointer-events: none;
-}
-
-.cu-modal::before {
-	content: "\200B";
-	display: inline-block;
-	height: 100%;
-	vertical-align: middle;
-}
-
-.cu-modal.show {
-	opacity: 1;
-	transition-duration: 0.3s;
-	-ms-transform: scale(1);
-	transform: scale(1);
-	overflow-x: hidden;
-	overflow-y: auto;
-	pointer-events: auto;
-}
-
-.cu-dialog {
-	position: relative;
-	display: inline-block;
-	vertical-align: middle;
-	margin-left: auto;
-	margin-right: auto;
-	width: 680upx;
-	max-width: 100%;
-	background-color: #f8f8f8;
-	border-radius: 10upx;
-	overflow: hidden;
-}
-
-.cu-modal.bottom-modal::before {
-	vertical-align: bottom;
-}
-
-.cu-modal.bottom-modal .cu-dialog {
-	width: 100%;
-	border-radius: 0;
-}
-
-.cu-modal.bottom-modal {
-	margin-bottom: -1000upx;
-}
-
-.cu-modal.bottom-modal.show {
-	margin-bottom: 0;
-}
-
-.cu-modal.drawer-modal {
-	transform: scale(1);
-	display: flex;
-}
-
-.cu-modal.drawer-modal .cu-dialog {
-	height: 100%;
-	min-width: 200upx;
-	border-radius: 0;
-	margin: initial;
-	transition-duration: 0.3s;
-}
-
-.cu-modal.drawer-modal.justify-start .cu-dialog {
-	transform: translateX(-100%);
-}
-
-.cu-modal.drawer-modal.justify-end .cu-dialog {
-	transform: translateX(100%);
-}
-
-.cu-modal.drawer-modal.show .cu-dialog {
-	transform: translateX(0%);
-}
-.cu-modal .cu-dialog>.cu-bar:first-child .action{
-  min-width: 100rpx;
-  margin-right: 0;
-  min-height: 100rpx;
-}
-/* ==================
-         轮播
- ==================== */
-swiper .a-swiper-dot {
-	display: inline-block;
-	width: 16upx;
-	height: 16upx;
-	background: rgba(0, 0, 0, .3);
-	border-radius: 50%;
-	vertical-align: middle;
-}
-
-swiper[class*="-dot"] .wx-swiper-dots,
-swiper[class*="-dot"] .a-swiper-dots,
-swiper[class*="-dot"] .uni-swiper-dots {
-	display: flex;
-	align-items: center;
-	width: 100%;
-	justify-content: center;
-}
-
-swiper.square-dot .wx-swiper-dot,
-swiper.square-dot .a-swiper-dot,
-swiper.square-dot .uni-swiper-dot {
-	background-color: #ffffff;
-	opacity: 0.4;
-	width: 10upx;
-	height: 10upx;
-	border-radius: 20upx;
-	margin: 0 8upx !important;
-}
-
-swiper.square-dot .wx-swiper-dot.wx-swiper-dot-active,
-swiper.square-dot .a-swiper-dot.a-swiper-dot-active,
-swiper.square-dot .uni-swiper-dot.uni-swiper-dot-active {
-	opacity: 1;
-	width: 30upx;
-}
-
-swiper.round-dot .wx-swiper-dot,
-swiper.round-dot .a-swiper-dot,
-swiper.round-dot .uni-swiper-dot {
-	width: 10upx;
-	height: 10upx;
-	position: relative;
-	margin: 4upx 8upx !important;
-}
-
-swiper.round-dot .wx-swiper-dot.wx-swiper-dot-active::after,
-swiper.round-dot .a-swiper-dot.a-swiper-dot-active::after,
-swiper.round-dot .uni-swiper-dot.uni-swiper-dot-active::after {
-	content: "";
-	position: absolute;
-	width: 10upx;
-	height: 10upx;
-	top: 0upx;
-	left: 0upx;
-	right: 0;
-	bottom: 0;
-	margin: auto;
-	background-color: #ffffff;
-	border-radius: 20upx;
-}
-
-swiper.round-dot .wx-swiper-dot.wx-swiper-dot-active,
-swiper.round-dot .a-swiper-dot.a-swiper-dot-active,
-swiper.round-dot .uni-swiper-dot.uni-swiper-dot-active {
-	width: 18upx;
-	height: 18upx;
-}
-
-.screen-swiper {
-	min-height: 375upx;
-}
-
-.screen-swiper image,
-.screen-swiper video,
-.swiper-item image,
-.swiper-item video {
-	width: 100%;
-	display: block;
-	height: 100%;
-	margin: 0;
-	pointer-events: none;
-}
-
-.card-swiper {
-	height: 420upx !important;
-}
-
-.card-swiper swiper-item {
-	width: 610upx !important;
-	left: 70upx;
-	box-sizing: border-box;
-	padding: 40upx 0upx 70upx;
-	overflow: initial;
-}
-
-.card-swiper swiper-item .swiper-item {
-	width: 100%;
-	display: block;
-	height: 100%;
-	border-radius: 10upx;
-	transform: scale(0.9);
-	transition: all 0.2s ease-in 0s;
-	overflow: hidden;
-}
-
-.card-swiper swiper-item.cur .swiper-item {
-	transform: none;
-	transition: all 0.2s ease-in 0s;
-}
-
-
-.tower-swiper {
-	height: 420upx;
-	position: relative;
-	max-width: 750upx;
-	overflow: hidden;
-}
-
-.tower-swiper .tower-item {
-	position: absolute;
-	width: 300upx;
-	height: 380upx;
-	top: 0;
-	bottom: 0;
-	left: 50%;
-	margin: auto;
-	transition: all 0.2s ease-in 0s;
-	opacity: 1;
-}
-
-.tower-swiper .tower-item.none {
-	opacity: 0;
-}
-
-.tower-swiper .tower-item .swiper-item {
-	width: 100%;
-	height: 100%;
-	border-radius: 6upx;
-	overflow: hidden;
-}
-
-/* ==================
-          步骤条
- ==================== */
-
-.cu-steps {
-	display: flex;
-}
-
-scroll-view.cu-steps {
-	display: block;
-	white-space: nowrap;
-}
-
-scroll-view.cu-steps .cu-item {
-	display: inline-block;
-}
-
-.cu-steps .cu-item {
-	flex: 1;
-	text-align: center;
-	position: relative;
-	min-width: 100upx;
-}
-
-.cu-steps .cu-item:not([class*="text-"]) {
-	color: #8799a3;
-}
-
-.cu-steps .cu-item [class*="cuIcon-"],
-.cu-steps .cu-item .num {
-	display: block;
-	font-size: 40upx;
-	line-height: 80upx;
-}
-
-.cu-steps .cu-item::before,
-.cu-steps .cu-item::after,
-.cu-steps.steps-arrow .cu-item::before,
-.cu-steps.steps-arrow .cu-item::after {
-	content: "";
-	display: block;
-	position: absolute;
-	height: 0px;
-	width: calc(100% - 80upx);
-	border-bottom: 1px solid #ccc;
-	left: calc(0px - (100% - 80upx) / 2);
-	top: 40upx;
-	z-index: 0;
-}
-
-.cu-steps.steps-arrow .cu-item::before,
-.cu-steps.steps-arrow .cu-item::after {
-	content: "\e6a3";
-	font-family: 'cuIcon';
-	height: 30upx;
-	border-bottom-width: 0px;
-	line-height: 30upx;
-	top: 0;
-	bottom: 0;
-	margin: auto;
-	color: #ccc;
-}
-
-.cu-steps.steps-bottom .cu-item::before,
-.cu-steps.steps-bottom .cu-item::after {
-	bottom: 40upx;
-	top: initial;
-}
-
-.cu-steps .cu-item::after {
-	border-bottom: 1px solid currentColor;
-	width: 0px;
-	transition: all 0.3s ease-in-out 0s;
-}
-
-.cu-steps .cu-item[class*="text-"]::after {
-	width: calc(100% - 80upx);
-	color: currentColor;
-}
-
-.cu-steps .cu-item:first-child::before,
-.cu-steps .cu-item:first-child::after {
-	display: none;
-}
-
-.cu-steps .cu-item .num {
-	width: 40upx;
-	height: 40upx;
-	border-radius: 50%;
-	line-height: 40upx;
-	margin: 20upx auto;
-	font-size: 24upx;
-	border: 1px solid currentColor;
-	position: relative;
-	overflow: hidden;
-}
-
-.cu-steps .cu-item[class*="text-"] .num {
-	background-color: currentColor;
-}
-
-.cu-steps .cu-item .num::before,
-.cu-steps .cu-item .num::after {
-	content: attr(data-index);
-	position: absolute;
-	left: 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	margin: auto;
-	transition: all 0.3s ease-in-out 0s;
-	transform: translateY(0upx);
-}
-
-.cu-steps .cu-item[class*="text-"] .num::before {
-	transform: translateY(-40upx);
-	color: #ffffff;
-}
-
-.cu-steps .cu-item .num::after {
-	transform: translateY(40upx);
-	color: #ffffff;
-	transition: all 0.3s ease-in-out 0s;
-}
-
-.cu-steps .cu-item[class*="text-"] .num::after {
-	content: "\e645";
-	font-family: 'cuIcon';
-	color: #ffffff;
-	transform: translateY(0upx);
-}
-
-.cu-steps .cu-item[class*="text-"] .num.err::after {
-	content: "\e646";
-}
-
-/* ==================
-          布局
- ==================== */
-
-/*  -- flex弹性布局 -- */
-
-.flex {
-	display: flex;
-}
-
-.basis-xs {
-	flex-basis: 20%;
-}
-
-.basis-sm {
-	flex-basis: 40%;
-}
-
-.basis-df {
-	flex-basis: 50%;
-}
-
-.basis-lg {
-	flex-basis: 60%;
-}
-
-.basis-xl {
-	flex-basis: 80%;
-}
-
-.flex-sub {
-	flex: 1;
-}
-
-.flex-twice {
-	flex: 2;
-}
-
-.flex-treble {
-	flex: 3;
-}
-
-.flex-direction {
-	flex-direction: column;
-}
-
-.flex-wrap {
-	flex-wrap: wrap;
-}
-
-.align-start {
-	align-items: flex-start;
-}
-
-.align-end {
-	align-items: flex-end;
-}
-
-.align-center {
-	align-items: center;
-}
-
-.align-stretch {
-	align-items: stretch;
-}
-
-.self-start {
-	align-self: flex-start;
-}
-
-.self-center {
-	align-self: flex-center;
-}
-
-.self-end {
-	align-self: flex-end;
-}
-
-.self-stretch {
-	align-self: stretch;
-}
-
-.align-stretch {
-	align-items: stretch;
-}
-
-.justify-start {
-	justify-content: flex-start;
-}
-
-.justify-end {
-	justify-content: flex-end;
-}
-
-.justify-center {
-	justify-content: center;
-}
-
-.justify-between {
-	justify-content: space-between;
-}
-
-.justify-around {
-	justify-content: space-around;
-}
-
-/* grid布局 */
-
-.grid {
-	display: flex;
-	flex-wrap: wrap;
-}
-
-.grid.grid-square {
-	overflow: hidden;
-}
-
-.grid.grid-square .cu-tag {
-	position: absolute;
-	right: 0;
-	top: 0;
-	border-bottom-left-radius: 6upx;
-	padding: 6upx 12upx;
-	height: auto;
-	background-color: rgba(0, 0, 0, 0.5);
-}
-
-.grid.grid-square>view>text[class*="cuIcon-"] {
-	font-size: 52upx;
-	position: absolute;
-	color: #8799a3;
-	margin: auto;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	flex-direction: column;
-}
-
-.grid.grid-square>view {
-	margin-right: 20upx;
-	margin-bottom: 20upx;
-	border-radius: 6upx;
-	position: relative;
-	overflow: hidden;
-}
-.grid.grid-square>view.bg-img image {
-	width: 100%;
-	height: 100%;
-	position: absolute;
-}
-.grid.col-1.grid-square>view {
-	padding-bottom: 100%;
-	height: 0;
-	margin-right: 0;
-}
-
-.grid.col-2.grid-square>view {
-	padding-bottom: calc((100% - 20upx)/2);
-	height: 0;
-	width: calc((100% - 20upx)/2);
-}
-
-.grid.col-3.grid-square>view {
-	padding-bottom: calc((100% - 40upx)/3);
-	height: 0;
-	width: calc((100% - 40upx)/3);
-}
-
-.grid.col-4.grid-square>view {
-	padding-bottom: calc((100% - 60upx)/4);
-	height: 0;
-	width: calc((100% - 60upx)/4);
-}
-
-.grid.col-5.grid-square>view {
-	padding-bottom: calc((100% - 80upx)/5);
-	height: 0;
-	width: calc((100% - 80upx)/5);
-}
-
-.grid.col-2.grid-square>view:nth-child(2n),
-.grid.col-3.grid-square>view:nth-child(3n),
-.grid.col-4.grid-square>view:nth-child(4n),
-.grid.col-5.grid-square>view:nth-child(5n) {
-	margin-right: 0;
-}
-
-.grid.col-1>view {
-	width: 100%;
-}
-
-.grid.col-2>view {
-	width: 50%;
-}
-
-.grid.col-3>view {
-	width: 33.33%;
-}
-
-.grid.col-4>view {
-	width: 25%;
-}
-
-.grid.col-5>view {
-	width: 20%;
-}
-
-/*  -- 内外边距 -- */
-
-.margin-0 {
-	margin: 0;
-}
-
-.margin-xs {
-	margin: 10upx;
-}
-
-.margin-sm {
-	margin: 20upx;
-}
-
-.margin {
-	margin: 30upx;
-}
-
-.margin-lg {
-	margin: 40upx;
-}
-
-.margin-xl {
-	margin: 50upx;
-}
-
-.margin-top-xs {
-	margin-top: 10upx;
-}
-
-.margin-top-sm {
-	margin-top: 20upx;
-}
-
-.margin-top {
-	margin-top: 30upx;
-}
-
-.margin-top-lg {
-	margin-top: 40upx;
-}
-
-.margin-top-xl {
-	margin-top: 50upx;
-}
-
-.margin-right-xs {
-	margin-right: 10upx;
-}
-
-.margin-right-sm {
-	margin-right: 20upx;
-}
-
-.margin-right {
-	margin-right: 30upx;
-}
-
-.margin-right-lg {
-	margin-right: 40upx;
-}
-
-.margin-right-xl {
-	margin-right: 50upx;
-}
-
-.margin-bottom-xs {
-	margin-bottom: 10upx;
-}
-
-.margin-bottom-sm {
-	margin-bottom: 20upx;
-}
-
-.margin-bottom {
-	margin-bottom: 30upx;
-}
-
-.margin-bottom-lg {
-	margin-bottom: 40upx;
-}
-
-.margin-bottom-xl {
-	margin-bottom: 50upx;
-}
-
-.margin-left-xs {
-	margin-left: 10upx;
-}
-
-.margin-left-sm {
-	margin-left: 20upx;
-}
-
-.margin-left {
-	margin-left: 30upx;
-}
-
-.margin-left-lg {
-	margin-left: 40upx;
-}
-
-.margin-left-xl {
-	margin-left: 50upx;
-}
-
-.margin-lr-xs {
-	margin-left: 10upx;
-	margin-right: 10upx;
-}
-
-.margin-lr-sm {
-	margin-left: 20upx;
-	margin-right: 20upx;
-}
-
-.margin-lr {
-	margin-left: 30upx;
-	margin-right: 30upx;
-}
-
-.margin-lr-lg {
-	margin-left: 40upx;
-	margin-right: 40upx;
-}
-
-.margin-lr-xl {
-	margin-left: 50upx;
-	margin-right: 50upx;
-}
-
-.margin-tb-xs {
-	margin-top: 10upx;
-	margin-bottom: 10upx;
-}
-
-.margin-tb-sm {
-	margin-top: 20upx;
-	margin-bottom: 20upx;
-}
-
-.margin-tb {
-	margin-top: 30upx;
-	margin-bottom: 30upx;
-}
-
-.margin-tb-lg {
-	margin-top: 40upx;
-	margin-bottom: 40upx;
-}
-
-.margin-tb-xl {
-	margin-top: 50upx;
-	margin-bottom: 50upx;
-}
-
-.padding-0 {
-	padding: 0;
-}
-
-.padding-xs {
-	padding: 10upx;
-}
-
-.padding-sm {
-	padding: 20upx;
-}
-
-.padding {
-	padding: 30upx;
-}
-
-.padding-lg {
-	padding: 40upx;
-}
-
-.padding-xl {
-	padding: 50upx;
-}
-
-.padding-top-xs {
-	padding-top: 10upx;
-}
-
-.padding-top-sm {
-	padding-top: 20upx;
-}
-
-.padding-top {
-	padding-top: 30upx;
-}
-
-.padding-top-lg {
-	padding-top: 40upx;
-}
-
-.padding-top-xl {
-	padding-top: 50upx;
-}
-
-.padding-right-xs {
-	padding-right: 10upx;
-}
-
-.padding-right-sm {
-	padding-right: 20upx;
-}
-
-.padding-right {
-	padding-right: 30upx;
-}
-
-.padding-right-lg {
-	padding-right: 40upx;
-}
-
-.padding-right-xl {
-	padding-right: 50upx;
-}
-
-.padding-bottom-xs {
-	padding-bottom: 10upx;
-}
-
-.padding-bottom-sm {
-	padding-bottom: 20upx;
-}
-
-.padding-bottom {
-	padding-bottom: 30upx;
-}
-
-.padding-bottom-lg {
-	padding-bottom: 40upx;
-}
-
-.padding-bottom-xl {
-	padding-bottom: 50upx;
-}
-
-.padding-left-xs {
-	padding-left: 10upx;
-}
-
-.padding-left-sm {
-	padding-left: 20upx;
-}
-
-.padding-left {
-	padding-left: 30upx;
-}
-
-.padding-left-lg {
-	padding-left: 40upx;
-}
-
-.padding-left-xl {
-	padding-left: 50upx;
-}
-
-.padding-lr-xs {
-	padding-left: 10upx;
-	padding-right: 10upx;
-}
-
-.padding-lr-sm {
-	padding-left: 20upx;
-	padding-right: 20upx;
-}
-
-.padding-lr {
-	padding-left: 30upx;
-	padding-right: 30upx;
-}
-
-.padding-lr-lg {
-	padding-left: 40upx;
-	padding-right: 40upx;
-}
-
-.padding-lr-xl {
-	padding-left: 50upx;
-	padding-right: 50upx;
-}
-
-.padding-tb-xs {
-	padding-top: 10upx;
-	padding-bottom: 10upx;
-}
-
-.padding-tb-sm {
-	padding-top: 20upx;
-	padding-bottom: 20upx;
-}
-
-.padding-tb {
-	padding-top: 30upx;
-	padding-bottom: 30upx;
-}
-
-.padding-tb-lg {
-	padding-top: 40upx;
-	padding-bottom: 40upx;
-}
-
-.padding-tb-xl {
-	padding-top: 50upx;
-	padding-bottom: 50upx;
-}
-
-/* -- 浮动 --  */
-
-.cf::after,
-.cf::before {
-	content: " ";
-	display: table;
-}
-
-.cf::after {
-	clear: both;
-}
-
-.fl {
-	float: left;
-}
-
-.fr {
-	float: right;
-}
-
-/* ==================
-          背景
- ==================== */
-
-.line-red::after,
-.lines-red::after {
-	border-color: #e54d42;
-}
-
-.line-orange::after,
-.lines-orange::after {
-	border-color: #f37b1d;
-}
-
-.line-yellow::after,
-.lines-yellow::after {
-	border-color: #fbbd08;
-}
-
-.line-olive::after,
-.lines-olive::after {
-	border-color: #8dc63f;
-}
-
-.line-green::after,
-.lines-green::after {
-	border-color: #39b54a;
-}
-
-.line-cyan::after,
-.lines-cyan::after {
-	border-color: #1cbbb4;
-}
-
-.line-blue::after,
-.lines-blue::after {
-	border-color: #0081ff;
-}
-
-.line-purple::after,
-.lines-purple::after {
-	border-color: #6739b6;
-}
-
-.line-mauve::after,
-.lines-mauve::after {
-	border-color: #9c26b0;
-}
-
-.line-pink::after,
-.lines-pink::after {
-	border-color: #e03997;
-}
-
-.line-brown::after,
-.lines-brown::after {
-	border-color: #a5673f;
-}
-
-.line-grey::after,
-.lines-grey::after {
-	border-color: #8799a3;
-}
-
-.line-gray::after,
-.lines-gray::after {
-	border-color: #aaaaaa;
-}
-
-.line-black::after,
-.lines-black::after {
-	border-color: #333333;
-}
-
-.line-white::after,
-.lines-white::after {
-	border-color: #ffffff;
-}
-
-.bg-red {
-	background-color: #e54d42;
-	color: #ffffff;
-}
-
-.bg-orange {
-	background-color: #f37b1d;
-	color: #ffffff;
-}
-
-.bg-yellow {
-	background-color: #fbbd08;
-	color: #333333;
-}
-
-.bg-olive {
-	background-color: #8dc63f;
-	color: #ffffff;
-}
-
-.bg-green {
-	background-color: #39b54a;
-	color: #ffffff;
-}
-
-.bg-cyan {
-	background-color: #1cbbb4;
-	color: #ffffff;
-}
-
-.bg-blue {
-	background-color: #0081ff;
-	color: #ffffff;
-}
-
-.bg-purple {
-	background-color: #6739b6;
-	color: #ffffff;
-}
-
-.bg-mauve {
-	background-color: #9c26b0;
-	color: #ffffff;
-}
-
-.bg-pink {
-	background-color: #e03997;
-	color: #ffffff;
-}
-
-.bg-brown {
-	background-color: #a5673f;
-	color: #ffffff;
-}
-
-.bg-grey {
-	background-color: #8799a3;
-	color: #ffffff;
-}
-
-.bg-gray {
-	background-color: #f0f0f0;
-	color: #333333;
-}
-
-.bg-black {
-	background-color: #333333;
-	color: #ffffff;
-}
-
-.bg-white {
-	background-color: #ffffff;
-	color: #666666;
-}
-
-.bg-shadeTop {
-	background-image: linear-gradient(rgba(0, 0, 0, 1), rgba(0, 0, 0, 0.01));
-	color: #ffffff;
-}
-
-.bg-shadeBottom {
-	background-image: linear-gradient(rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 1));
-	color: #ffffff;
-}
-
-.bg-red.light {
-	color: #e54d42;
-	background-color: #fadbd9;
-}
-
-.bg-orange.light {
-	color: #f37b1d;
-	background-color: #fde6d2;
-}
-
-.bg-yellow.light {
-	color: #fbbd08;
-	background-color: #fef2ced2;
-}
-
-.bg-olive.light {
-	color: #8dc63f;
-	background-color: #e8f4d9;
-}
-
-.bg-green.light {
-	color: #39b54a;
-	background-color: #d7f0dbff;
-}
-
-.bg-cyan.light {
-	color: #1cbbb4;
-	background-color: #d2f1f0;
-}
-
-.bg-blue.light {
-	color: #0081ff;
-	background-color: #cce6ff;
-}
-
-.bg-purple.light {
-	color: #6739b6;
-	background-color: #e1d7f0;
-}
-
-.bg-mauve.light {
-	color: #9c26b0;
-	background-color: #ebd4ef;
-}
-
-.bg-pink.light {
-	color: #e03997;
-	background-color: #f9d7ea;
-}
-
-.bg-brown.light {
-	color: #a5673f;
-	background-color: #ede1d9;
-}
-
-.bg-grey.light {
-	color: #8799a3;
-	background-color: #e7ebed;
-}
-
-.bg-gradual-red {
-	background-image: linear-gradient(45deg, #f43f3b, #ec008c);
-	color: #ffffff;
-}
-
-.bg-gradual-orange {
-	background-image: linear-gradient(45deg, #ff9700, #ed1c24);
-	color: #ffffff;
-}
-
-.bg-gradual-green {
-	background-image: linear-gradient(45deg, #39b54a, #8dc63f);
-	color: #ffffff;
-}
-
-.bg-gradual-purple {
-	background-image: linear-gradient(45deg, #9000ff, #5e00ff);
-	color: #ffffff;
-}
-
-.bg-gradual-pink {
-	background-image: linear-gradient(45deg, #ec008c, #6739b6);
-	color: #ffffff;
-}
-
-.bg-gradual-blue {
-	background-image: linear-gradient(45deg, #0081ff, #1cbbb4);
-	color: #ffffff;
-}
-
-.shadow[class*="-red"] {
-	box-shadow: 6upx 6upx 8upx rgba(204, 69, 59, 0.2);
-}
-
-.shadow[class*="-orange"] {
-	box-shadow: 6upx 6upx 8upx rgba(217, 109, 26, 0.2);
-}
-
-.shadow[class*="-yellow"] {
-	box-shadow: 6upx 6upx 8upx rgba(224, 170, 7, 0.2);
-}
-
-.shadow[class*="-olive"] {
-	box-shadow: 6upx 6upx 8upx rgba(124, 173, 55, 0.2);
-}
-
-.shadow[class*="-green"] {
-	box-shadow: 6upx 6upx 8upx rgba(48, 156, 63, 0.2);
-}
-
-.shadow[class*="-cyan"] {
-	box-shadow: 6upx 6upx 8upx rgba(28, 187, 180, 0.2);
-}
-
-.shadow[class*="-blue"] {
-	box-shadow: 6upx 6upx 8upx rgba(0, 102, 204, 0.2);
-}
-
-.shadow[class*="-purple"] {
-	box-shadow: 6upx 6upx 8upx rgba(88, 48, 156, 0.2);
-}
-
-.shadow[class*="-mauve"] {
-	box-shadow: 6upx 6upx 8upx rgba(133, 33, 150, 0.2);
-}
-
-.shadow[class*="-pink"] {
-	box-shadow: 6upx 6upx 8upx rgba(199, 50, 134, 0.2);
-}
-
-.shadow[class*="-brown"] {
-	box-shadow: 6upx 6upx 8upx rgba(140, 88, 53, 0.2);
-}
-
-.shadow[class*="-grey"] {
-	box-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
-}
-
-.shadow[class*="-gray"] {
-	box-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
-}
-
-.shadow[class*="-black"] {
-	box-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
-}
-
-.shadow[class*="-white"] {
-	box-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
-}
-
-.text-shadow[class*="-red"] {
-	text-shadow: 6upx 6upx 8upx rgba(204, 69, 59, 0.2);
-}
-
-.text-shadow[class*="-orange"] {
-	text-shadow: 6upx 6upx 8upx rgba(217, 109, 26, 0.2);
-}
-
-.text-shadow[class*="-yellow"] {
-	text-shadow: 6upx 6upx 8upx rgba(224, 170, 7, 0.2);
-}
-
-.text-shadow[class*="-olive"] {
-	text-shadow: 6upx 6upx 8upx rgba(124, 173, 55, 0.2);
-}
-
-.text-shadow[class*="-green"] {
-	text-shadow: 6upx 6upx 8upx rgba(48, 156, 63, 0.2);
-}
-
-.text-shadow[class*="-cyan"] {
-	text-shadow: 6upx 6upx 8upx rgba(28, 187, 180, 0.2);
-}
-
-.text-shadow[class*="-blue"] {
-	text-shadow: 6upx 6upx 8upx rgba(0, 102, 204, 0.2);
-}
-
-.text-shadow[class*="-purple"] {
-	text-shadow: 6upx 6upx 8upx rgba(88, 48, 156, 0.2);
-}
-
-.text-shadow[class*="-mauve"] {
-	text-shadow: 6upx 6upx 8upx rgba(133, 33, 150, 0.2);
-}
-
-.text-shadow[class*="-pink"] {
-	text-shadow: 6upx 6upx 8upx rgba(199, 50, 134, 0.2);
-}
-
-.text-shadow[class*="-brown"] {
-	text-shadow: 6upx 6upx 8upx rgba(140, 88, 53, 0.2);
-}
-
-.text-shadow[class*="-grey"] {
-	text-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
-}
-
-.text-shadow[class*="-gray"] {
-	text-shadow: 6upx 6upx 8upx rgba(114, 130, 138, 0.2);
-}
-
-.text-shadow[class*="-black"] {
-	text-shadow: 6upx 6upx 8upx rgba(26, 26, 26, 0.2);
-}
-
-.bg-img {
-	background-size: cover;
-	background-position: center;
-	background-repeat: no-repeat;
-}
-
-.bg-mask {
-	background-color: #333333;
-	position: relative;
-}
-
-.bg-mask::after {
-	content: "";
-	border-radius: inherit;
-	width: 100%;
-	height: 100%;
-	display: block;
-	background-color: rgba(0, 0, 0, 0.4);
-	position: absolute;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	top: 0;
-}
-
-.bg-mask view,
-.bg-mask cover-view {
-	z-index: 5;
-	position: relative;
-}
-
-.bg-video {
-	position: relative;
-}
-
-.bg-video video {
-	display: block;
-	height: 100%;
-	width: 100%;
-	-o-object-fit: cover;
-	object-fit: cover;
-	position: absolute;
-	top: 0;
-	z-index: 0;
-	pointer-events: none;
-}
-
-/* ==================
-          文本
- ==================== */
-
-.text-xs {
-	font-size: 20upx;
-}
-
-.text-sm {
-	font-size: 24upx;
-}
-
-.text-df {
-	font-size: 28upx;
-}
-
-.text-lg {
-	font-size: 32upx;
-}
-
-.text-xl {
-	font-size: 36upx;
-}
-
-.text-xxl {
-	font-size: 44upx;
-}
-
-.text-sl {
-	font-size: 80upx;
-}
-
-.text-xsl {
-	font-size: 120upx;
-}
-
-.text-Abc {
-	text-transform: Capitalize;
-}
-
-.text-ABC {
-	text-transform: Uppercase;
-}
-
-.text-abc {
-	text-transform: Lowercase;
-}
-
-.text-price::before {
-	content: "¥";
-	font-size: 80%;
-	margin-right: 4upx;
-}
-
-.text-cut {
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	overflow: hidden;
-}
-
-.text-bold {
-	font-weight: bold;
-}
-
-.text-center {
-	text-align: center;
-}
-
-.text-content {
-	line-height: 1.6;
-}
-
-.text-left {
-	text-align: left;
-}
-
-.text-right {
-	text-align: right;
-}
-
-.text-red,
-.line-red,
-.lines-red {
-	color: #e54d42;
-}
-
-.text-orange,
-.line-orange,
-.lines-orange {
-	color: #f37b1d;
-}
-
-.text-yellow,
-.line-yellow,
-.lines-yellow {
-	color: #fbbd08;
-}
-
-.text-olive,
-.line-olive,
-.lines-olive {
-	color: #8dc63f;
-}
-
-.text-green,
-.line-green,
-.lines-green {
-	color: #39b54a;
-}
-
-.text-cyan,
-.line-cyan,
-.lines-cyan {
-	color: #1cbbb4;
-}
-
-.text-blue,
-.line-blue,
-.lines-blue {
-	color: #0081ff;
-}
-
-.text-purple,
-.line-purple,
-.lines-purple {
-	color: #6739b6;
-}
-
-.text-mauve,
-.line-mauve,
-.lines-mauve {
-	color: #9c26b0;
-}
-
-.text-pink,
-.line-pink,
-.lines-pink {
-	color: #e03997;
-}
-
-.text-brown,
-.line-brown,
-.lines-brown {
-	color: #a5673f;
-}
-
-.text-grey,
-.line-grey,
-.lines-grey {
-	color: #8799a3;
-}
-
-.text-gray,
-.line-gray,
-.lines-gray {
-	color: #aaaaaa;
-}
-
-.text-black,
-.line-black,
-.lines-black {
-	color: #333333;
-}
-
-.text-white,
-.line-white,
-.lines-white {
-	color: #ffffff;
-}
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/common/aau.png b/CoreCms.Net.Uni-App/CoreShop/static/images/common/aau.png
deleted file mode 100644
index f4d97dc39c88ef33a0c44d5d8bb9716da532754e..0000000000000000000000000000000000000000
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/common/aau.png and /dev/null differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/common/back-black.png b/CoreCms.Net.Uni-App/CoreShop/static/images/common/back-black.png
deleted file mode 100644
index f88646a6e03f78e701a7878e1b6159e3291ef2d7..0000000000000000000000000000000000000000
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/common/back-black.png and /dev/null differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/common/ic-car.png b/CoreCms.Net.Uni-App/CoreShop/static/images/common/ic-car.png
deleted file mode 100644
index dbde15a9a93828a6536f0458a01e084d09bd7241..0000000000000000000000000000000000000000
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/common/ic-car.png and /dev/null differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/distribution/wxh5.png b/CoreCms.Net.Uni-App/CoreShop/static/images/distribution/wxh5.png
index 1f0b2b4753f3b59b01646bf59a3a35dedc49c674..01e10e447e950957e672d63dc39723ad0456661d 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/distribution/wxh5.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/distribution/wxh5.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/distribution/wxxcx.png b/CoreCms.Net.Uni-App/CoreShop/static/images/distribution/wxxcx.png
index 30b7f5edfdc0e4656866e20a8beda0bf76225000..a46301f37d6bd569f05d866b22a6410476e5920b 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/distribution/wxxcx.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/distribution/wxxcx.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/good/aiu.png b/CoreCms.Net.Uni-App/CoreShop/static/images/good/aiu.png
deleted file mode 100644
index 45f3a1f29ffead8f1026203df6ac172129928e16..0000000000000000000000000000000000000000
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/good/aiu.png and /dev/null differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/login/logo_bg.png b/CoreCms.Net.Uni-App/CoreShop/static/images/login/logo_bg.png
deleted file mode 100644
index 636f1c12ee8776ff06453dc43b549047a20491fa..0000000000000000000000000000000000000000
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/login/logo_bg.png and /dev/null differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/logo/logo.png b/CoreCms.Net.Uni-App/CoreShop/static/images/logo/logo.png
index acedeca6f9c04c6ea82b1313686fe079ad854242..ca1b455376d8c0340964034d6731ba4686505c37 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/logo/logo.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/logo/logo.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/logo/logo2.png b/CoreCms.Net.Uni-App/CoreShop/static/images/logo/logo2.png
index 8865f54daa104d99e6b17d28fbb1f8bb957c58c0..167663b5f18158b230e79e7f2700b6edf001b497 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/logo/logo2.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/logo/logo2.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/map/location.png b/CoreCms.Net.Uni-App/CoreShop/static/images/map/location.png
index f4ac6a24541c6f1cf2db1a15a25fffcd88e73d76..a837108cd5e0119a2dac49b22b79901b4062d6f0 100644
Binary files a/CoreCms.Net.Uni-App/CoreShop/static/images/map/location.png and b/CoreCms.Net.Uni-App/CoreShop/static/images/map/location.png differ
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/common.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/common.scss
deleted file mode 100644
index affd7a869f1579ea991890c26d7934181204654c..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/common.scss
+++ /dev/null
@@ -1,240 +0,0 @@
-/*page { background: #f6f7f9; }*/
-page, .bg-page { background: #f1f1f1; }
-
-//下划线
-.underline { text-decoration: underline; }
-//顶划线
-.overline { text-decoration: overline; }
-//删除线
-.linethrough { text-decoration: line-through; }
-/*隐藏*/
-.hide { display: none; }
-/*显示*/
-.show { display: block; }
-
-
-/*
-    empty外部盒子
-    用于空数据下整体外包
-*/
-.coreshop-emptybox { text-align: center; margin: 200rpx auto; font-size: 32rpx; }
-    .coreshop-emptybox .coreshop-btn { margin: 80rpx auto; width: 200rpx; border-radius: 32rpx; line-height: 64rpx; color: #ffffff; font-size: 26rpx; background: linear-gradient(270deg, rgba(249, 116, 90, 1) 0%, rgba(255, 158, 1, 1) 100%); }
-
-.content-top { margin-bottom: 116rpx; }
-
-.cell-group { background-color: #fff; }
-.cell-item { padding: 20rpx 26rpx 20rpx 0; width: 724rpx; margin-left: 26rpx; border-bottom: 2rpx solid #f3f3f3; position: relative; background-color: #fff; color: #333; display: flex; min-height: 90rpx; align-items: center; justify-content: space-between; }
-.cell-item-mid { justify-content: flex-start; }
-.cell-item:last-child { border: none; }
-.cell-item-hd { display: flex; align-items: center; font-size: 28rpx; position: relative; }
-.cell-item-bd-block { display: block !important; }
-.cell-hd-icon { width: 40rpx; height: 40rpx; display: inline-block; margin-right: 8rpx; }
-.cell-hd-title { display: inline-block; position: relative; /* #ifdef MP-ALIPAY */ top: 4rpx; /* #endif */ }
-.cell-item-bd { display: flex; margin-left: 20rpx; min-height: 30rpx; overflow: hidden; align-items: center; padding-right: 50rpx; }
-.cell-bd-view { position: relative; display: flex; }
-.cell-bd-text { position: relative; font-size: 24rpx; }
-.cell-bd-text-right { float: right; }
-.cell-bd-input { display: inline-block; float: left; font-size: 26rpx; }
-.cell-item-ft { display: flex; align-items: center; }
-.right-img .cell-item-ft { right: 8rpx; height: 50rpx; position: absolute; }
-.cell-ft-view { position: relative; overflow: hidden; color: #666; font-size: 28rpx; text-align: right; }
-.cell-ft-p { font-size: 24rpx; color: #666; }
-.cell-ft-text { font-size: 28rpx; float: right; position: relative; line-height: 50rpx; }
-.cell-ft-next { float: right; }
-
-
-
-.margin-cell-group { margin: 20upx 0; }
-.bottom-cell-group { margin-bottom: 20upx; }
-.min-cell-group { margin-bottom: 1px; padding: 20upx 0; }
-    .min-cell-group .cell-item { border-bottom: none; min-height: 50upx; padding: 0 26upx 0 0; }
-
-/*宽屏按钮*/
-.coreshop-btn { display: inline-block; box-sizing: border-box; border-radius: 0; font-size: 28rpx; transform: scale(1); transition: all .5s; }
-.coreshop-btn-hover { transform: scale(.90); transition: all .5s; opacity: .8; }
-.coreshop-btn-hover2 { transition: all .1s; opacity: .6; }
-.coreshop-btn::after { border: none; }
-.coreshop-btn-circle { padding: 0rpx 20rpx; height: 60rpx; line-height: 60rpx; min-width: 140rpx; font-size: 22rpx; }
-.coreshop-btn-square { padding: 0rpx 40rpx; height: 90rpx; line-height: 90rpx; min-width: 150rpx; border: none !important; }
-.coreshop-btn-fillet { border-radius: 50rpx; }
-.coreshop-btn-c { background-color: #f7f7f7; }
-.coreshop-btn-w { border: 2rpx solid #333; color: #333; background-color: #fff; }
-.coreshop-btn-g { border: 2rpx solid #E0E0E0; color: #999; background-color: #fff; }
-.coreshop-btn-b { border: 2rpx solid #333; background-color: #333; color: #fff; }
-.coreshop-btn-o { border: 2rpx solid #FF7159; background-color: #FF7159; color: #fff; }
-.coreshop-btn-half { width: 50%; }
-.coreshop-btn-all { width: 100%; }
-
-.coreshop-bottomBox { background-color: #fff; position: fixed; bottom: 0; height: 90rpx; width: 100%; display: flex; z-index: 66; box-shadow: 0 0 10px #ccc; }
-    .coreshop-bottomBox .coreshop-btn { flex: 1; }
-
-.share-Box { width: 100%; height: 300rpx; background: #FFFFFF; position: absolute; left: 0; bottom: 0; }
-.share-pop { height: 300rpx; width: 100%; display: flex; }
-.share-item { flex: 1; text-align: center; font-size: 26rpx; color: #333; padding: 20rpx 0; }
-    .share-item image { width: 80rpx; height: 80rpx; margin: 20rpx; }
-    .share-item .coreshop-btn { line-height: 1; display: block; font-size: 26rpx; background-color: #fff; }
-
-//头像背景
-.cu-avatar { background-color: #FFFFFF; }
-
-//顶部通用标题
-.coreshop-bar-view-box { position: fixed; top: 0; width: 100%; z-index: 10000; background: #FAFAFA; /* #ifndef MP */ height: calc(var(--status-bar-height) + 99.99rpx); /* #endif */ /* #ifdef MP */ height: calc(var(--status-bar-height) + 129.99rpx); /* #endif */ padding: var(--status-bar-height) 27.27rpx 0 27.27rpx; align-items: center;
-    .coreshop-bar-box { position: relative; width: 100%; align-items: center; line-height: 99.99rpx;
-        .close { position: absolute; right: 27.27rpx; font-size: 40rpx; bottom: 9.09rpx; }
-    }
-    .coreshop-small-routine-title { padding: 18.18rpx 0; }
-}
-//占位使用,结合顶部通用标题
-.coreshop-seat-height { width: 100%; /* #ifndef MP */ height: calc(var(--status-bar-height) + 99.99rpx); /* #endif */ /* #ifdef MP */ height: calc(var(--status-bar-height) + 139.99rpx); /* #endif */ }
-
-//顶部搜索框导航条设置
-.coreshop-bar-search-title-box {
-    .cu-bar .action > text[class*="cuIcon-"] { font-size: 36.36rpx; }
-}
-
-
-//滚动商品图标颜色
-.coreshop-goods-swiper-view {
-    swiper.screen-swiper .uni-swiper-dot { background: #f0f0f0; }
-    swiper.screen-swiper.square-dot .uni-swiper-dot { background-color: #aaaaaa; }
-}
-
-//
-.flex.flex-wrap.user-info { position: relative; border-radius: 16rpx 16rpx;
-    .basis-xs { flex-basis: 30%; width: 30%; }
-    .basis-xl { flex-basis: 70%; width: 70%; }
-    .line-height { line-height: 47rpx; }
-    .v-icon { position: absolute; width: 20rpx; bottom: -4rpx; left: 33rpx; }
-}
-//划线删除线
-.text-through { text-decoration: line-through; }
-//占位线
-.solid-line { width: 100%; height: 2rpx; background: #f9f9f9; }
-.solid-top::after { border-top: 2rpx solid rgba(0, 0, 0, 0.1); }
-
-
-//corlorUI弹窗层级
-.cu-modal { z-index: 9999999; }
-
-//底部多按钮区
-.coreshop-add-btn-view-box { position: fixed; z-index: 10000; bottom: 181.81rpx; right: 27.27rpx;
-    .cu-btn { margin: auto; width: 81.81rpx; height: 81.81rpx; font-weight: 800; border-radius: 50%; font-size: 36.36rpx; border: 9.09rpx solid #fff; box-shadow: 0 0 14.54rpx 7.27rpx #d0d0d0; }
-}
-
-//底部浮动区域，用于放置按钮内容
-.coreshop-footer-fixed { position: fixed; z-index: 10000; width: 100%; bottom: 0; left: 0; }
-.coreshop-foot-padding-bottom { padding-bottom: calc(env(safe-area-inset-bottom) / 2); }
-
-
-.coreshop-tip-view { position: relative; padding: 10.9rpx 21.81rpx;
-    .content { position: relative; padding-right: 54.54rpx; }
-    .icon { position: absolute; font-size: 32.72rpx; right: 27.27rpx; color: #8799a3; top: 9.09rpx; }
-}
-.input-placeholder { color: #bfbfbf; }
-
-//列表
-.cu-list.menu > .cu-item.arrow { padding-right: 69.09rpx; }
-    .cu-list.menu > .cu-item.arrow:before { right: 27.27rpx; width: 21.81rpx; height: 27.27rpx; color: #aaaaaa; font-size: 25.45rpx; }
-.coreshop-progress-radius {
-    .uni-progress-bar, .uni-progress-inner-bar { border-radius: 181.81rpx; }
-}
-
-/*底部*/
-.wecanui-footer-fixed { position: fixed; z-index: 10000; width: 100%; bottom: 0; left: 0; }
-    .wecanui-footer-fixed.foot-pb { padding-bottom: calc(env(safe-area-inset-bottom) / 2); }
-.wecanui-footer-tabbar-hight-view { position: relative; width: 100%; height: calc((env(safe-area-inset-bottom) / 2) + 136.36rpx); }
-
-.cu-form-group picker .picker { text-align: left; }
-
-/*浮动按钮*/
-.floatingButton { width: 80rpx; height: 80rpx; background-color: #fff; border-radius: 50%; position: fixed; right: 40rpx; bottom: 60rpx; display: flex; justify-content: center; align-items: center; box-shadow: 0 0 10rpx #ccc; padding: 0; z-index: 996; }
-    .floatingButton .icon { width: 60rpx; height: 60rpx; }
-
-// 格式化页面
-.pageBox { height: 100%; width: 100%; display: flex; flex-direction: column; justify-content: space-between; overflow-x: hidden; background: #f6f6f6; }
-
-.scroll-box { flex: 1; height: 100%; position: relative; }
-.content-box { flex: 1; overflow-y: auto; }
-/* ==================
-          flex布局(colorui里面也有相关基础样式)
- ==================== */
-/* x水平排列*/
-.x-f { display: flex; align-items: center; }
-/*x两端且水平居中*/
-.x-bc { display: flex; justify-content: space-between; align-items: center; }
-/*x平分且水平居中*/
-.x-ac { display: flex; justify-content: space-around; align-items: center; }
-/*x水平靠上对齐*/
-.x-start { display: flex; align-items: flex-start; }
-/*x水平靠下对齐*/
-.x-end { display: flex; align-items: flex-end; }
-/*上下左右居中*/
-.x-c { display: flex; justify-content: center; align-items: center; }
-/*y竖直靠左*/
-.y-start { display: flex; flex-direction: column; align-items: flex-start; }
-/*y竖直靠右*/
-.y-end { display: flex; flex-direction: column; align-items: flex-end; }
-/*y竖直居中*/
-.y-f { display: flex; flex-direction: column; align-items: center; }
-// y竖直两端
-.y-b { display: flex; flex-direction: column; justify-content: space-between; }
-/*y竖直两端居中*/
-.y-bc { display: flex; flex-direction: column; align-items: center; justify-content: space-between; }
-
-
-
-/*常用多列列表三联*/
-.text-item-box { margin: 20rpx 0; }
-.log-item { height: 142rpx; background-color: #fff; padding: 0 40rpx; border-bottom: 1rpx solid #eee; }
-    .log-item .item-left .log-img { width: 50rpx; height: 50rpx; border-radius: 50%; margin-right: 24rpx; }
-    .log-item .item-left .log-name { font-size: 28rpx; font-weight: 500; margin-bottom: 12rpx; }
-    .log-item .item-left .log-notice { font-size: 22rpx; font-weight: 500; }
-    .log-item .item-right .log-num { font-size: 28rpx; font-weight: 500; margin-bottom: 12rpx; }
-    .log-item .item-right .log-date { font-size: 22rpx; font-weight: 400; }
-
-
-/*团队列表样式*/
-
-.team-box { margin-top: 20rpx; background: #fff; }
-    .team-box .team-list .team-children { margin-left: 30rpx; margin-right: 30rpx; height: 132rpx; border-bottom: 1rpx solid #eee; }
-        .team-box .team-list .team-children .head-img { width: 60rpx; height: 60rpx; border-radius: 50%; margin-right: 38rpx; }
-        .team-box .team-list .team-children .head-info { width: calc( 100% - 100rpx) }
-            .team-box .team-list .team-children .head-info .head-time { font-size: 24rpx; font-weight: 400; color: #999999; }
-            .team-box .team-list .team-children .head-info .child-num { font-size: 24rpx; font-weight: 400; color: #999999; }
-
-            .team-box .team-list .team-children .head-info .name-box { margin-bottom: 12rpx; }
-                .team-box .team-list .team-children .head-info .name-box .name-text { font-size: 24rpx; font-weight: 500; color: #666; }
-                .team-box .team-list .team-children .head-info .name-box .tag-box { background: rgba(0, 0, 0, 0.2); border-radius: 21rpx; line-height: 30rpx; padding-right: 10rpx; margin-left: 10rpx; }
-                    .team-box .team-list .team-children .head-info .name-box .tag-box .tag-img { width: 34rpx; height: 34rpx; margin-right: 6rpx; border-radius: 50%; }
-                    .team-box .team-list .team-children .head-info .name-box .tag-box .tag-title { font-size: 18rpx; font-family: PingFang SC; font-weight: 500; color: white; line-height: 20rpx; }
-
-
-/*订单列表*/
-.order { width: 710rpx; background-color: #ffffff; margin: 20rpx auto; border-radius: 20rpx; box-sizing: border-box; padding: 20rpx; font-size: 28rpx; }
-    .order .top { display: flex; justify-content: space-between; }
-        .order .top .left { display: flex; align-items: center; }
-            .order .top .left .store { margin: 0 10rpx; font-size: 32rpx; font-weight: bold; }
-        .order .top .right { color: $u-type-warning-dark; }
-    .order .item { display: flex; margin: 20rpx 0 0; }
-        .order .item .left { margin-right: 20rpx; }
-            .order .item .left image { width: 200rpx; height: 200rpx; border-radius: 10rpx; }
-        .order .item .content { }
-            .order .item .content .title { font-size: 28rpx; line-height: 50rpx; }
-            .order .item .content .type { margin: 10rpx 0; font-size: 24rpx; color: $u-tips-color; }
-            .order .item .content .delivery-time { color: #e5d001; font-size: 24rpx; }
-        .order .item .right { margin-left: 10rpx; padding-top: 20rpx; text-align: right; }
-            .order .item .right .decimal { font-size: 24rpx; margin-top: 4rpx; }
-            .order .item .right .number { color: $u-tips-color; font-size: 24rpx; }
-    .order .total { margin-top: 20rpx; text-align: right; font-size: 24rpx; }
-        .order .total .total-price { font-size: 32rpx; }
-    .order .bottom { display: flex; margin-top: 40rpx; padding: 0 10rpx; justify-content: space-between; align-items: center; }
-        .order .bottom .coreshop-btn { line-height: 52rpx; width: 160rpx; border-radius: 26rpx; border: 2rpx solid $u-border-color; font-size: 26rpx; text-align: center; color: $u-type-info-dark; }
-        .order .bottom .evaluate { color: $u-type-warning-dark; border-color: $u-type-warning-dark; }
-        .order .bottom .logistics { border-color: #e4e7ed; color: #82848a; }
-        .order .bottom .exchange { color: #8dc63f; border-color: #8dc63f; }
-
-
-/*重置颜色*/
-.coreshop-bg-green { background-color: #19be6b; color: #fff; }
-
-.coreshop-text-green { background-color: #19be6b; color: #fff; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
new file mode 100644
index 0000000000000000000000000000000000000000..77bb3e4cd75014cbae94b7e142edd784949e0693
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss
@@ -0,0 +1,786 @@
+/*page { background: #f6f7f9; }*/
+page, .bg-page { background: #f7f7f7; }
+
+
+//圆形
+.round { border-radius: 5000upx; }
+//半圆
+.radius { border-radius: 6rpx; }
+//下划线
+.coreshop-underline { text-decoration: underline; }
+//顶划线
+.coreshop-text-overline { text-decoration: overline; }
+//删除线
+.coreshop-text-through { text-decoration: line-through; }
+/*隐藏*/
+.hide { display: none; }
+/*显示*/
+.show { display: block; }
+
+.w100 { width: 100%; }
+
+.coreshop-float-left { float: left; }
+.coreshop-float-right { float: right; }
+
+/* -- 实线 -- */
+.coreshop-solid, .coreshop-solid-top,
+.coreshop-solid-right,
+.coreshop-solid-bottom,
+.coreshop-solid-left { position: relative; }
+
+    .coreshop-solid::after,
+    .coreshop-solid-top::after,
+    .coreshop-solid-right::after,
+    .coreshop-solid-bottom::after,
+    .coreshop-solid-left::after { content: " "; width: 200%; height: 200%; position: absolute; top: 0; left: 0; border-radius: inherit; transform: scale(0.5); transform-origin: 0 0; pointer-events: none; box-sizing: border-box; }
+
+    .coreshop-solid::after { border: 1upx solid rgba(0, 0, 0, 0.1); }
+    .coreshop-solid-top::after { border-top: 1upx solid rgba(0, 0, 0, 0.1); }
+    .coreshop-solid-right::after { border-right: 1upx solid rgba(0, 0, 0, 0.1); }
+    .coreshop-solid-bottom::after { border-bottom: 1upx solid rgba(0, 0, 0, 0.1); }
+    .coreshop-solid-left::after { border-left: 1upx solid rgba(0, 0, 0, 0.1); }
+
+/* flex弹性布局 */
+.coreshop-flex { display: flex; }
+.coreshop-flex-sub { flex: 1; }
+.coreshop-flex-twice { flex: 2; }
+.coreshop-flex-treble { flex: 3; }
+.coreshop-flex-direction { flex-direction: column; }
+.coreshop-flex-wrap { flex-wrap: wrap; }
+
+.coreshop-align-start { align-items: flex-start; }
+.coreshop-align-end { align-items: flex-end; }
+.coreshop-align-center { align-items: center; }
+.coreshop-align-stretch { align-items: stretch; }
+.coreshop-self-start { align-self: flex-start; }
+.coreshop-self-center { align-self: flex-center; }
+.coreshop-self-end { align-self: flex-end; }
+.coreshop-self-stretch { align-self: stretch; }
+
+.coreshop-justify-start { justify-content: flex-start; }
+.coreshop-justify-end { justify-content: flex-end; }
+.coreshop-justify-center { justify-content: center; }
+.coreshop-justify-between { justify-content: space-between; }
+.coreshop-justify-around { justify-content: space-around; }
+
+.coreshop-basis-1 { flex-basis: 10%; }
+.coreshop-basis-2 { flex-basis: 20%; }
+.coreshop-basis-3 { flex-basis: 30%; }
+.coreshop-basis-4 { flex-basis: 40%; }
+.coreshop-basis-5 { flex-basis: 50%; }
+.coreshop-basis-6 { flex-basis: 60%; }
+.coreshop-basis-7 { flex-basis: 70%; }
+.coreshop-basis-8 { flex-basis: 80%; }
+.coreshop-basis-9 { flex-basis: 90%; }
+
+/*通用样式*/
+.coreshop-display-block { display: block !important; }
+.coreshop-display-flex { display: flex; }
+.coreshop-display-inline-block { display: inline-block; }
+
+/*位置信息*/
+.coreshop-vertical-align-sub { vertical-align: sub }
+
+/*背景颜色*/
+
+.coreshop-bg-red { background-color: #e54d42; color: #ffffff; }
+.coreshop-bg-orange { background-color: #f37b1d; color: #ffffff; }
+.coreshop-bg-yellow { background-color: #fbbd08; color: #333333; }
+.coreshop-bg-olive { background-color: #8dc63f; color: #ffffff; }
+.coreshop-bg-green { background-color: #39b54a; color: #ffffff; }
+.coreshop-bg-cyan { background-color: #1cbbb4; color: #ffffff; }
+.coreshop-bg-blue { background-color: #0081ff; color: #ffffff; }
+.coreshop-bg-purple { background-color: #6739b6; color: #ffffff; }
+.coreshop-bg-mauve { background-color: #9c26b0; color: #ffffff; }
+.coreshop-bg-pink { background-color: #e03997; color: #ffffff; }
+.coreshop-bg-brown { background-color: #a5673f; color: #ffffff; }
+.coreshop-bg-grey { background-color: #8799a3; color: #ffffff; }
+.coreshop-bg-gray { background-color: #f0f0f0; color: #333333; }
+.coreshop-bg-black { background-color: #333333; color: #ffffff; }
+.coreshop-bg-white { background-color: #ffffff; color: #666666; }
+.coreshop-bg-shadeTop { background-image: linear-gradient(rgba(0, 0, 0, 1), rgba(0, 0, 0, 0.01)); color: #ffffff; }
+.coreshop-bg-shadeBottom { background-image: linear-gradient(rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 1)); color: #ffffff; }
+
+.coreshop-bg-red.light { color: #e54d42; background-color: #fadbd9; }
+.coreshop-bg-orange.light { color: #f37b1d; background-color: #fde6d2; }
+.coreshop-bg-yellow.light { color: #fbbd08; background-color: #fef2ced2; }
+.coreshop-bg-olive.light { color: #8dc63f; background-color: #e8f4d9; }
+.coreshop-bg-green.light { color: #39b54a; background-color: #d7f0dbff; }
+.coreshop-bg-cyan.light { color: #1cbbb4; background-color: #d2f1f0; }
+.coreshop-bg-blue.light { color: #0081ff; background-color: #cce6ff; }
+.coreshop-bg-purple.light { color: #6739b6; background-color: #e1d7f0; }
+.coreshop-bg-mauve.light { color: #9c26b0; background-color: #ebd4ef; }
+.coreshop-bg-pink.light { color: #e03997; background-color: #f9d7ea; }
+.coreshop-bg-brown.light { color: #a5673f; background-color: #ede1d9; }
+.coreshop-bg-grey.light { color: #8799a3; background-color: #e7ebed; }
+
+
+/*字体颜色*/
+.coreshop-text-green { background-color: #19be6b; color: #fff; }
+.coreshop-text-red, .line-red, .lines-red { color: #e54d42; }
+.coreshop-text-orange, .line-orange, .lines-orange { color: #f37b1d; }
+.coreshop-text-yellow, .line-yellow, .lines-yellow { color: #fbbd08; }
+.coreshop-text-olive, .line-olive, .lines-olive { color: #8dc63f; }
+.coreshop-text-green, .line-green, .lines-green { color: #39b54a; }
+.coreshop-text-cyan, .line-cyan, .lines-cyan { color: #1cbbb4; }
+.coreshop-text-blue, .line-blue, .lines-blue { color: #0081ff; }
+.coreshop-text-purple, .line-purple, .lines-purple { color: #6739b6; }
+.coreshop-text-mauve, .line-mauve, .lines-mauve { color: #9c26b0; }
+.coreshop-text-pink, .line-pink, .lines-pink { color: #e03997; }
+.coreshop-text-brown, .line-brown, .lines-brown { color: #a5673f; }
+.coreshop-text-grey, .line-grey, .lines-grey { color: #8799a3; }
+.coreshop-text-gray, .line-gray, .lines-gray { color: #aaaaaa; }
+.coreshop-text-black, .line-black, .lines-black { color: #333333; }
+.coreshop-text-white, .line-white, .lines-white { color: #ffffff; }
+
+/*字体高度*/
+.coreshop-line-height-initial { line-height: initial }
+
+/*人民币符号*/
+.coreshop-text-price::before { content: "¥"; font-size: 80%; margin-right: 4upx; }
+
+/*字体格式*/
+.coreshop-text-bold { font-weight: bold; }
+
+/*empty外部盒子用于空数据下整体外包*/
+.coreshop-emptybox { text-align: center; margin: 200rpx auto; font-size: 32rpx;
+    .coreshop-btn { margin: 80rpx auto; width: 200rpx; border-radius: 32rpx; line-height: 64rpx; color: #ffffff; font-size: 26rpx; background: linear-gradient(270deg, rgba(249, 116, 90, 1) 0%, rgba(255, 158, 1, 1) 100%); }
+}
+
+/*用于增加底部距离*/
+.coreshop-content-top { margin-bottom: 116rpx; }
+/*底部tab切换区域占高*/
+.coreshop-tabbar-height { min-height: 100upx; height: calc(100upx + env(safe-area-inset-bottom) / 2); margin-top: 10rpx; }
+
+
+/*宽屏按钮*/
+.coreshop-btn { display: inline-block; box-sizing: border-box; border-radius: 0; font-size: 28rpx; transform: scale(1); transition: all .5s; }
+.coreshop-btn-hover { transform: scale(.90); transition: all .5s; opacity: .8; }
+.coreshop-btn-hover2 { transition: all .1s; opacity: .6; }
+.coreshop-btn::after { border: none; }
+.coreshop-btn-circle { padding: 0rpx 20rpx; height: 60rpx; line-height: 60rpx; min-width: 140rpx; font-size: 22rpx; }
+.coreshop-btn-square { padding: 0rpx 40rpx; height: 90rpx; line-height: 90rpx; min-width: 150rpx; border: none !important; }
+.coreshop-btn-fillet { border-radius: 50rpx; }
+.coreshop-btn-c { background-color: #f7f7f7; }
+.coreshop-btn-w { border: 2rpx solid #333; color: #333; background-color: #fff; }
+.coreshop-btn-g { border: 2rpx solid #E0E0E0; color: #999; background-color: #fff; }
+.coreshop-btn-b { border: 2rpx solid #333; background-color: #333; color: #fff; }
+.coreshop-btn-o { border: 2rpx solid #FF7159; background-color: #FF7159; color: #fff; }
+.coreshop-btn-half { width: 50%; }
+.coreshop-btn-all { width: 100%; }
+
+.coreshop-bottomBox { background-color: #fff; position: fixed; bottom: 0; height: 90rpx; width: 100%; display: flex; z-index: 66; box-shadow: 0 0 10px #ccc;
+    .coreshop-btn { flex: 1; }
+}
+
+
+/*分享浮层*/
+.coreshop-share-Box { width: 100%; height: 300rpx; background: #FFFFFF; }
+.coreshop-share-pop { height: 300rpx; width: 100%; display: flex; }
+.coreshop-share-item { flex: 1; text-align: center; font-size: 26rpx; color: #333; padding: 20rpx 0;
+    image { width: 80rpx; height: 80rpx; margin: 20rpx; }
+    .coreshop-btn { line-height: 1; display: block; font-size: 26rpx; background-color: #fff; }
+}
+
+
+//顶部通用标题
+.coreshop-bar-view-box { position: fixed; top: 0; width: 100%; z-index: 10000; background: #FAFAFA; /* #ifndef MP */ height: calc(var(--status-bar-height) + 99.99rpx); /* #endif */ /* #ifdef MP */ height: calc(var(--status-bar-height) + 129.99rpx); /* #endif */ padding: var(--status-bar-height) 27.27rpx 0 27.27rpx; align-items: center;
+    .coreshop-bar-box { position: relative; width: 100%; align-items: center; line-height: 99.99rpx;
+        .close { position: absolute; right: 27.27rpx; font-size: 40rpx; bottom: 9.09rpx; }
+    }
+    .coreshop-small-routine-title { padding: 18.18rpx 0; }
+}
+
+//占位使用,结合顶部通用标题
+.coreshop-seat-height { width: 100%; /* #ifndef MP */ height: calc(var(--status-bar-height) + 99.99rpx); /* #endif */ /* #ifdef MP */ height: calc(var(--status-bar-height) + 139.99rpx); /* #endif */ }
+
+//顶部搜索框导航条设置
+.coreshop-bar-search-title-box {
+    .cu-bar .action > text[class*="cuIcon-"] { font-size: 36.36rpx; }
+}
+
+//滚动商品图标颜色
+.coreshop-goods-swiper-view {
+    swiper.screen-swiper .uni-swiper-dot { background: #f0f0f0; }
+    swiper.screen-swiper.square-dot .uni-swiper-dot { background-color: #aaaaaa; }
+}
+
+//占位线
+.coreshop-solid-line { width: 100%; height: 2rpx; background: #f9f9f9; }
+.coreshop-coreshop-solid-top::after { border-top: 2rpx solid rgba(0, 0, 0, 0.1); }
+
+//底部多按钮区
+.coreshop-add-btn-view-box { position: fixed; z-index: 10000; bottom: 181.81rpx; right: 27.27rpx;
+    .cu-btn { margin: auto; width: 81.81rpx; height: 81.81rpx; font-weight: 800; border-radius: 50%; font-size: 36.36rpx; border: 9.09rpx solid #fff; box-shadow: 0 0 14.54rpx 7.27rpx #d0d0d0; }
+}
+
+//底部浮动区域，用于放置按钮内容
+.coreshop-footer-fixed { position: fixed; z-index: 10000; width: 100%; bottom: 0; left: 0; }
+.coreshop-foot-padding-bottom { padding-bottom: calc(env(safe-area-inset-bottom) / 2); }
+.coreshop-tip-view { position: relative; padding: 10.9rpx 21.81rpx;
+    .coreshop-content { position: relative; padding-right: 54.54rpx; }
+    .coreshop-icon { position: absolute; font-size: 32.72rpx; right: 27.27rpx; color: #8799a3; top: 9.09rpx; }
+}
+
+/*底部*/
+.wecanui-footer-fixed { position: fixed; z-index: 10000; width: 100%; bottom: 0; left: 0; }
+    .wecanui-footer-fixed.foot-pb { padding-bottom: calc(env(safe-area-inset-bottom) / 2); }
+.wecanui-footer-tabbar-hight-view { position: relative; width: 100%; height: calc((env(safe-area-inset-bottom) / 2) + 136.36rpx); }
+.cu-form-group picker .picker { text-align: left; }
+
+/*浮动按钮*/
+.floatingButton { width: 80rpx; height: 80rpx; background-color: #fff; border-radius: 50%; position: fixed; right: 40rpx; bottom: 60rpx; display: flex; justify-content: center; align-items: center; box-shadow: 0 0 10rpx #ccc; padding: 0; z-index: 996; }
+    .floatingButton .icon { width: 60rpx; height: 60rpx; }
+
+// 格式化页面
+.coreshop-pageBox { height: 100%; width: 100%; display: flex; flex-direction: column; justify-content: space-between; overflow-x: hidden; background: #f6f6f6; }
+.coreshop-scroll-box { flex: 1; height: 100%; position: relative; }
+.coreshop-content-box { flex: 1; overflow-y: auto; }
+
+
+/*通用列表*/
+.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-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;
+            .coreshop-cell-bd-view { position: relative; display: flex;
+                .coreshop-cell-bd-text { position: relative; font-size: 24rpx; }
+            }
+        }
+        .coreshop-cell-item-ft { display: flex; align-items: center;
+            .coreshop-cell-ft-view { position: relative; overflow: hidden; color: #666; font-size: 24rpx; text-align: right; }
+            .coreshop-cell-ft-text { font-size: 28rpx; float: right; position: relative; line-height: 50rpx; }
+        }
+    }
+    .coreshop-cell-item:last-child { border: none; }
+    .coreshop-cell-textarea { }
+    .right-img {
+        .coreshop-cell-item-ft { right: 8rpx; height: 50rpx; position: absolute; }
+    }
+}
+
+
+/*二列商品列表展示*/
+.coreshop-goods-group { border-radius: 16rpx; color: #333333 !important; margin: 0 10rpx;
+    .good_box { border-radius: 8px; margin: 3px; background-color: #ffffff; padding: 5px; position: relative; width: calc(100% - 6px);
+        .good_title { font-size: 26rpx; margin-top: 5px; color: $u-main-color; }
+        .good_title-xl { font-size: 28rpx; margin-top: 5px; color: $u-main-color; }
+        .good_image { width: 100%; border-radius: 4px; }
+        .good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 15rpx; left: 15rpx; background-color: $u-type-error; color: #ffffff; display: flex; align-items: center; padding: 4rpx 14rpx; border-radius: 50rpx; font-size: 20rpx; line-height: 1; }
+        .good-tag-recommend { display: flex; margin-top: 5px; position: absolute; top: 15rpx; right: 15rpx; background-color: $u-type-primary; color: #ffffff; margin-left: 10px; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
+        .good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 15rpx; left: 15rpx; background-color: $u-type-primary; color: #ffffff; border-radius: 50rpx; line-height: 1; padding: 4rpx 14rpx; display: flex; align-items: center; border-radius: 50rpx; font-size: 20rpx; }
+        .good-price { font-size: 30rpx; color: $u-type-error; margin-top: 5px; }
+        .good-des { font-size: 20rpx; color: $u-tips-color; margin-top: 5px; }
+        .grid-text { font-size: 28rpx; margin-top: 4rpx; color: $u-type-info; }
+    }
+}
+
+
+
+
+/*头像大小自定义*/
+.coreshop-head-icon { width: 40rpx; height: 40rpx; display: inline-block; margin-right: 8rpx; }
+
+/*优惠券列表*/
+.coreshop-coupon {
+    .coreshop-coupon-card-view { position: relative;
+        .card-price-view { position: relative; background: #FFF5F5; border-radius: 14.54rpx 14.54rpx 0 0; padding: 18.18rpx;
+            .price-left-view { position: absolute; height: 125.45rpx; width: 135.45rpx; text-align: center; line-height: 125.45rpx;
+                .price { font-size: 45.45rpx; font-weight: 400; }
+                .icon { width: 130rpx; height: 100rpx; margin-top: 50%; transform: translateY(-50%); }
+            }
+            .name-content-view { position: relative; padding-left: 163.63rpx; padding-right: 105.45rpx; height: 125.45rpx; line-height: 1.8; color: #999898; }
+            .name-content-view::before { content: ''; position: absolute; top: -18.18rpx; bottom: -18.18rpx; margin-left: -18.18rpx; border-left: 2rpx dashed #fdbabc; }
+            .btn-right-view { position: absolute; right: 20rpx; top: 30rpx;
+                .u-size-medium { padding: 0; }
+            }
+        }
+        .card-num-view { position: relative; background: #FFECED; border-radius: 0 0 14.54rpx 14.54rpx; border-top: 2rpx dashed #dedbdb; padding: 10.9rpx 27.27rpx; color: #999898;
+            .conditions { position: relative; }
+            .btnUnfold { position: absolute; right: 27.27rpx; top: 14.54rpx; }
+        }
+        /* .card-num-view::before { content: ''; position: absolute; width: 36.36rpx; height: 36.36rpx; background: #ffffff; border-radius: 50%; top: -18.18rpx; left: -18.18rpx; }
+        .card-num-view::after { content: ''; position: absolute; width: 36.36rpx; height: 36.36rpx; background: #ffffff; border-radius: 50%; top: -18.18rpx; right: -18.18rpx; }*/ }
+
+    .coreshop-lower-shelf {
+        .card-price-view { opacity: 0.5; }
+        .card-num-view { opacity: 0.5; }
+        .img-lower-box { position: absolute; height: 100.9rpx; width: 100.9rpx; background-color: rgba(0, 0, 0, 0.6); border-radius: 181.81rpx; text-align: center; line-height: 100.9rpx; font-size: 24rpx; color: #fff; top: 25.45rpx; left: 35rpx; -webkit-transition: left .15s; transition: left .15s; }
+    }
+}
+
+
+
+/*订单列表*/
+.orderWrap { display: flex; flex-direction: column; height: calc(100vh - var(--window-top)); width: 100%; }
+.orderList { width: 710rpx; background-color: #ffffff; margin: 20rpx auto; border-radius: 20rpx; box-sizing: border-box; padding: 20rpx; font-size: 28rpx;
+    .top { display: flex; justify-content: space-between;
+        .left { display: flex; align-items: center;
+            .store { margin: 0 10rpx; font-size: 32rpx; font-weight: bold; }
+        }
+        .right { color: $core-type-warning-dark; }
+    }
+    .item { display: flex; margin: 20rpx 0 0;
+        .left { margin-right: 20rpx;
+            image { width: 200rpx; height: 200rpx; border-radius: 10rpx; }
+        }
+        .content {
+            .title { font-size: 28rpx; line-height: 50rpx; }
+            .type { margin: 10rpx 0; font-size: 24rpx; color: $core-tips-color; }
+            .delivery-time { color: #e5d001; font-size: 24rpx; }
+        }
+        .right { margin-left: 10rpx; padding-top: 20rpx; text-align: right;
+            .decimal { font-size: 24rpx; margin-top: 4rpx; }
+            .number { color: $core-tips-color; font-size: 24rpx; }
+        }
+    }
+    .total { margin-top: 20rpx; text-align: right; font-size: 24rpx;
+        .total-price { font-size: 32rpx; }
+    }
+    .bottom { display: flex; margin-top: 40rpx; padding: 0 10rpx; justify-content: space-between; align-items: center;
+        .coreshop-btn { line-height: 52rpx; width: 160rpx; border-radius: 26rpx; border: 2rpx solid $core-border-color; font-size: 26rpx; text-align: center; color: $core-type-info-dark; margin-left: 20rpx; }
+        .evaluate { color: $core-type-warning-dark; border-color: $core-type-warning-dark; }
+        .logistics { border-color: #e4e7ed; color: #82848a; }
+        .exchange { color: #8dc63f; border-color: #8dc63f; }
+    }
+}
+
+/*订单详情*/
+.coreshop-solid-top::after { border-top: 2rpx solid rgba(0, 0, 0, 0.1); }
+.coreshop-order-priceBox { position: relative; }
+.coreshop-order-nums { position: absolute; top: 0; right: 0; }
+
+/*步进器*/
+.coreshop-status-img-view { position: relative;
+    .are-img-view { position: relative; margin-bottom: 18.18rpx;
+        .are-img { width: 327.27rpx; }
+    }
+}
+/*拼团区域*/
+.user-head-img-c { position: relative; width: 80upx; height: 80upx; border-radius: 50%; margin-right: 20upx; box-sizing: border-box; display: inline-block; float: left; border: 1px solid #f3f3f3; margin-bottom: 20rpx; margin-top: 20rpx; }
+.user-head-img-tip { position: absolute; top: -6upx; left: -10upx; display: inline-block; background-color: #FF7159; color: #fff; font-size: 22upx; z-index: 99; padding: 0 10upx; border-radius: 10upx; transform: scale(.8); }
+.group-swiper .coreshop-cell-item .user-head-img { width: 100%; height: 100%; border-radius: 50%; }
+.group-swiper .coreshop-cell-item .user-head-img-c:first-child { border: 1px solid #FF7159; }
+.uhihn { width: 80upx; height: 80upx; border-radius: 50%; margin-right: 20upx; display: inline-block; border: 2upx dashed #e1e1e1; text-align: center; line-height: 80upx; color: #d1d1d1; font-size: 40upx; box-sizing: border-box; }
+
+
+/*订单卡片*/
+.coreshop-card-box { padding: 27.27rpx 27.27rpx 0; }
+.coreshop-card-view { position: relative; border-radius: 9.09rpx; padding: 18.18rpx; box-shadow: 0 0 14.54rpx #f1f1f1; }
+.coreshop-price-view { position: relative;
+    .title-view { position: relative; margin-bottom: 18.18rpx;
+        .title { position: relative; padding-right: 181.81rpx; }
+        .u-text-right { position: absolute; top: 3.63rpx; right: 0; }
+    }
+    .title-right-view { position: relative; margin-top: 27.27rpx; text-align: right; }
+    .title-left-view { position: relative; margin-top: 27.27rpx; text-align: left; }
+    .solid-line { margin: 27.27rpx 0; }
+}
+
+/*卡片-商品信息*/
+.coreshop-shop-view { position: relative;
+    .shop-info-view { position: relative; margin-bottom: 27.27rpx; line-height: 47.27rpx; height: 47.27rpx;
+        .coreshop-avatar { position: absolute; }
+        .title-view { position: relative; padding-left: 63.63rpx; }
+    }
+    .goods-list-view { position: relative; margin: 18.18rpx 0;
+        .coreshop-avatar { position: absolute; height: 154.54rpx; width: 154.54rpx; }
+        .goods-info-view { position: relative; padding-left: 172.72rpx; min-height: 154.54rpx;
+            .name { position: relative; height: 38.18rpx; width: 100%; }
+            .introduce { position: relative; height: 32.72rpx; width: 100%; }
+            .tag-view { position: relative; margin-bottom: 9.09rpx; margin-top: 7.27rpx; width: 100%;
+                .cu-tag { position: relative; top: -2rpx; }
+            }
+            .coreshop-text-price { position: relative; height: 36.36rpx; width: 100%; }
+        }
+    }
+    .coreshop-foot-view { position: relative; background: #FFFCFC; margin: 0 -18.18rpx -18.18rpx -18.18rpx; border-radius: 0 0 9.09rpx 9.09rpx; padding: 18.18rpx;
+        .left-view { position: relative; padding-right: 181.81rpx;
+            .af5-img { position: relative; margin-right: 9.09rpx; width: 36.36rpx; top: 3.63rpx; }
+        }
+        .u-text-right { position: absolute; right: 18.18rpx; top: 18.18rpx; }
+    }
+}
+
+/*卡片-订单内容区域*/
+.coreshop-order-view { position: relative;
+    .solid-line { margin: 27.27rpx 0; }
+    .title-view { position: relative; margin-bottom: 18.18rpx;
+        &:last-child { margin-bottom: 12.72rpx; }
+        .title { position: absolute; top: 3.63rpx; left: 0; }
+        .u-text-right { position: relative; padding-left: 181.81rpx;
+            .cu-btn { padding: 0 10.9rpx; height: 30.9rpx; top: -3.63rpx; }
+        }
+    }
+}
+
+
+/*卡片-物流信息*/
+.coreshop-address-view { position: relative;
+    .solid-line { margin: 18.18rpx 0; }
+    .coreshop-list.menu-avatar > .coreshop-list-item { height: 55px;
+        &:after { width: 0; height: 0; border-bottom: 0; }
+        .icon-view { position: absolute; border-radius: 100%; text-align: center; line-height: 45.45rpx; height: 45.45rpx; width: 45.45rpx; left: 9.09rpx; top: 25.45rpx; }
+        .content { left: 72.72rpx; width: calc(100% - 94.54rpx); }
+    }
+}
+
+/*推荐商品列表*/
+.coreshop-recommend-goods-list-view { position: relative;
+    .coreshop-flex-wrap { padding: 9.09rpx; }
+    .list-item { text-align: center; margin-bottom: 18.18rpx;
+        .coreshop-avatar { width: 347.27rpx; height: 347.27rpx; }
+        .goods-info-view { position: relative; padding: 14.54rpx; text-align: left;
+            .coreshop-text-price { margin: 9.09rpx 0; }
+            .foot-box { position: relative;
+                .cu-tag { position: absolute; right: 0; top: 0; }
+            }
+        }
+    }
+}
+
+/*团队列表样式*/
+.coreshop-team-box { margin-top: 20rpx; background: #fff;
+    .coreshop-team-list {
+        .coreshop-team-children { margin-left: 30rpx; margin-right: 30rpx; height: 132rpx; border-bottom: 1rpx solid #eee;
+            .head-img { width: 60rpx; height: 60rpx; border-radius: 50%; margin-right: 38rpx; }
+            .head-info { width: calc( 100% - 100rpx);
+                .head-time { font-size: 24rpx; font-weight: 400; color: #999999; }
+                .child-num { font-size: 24rpx; font-weight: 400; color: #999999; }
+                .name-box { margin-bottom: 12rpx;
+                    .name-text { font-size: 24rpx; font-weight: 500; color: #666; }
+                    .tag-box { background: rgba(0, 0, 0, 0.2); border-radius: 21rpx; line-height: 30rpx; padding-right: 10rpx; margin-left: 10rpx;
+                        .tag-img { width: 34rpx; height: 34rpx; margin-right: 6rpx; border-radius: 50%; }
+                        .tag-title { font-size: 18rpx; font-family: PingFang SC; font-weight: 500; color: white; line-height: 20rpx; }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+/* 头像*/
+.coreshop-avatar { font-variant: small-caps; margin: 0; padding: 0; display: inline-flex; text-align: center; justify-content: center; align-items: center; background-color: #ccc; color: #ffffff; white-space: nowrap; position: relative; width: 64upx; height: 64upx; background-size: cover; background-position: center; vertical-align: middle; font-size: 1.5em;
+    &.sm { width: 48upx; height: 48upx; font-size: 1em; }
+    &.lg { width: 96upx; height: 96upx; font-size: 2em; }
+    &.xl { width: 128upx; height: 128upx; font-size: 2.5em; }
+    .avatar-text { font-size: 0.4em; }
+}
+.coreshop-avatar-group { direction: rtl; unicode-bidi: bidi-override; padding: 0 10upx 0 40upx; display: inline-block;
+    .coreshop-avatar { margin-left: -30upx; border: 4upx solid #f1f1f1; vertical-align: middle;
+        &.sm { margin-left: -20upx; border: 1upx solid #f1f1f1; }
+    }
+}
+
+/*通用列表样式*/
+.coreshop-list {
+    & + .coreshop-list { margin-top: 30upx; }
+    & > .coreshop-list-item { transition: all .6s ease-in-out 0s; transform: translateX(0upx);
+        &.move-cur { transform: translateX(-260upx); }
+        .move { position: absolute; right: 0; display: flex; width: 260upx; height: 100%; transform: translateX(100%);
+            view { display: flex; flex: 1; justify-content: center; align-items: center; }
+        }
+    }
+    &.menu-avatar { overflow: hidden;
+        & > .coreshop-list-item { position: relative; display: flex; padding-right: 10upx; height: 140upx; background-color: #ffffff; justify-content: flex-end; align-items: center;
+            & > .coreshop-avatar { position: absolute; left: 30upx; }
+            .flex {
+                .text-cut { max-width: 510upx; }
+            }
+            .content { position: absolute; left: 146upx; width: calc(100% - 96upx - 60upx - 120upx - 20upx); line-height: 1.6em;
+                &.flex-sub { width: calc(100% - 96upx - 60upx - 20upx); }
+                & > view {
+                    &:first-child { font-size: 30upx; display: flex; align-items: center; }
+                }
+                .coreshop-tag {
+                    &.sm { display: inline-block; margin-left: 10upx; height: 28upx; font-size: 16upx; line-height: 32upx; }
+                }
+            }
+            .action { width: 100upx; text-align: center;
+                view {
+                    & + view { margin-top: 10upx; }
+                }
+            }
+        }
+        &.comment {
+            & > .coreshop-list-item { padding: 30upx 30upx 30upx 120upx; height: auto;
+                .content { position: relative; left: 0; width: auto; flex: 1; }
+            }
+            .coreshop-avatar { align-self: flex-start; }
+        }
+    }
+    &.menu { display: block; overflow: hidden;
+        & > .coreshop-list-item { position: relative; display: flex; padding: 0 30upx; min-height: 100upx; background-color: #ffffff; justify-content: space-between; align-items: center;
+            &:last-child {
+                &:after { border: none; }
+            }
+            &.grayscale { background-color: #f5f5f5; }
+            &.cur { background-color: #fcf7e9; }
+            &.arrow { padding-right: 90upx;
+                &:before { position: absolute; top: 0; right: 30upx; bottom: 0; display: block; margin: auto; width: 20upx; height: 20upx; color: #8799a3; content: "\e605"; text-align: center; font-size: 34upx; font-family: "uicon-iconfont"; line-height: 20upx; }
+            }
+            button {
+                &.content { padding: 0; background-color: transparent; justify-content: flex-start;
+                    &:after { display: none; }
+                }
+            }
+            .coreshop-avatar-group {
+                .coreshop-avatar { border-color: #ffffff; }
+            }
+            .content { font-size: 30upx; line-height: 1.6em; flex: 1;
+                & > view {
+                    &:first-child { display: flex; align-items: center; }
+                }
+                & > text[class*=cuIcon] { display: inline-block; margin-right: 10upx; width: 1.6em; text-align: center; }
+                & > image { display: inline-block; margin-right: 10upx; width: 1.6em; height: 1.6em; vertical-align: middle; }
+                .coreshop-tag {
+                    &.sm { display: inline-block; margin-left: 10upx; height: 28upx; font-size: 16upx; line-height: 32upx; }
+                }
+            }
+            .action {
+                .coreshop-tag {
+                    &:empty { right: 10upx; }
+                }
+            }
+        }
+        &.sm-border {
+            & > .coreshop-list-item {
+                &:after { left: 30upx; width: calc(200% - 120upx); }
+            }
+        }
+    }
+    &.grid { background-color: #ffffff; text-align: center;
+        & > .coreshop-list-item { position: relative; display: flex; padding: 20upx 0 30upx; transition-duration: 0s; flex-direction: column;
+            &:after { position: absolute; top: 0; left: 0; box-sizing: border-box; width: 200%; height: 200%; border-right: 1px solid rgba(0, 0, 0, .1); border-bottom: 1px solid rgba(0, 0, 0, .1); border-radius: inherit; content: " "; transform: scale(.5); transform-origin: 0 0; pointer-events: none; }
+            text { display: block; margin-top: 10upx; color: #888; font-size: 26upx; line-height: 40upx; }
+            [class*=cuIcon] { position: relative; display: block; margin-top: 20upx; width: 100%; font-size: 48upx; }
+            .coreshop-tag { right: auto; left: 50%; margin-left: 20upx; }
+        }
+        &.no-border { padding: 20upx 10upx;
+            & > .coreshop-list-item { padding-top: 10upx; padding-bottom: 20upx;
+                &:after { border: none; }
+            }
+        }
+    }
+    &.card-menu { overflow: hidden; margin-right: 30upx; margin-left: 30upx; border-radius: 20upx; }
+}
+    .coreshop-list.menu-avatar > .coreshop-list-item:after,
+    .coreshop-list.menu > .coreshop-list-item:after { position: absolute; top: 0; left: 0; box-sizing: border-box; width: 200%; height: 200%; border-bottom: 1upx solid #ddd; border-radius: inherit; content: " "; transform: scale(.5); transform-origin: 0 0; pointer-events: none; }
+    .coreshop-list.grid.col-3 > .coreshop-list-item:nth-child(3n):after,
+    .coreshop-list.grid.col-4 > .coreshop-list-item:nth-child(4n):after,
+    .coreshop-list.grid.col-5 > .coreshop-list-item:nth-child(5n):after { border-right-width: 0; }
+
+
+/*常用日志数据多列列表三联*/
+.coreshop-log-item { height: 142rpx; background-color: #fff; padding: 0 30rpx; border-bottom: 1rpx solid #eee;
+    .item-left {
+        .log-img { width: 50rpx; height: 50rpx; border-radius: 50%; margin-right: 24rpx; }
+        .log-name { font-size: 28rpx; font-weight: 500; margin-bottom: 12rpx; }
+        .log-notice { font-size: 22rpx; font-weight: 500; }
+    }
+    .item-right {
+        .log-num { font-size: 28rpx; font-weight: 500; margin-bottom: 12rpx; }
+        .log-date { font-size: 22rpx; font-weight: 400; }
+    }
+}
+
+
+/*占高区*/
+.coreshop-card-hight-box { height: 45.45rpx; }
+
+/*底部高度区域*/
+.coreshop-foot-hight-view { width: 100%; height: calc((env(safe-area-inset-bottom) / 2) + 109.09rpx); }
+
+
+/*为您推荐头部效果*/
+.coreshop-recommended-title-view { position: relative; margin: 36.36rpx;
+    .img-anc { position: relative; width: 36.36rpx; top: 3.63rpx; }
+}
+
+/*支付界面效果*/
+.payment-wx {
+    .coreshop-btn { background-color: #fff; line-height: 1.7; padding: 0; width: 724upx; position: relative; display: flex; align-items: center; }
+}
+.payment-pop { position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 400rpx; height: 272rpx; background-color: #fff; text-align: center; box-shadow: 0 0 20rpx #ccc;
+    .text { font-size: 24upx; }
+}
+.payment-pop-c { padding: 50rpx 30rpx; font-size: 32rpx; color: #999;
+    image { width: 60upx; height: 60upx; }
+}
+.payment-pop-b { position: absolute; bottom: 0; display: flex; width: 100%; justify-content: space-between;
+    .coreshop-btn { flex: 1; justify-content: center; }
+    .coreshop-btn-o { background-color: #ff7159; }
+}
+
+
+/*全屏下头部透明效果*/
+.coreshop-full-screen-nav-back { width: 100%; height: 44px; /* #ifndef MP-WEIXIN */ padding: 12px 12px 0; /* #endif */ /* #ifdef MP-WEIXIN */ padding: 26px 12px 0; /* #endif */ position: fixed; top: 20rpx; background-color: rgba(255, 255, 255, 0); z-index: 98;
+    .back-btn { height: 32px; width: 32px; border-radius: 50%; background-color: rgba(255, 255, 255, 0.8); text-align: center;
+        .icon { height: 20px; width: 20px; position: relative; top: 50%; left: 46%; transform: translate(-50%, -50%); }
+    }
+}
+
+/*全屏下顶部满屏占位幻灯片效果*/
+.coreshop-full-screen-banner-swiper-box { position: relative; width: 100%;
+    .screen-swiper { min-height: 750rpx; }
+    .tag { font-size: 24upx; vertical-align: middle; display: inline-flex; align-items: center; justify-content: center; box-sizing: border-box; padding: 0upx 16upx; font-family: Helvetica Neue, Helvetica, sans-serif; white-space: nowrap; position: absolute; bottom: 27.27rpx; right: 27.27rpx; font-size: 20upx; padding: 0upx 12upx; height: 32upx; }
+}
+
+/*商品内限时秒杀区域效果*/
+.coreshop-limited-seckill-box { position: relative; background-image: url('/static/images/good/titlebg.png'); background-repeat: no-repeat; background-size: 100% 100%; padding: 25rpx 28rpx; color: #ffffff; width: 100%;
+    .coreshop-cost-price-num { position: absolute; font-weight: 200; left: 200rpx; top: 22rpx; }
+    .coreshop-cost-price-num.price-6 { left: 254.54rpx; }
+    .coreshop-cost-price-num.price-5 { left: 227.27rpx; }
+    .coreshop-cost-price-num.price-4 { left: 199.99rpx; }
+    .coreshop-cost-price-num.price-3 { left: 163.63rpx; }
+    .coreshop-cost-price-num.price-2 { left: 136.36rpx; }
+    .coreshop-cost-price-num.price-1 { left: 99.99rpx; }
+    .coreshop-time-right { position: absolute; right: 100rpx; top: 10rpx; }
+    .coreshop-share-right { position: absolute; right: 27.27rpx; top: 16.36rpx; }
+}
+    .coreshop-limited-seckill-box::after { content: ""; position: absolute; z-index: -1; background-color: inherit; width: 100%; height: 100%; left: 0; bottom: -10%; border-radius: 10upx; opacity: 0.2; transform: scale(0.9, 0.9); }
+
+/*通用空白区域*/
+.coreshop-common-view-box { position: relative; padding: 20rpx 30rpx; }
+
+
+/*商品标题区域效果*/
+.coreshop-good-title-view-box { position: relative; position: relative;
+    .title-view { display: inline-block; flex-direction: row; align-items: center; }
+    .cu-tag { margin-top: -9.09rpx; margin-right: 9.09rpx; }
+    .coreshop-title-tip-box { position: relative; padding: 9.09rpx 18.18rpx; width: 100%;
+        .u-line-1 { padding-right: 27.27rpx; }
+        .icon { position: absolute; right: 18.18rpx; top: 12rpx; }
+    }
+}
+
+/*商品页面底部浮层*/
+.coreshop-good-footer-fixed { display: flex; position: fixed; bottom: 0; margin-top: 120rpx; width: 100%; z-index: 1; border-top: solid 2rpx #f2f2f2; background-color: #ffffff;
+    .tabbar { display: flex; position: relative; align-items: center; min-height: 100upx; justify-content: space-between; padding: 0; height: calc(100upx + env(safe-area-inset-bottom) / 2); padding-bottom: calc(env(safe-area-inset-bottom) / 2); width: 100%;
+        .action { display: flex; align-items: center; height: 100%; justify-content: center; max-width: 100%; color: #333333; width: 90rpx; position: relative; text-align: center;
+            .car-num { position: absolute; top: 10rpx; right: 15rpx; }
+        }
+        .btn-group { justify-content: space-around;
+            button { padding: 20upx 32upx; flex: 1; margin: 0 10upx; max-width: 50%; }
+        }
+        .btn-box { justify-content: space-around; width: 50%; padding: 10rpx; padding-left: 0rpx; }
+    }
+}
+
+/*商品页面商家面板展示*/
+.coreshop-goods-shop-info-view-box {
+    .coreshop-shop-view { position: relative; width: 100%;
+        .coreshop-avatar { position: absolute; height: 80rpx; width: 80rpx; }
+        button { position: absolute; top: 21.81rpx; right: 0; }
+    }
+    .coreshop-border-view { position: relative; background: #efebeb; margin: 21.81rpx 0; height: 2rpx; width: 100%; }
+    .live-tag-view { position: relative; width: 100%;
+        .text-view { padding-right: 127.27rpx;
+            .cu-tag { position: relative; top: -3.63rpx; }
+        }
+        .go-map-box { position: absolute; right: 0; top: 3.63rpx; }
+    }
+    .coreshop-good-shop-recommend-list-box {
+        .recommend-scroll-box { position: relative; width: 100%;
+            .recommend-scroll { position: relative; height: 320rpx; white-space: nowrap; width: 100%;
+                .recommend-scroll-item { display: inline-block; padding-top: 28rpx; width: 200rpx; padding-right: 18rpx; white-space: initial;
+                    .coreshop-avatar { width: 180rpx; height: 180rpx; }
+                }
+            }
+        }
+    }
+}
+
+
+
+/*商品页面底部弹出层效果*/
+.coreshop-bottom-popup-box { border-radius: 36.36rpx 36.36rpx 0 0;
+    .cu-dialog { border-radius: 36.36rpx 36.36rpx 0 0; }
+    .coreshop-title-bar { position: relative; width: 100%;
+        .close-icon { position: absolute; right: 36.36rpx; }
+    }
+    .coreshop-modal-content { position: relative; width: 100%; overflow-y: auto; height: calc(100vh - 654.54rpx); padding: 0 29.09rpx 29.09rpx; margin-bottom: 118.18rpx;
+        .coreshop-common-view-box { position: relative; width: 100%; padding: 0; text-align: left; }
+        .coreshop-common-view-box.service {
+            .text-view { margin-bottom: 18.18rpx; }
+            .text-list-view { position: relative; width: 100%; margin-bottom: 18.18rpx;
+                .u-line-1 { padding-right: 21rpx; }
+            }
+            .text-list-view + .text-view { margin-top: 36.36rpx; }
+        }
+        .coreshop-common-view-box.promotion {
+            .text-view { margin-bottom: 18.18rpx;
+                .cu-tag { position: relative; top: -3.63rpx; }
+            }
+            .text-list-view { position: relative; width: 100%; margin-bottom: 18.18rpx;
+                .u-line-1 { padding-right: 218.18rpx; }
+                .go-map-box { position: absolute; right: 0; top: 2rpx; }
+            }
+            .text-list-view + .text-view { margin-top: 36.36rpx; }
+        }
+        .coreshop-common-view-box.select {
+            .coreshop-list.menu-avatar > .coreshop-list-item {
+                .content { width: calc(100% - 94.54rpx - 59.99rpx); }
+            }
+            .coreshop-select-btn-list-box {
+                .select-item { padding: 18.18rpx 0; border-bottom: 2rpx solid #f3f3f3;
+                    .select-btn { position: relative; margin-top: 16rpx; width: 100%; overflow: auto;
+                        .sku-btn { font-size: 24rpx; /*height: 44rpx;*/ border-radius: 60rpx; float: left;
+                            .u-avatar { top: 10rpx; }
+                        }
+                        .sku-btn.light { border: 1rpx dashed; }
+                        .sku-btn[disabled] { color: #aaaaaa; }
+                    }
+                }
+            }
+        }
+    }
+}
+/*商品详情区域初始高度*/
+.coreshop-good-rich-text-view { min-height: 500rpx; }
+
+
+/*团购/秒杀相关*/
+.group-box { width: 710rpx; background: linear-gradient(#fff, #f5f5f5); border-radius: 20rpx; margin: 0 auto; min-height: 1000rpx;
+    .goods-item { border-radius: 20rpx; overflow: hidden; position: relative; margin-bottom: 20rpx;
+        .tag { position: absolute; left: 0; top: 10rpx; z-index: 2; line-height: 35rpx; background: linear-gradient(132deg, rgba(255, 153, 93, 1), rgba(255, 99, 97, 1)); border-radius: 0px 18rpx 18rpx 0px; padding: 0 10rpx; font-size: 24rpx; font-family: PingFang SC; font-weight: bold; color: rgba(255, 255, 255, 0.8); }
+        .goods-right { width: 460rpx;
+            .title { width: 460rpx; color: $u-main-color }
+            .tip { width: 460rpx; }
+        }
+        .buy-btn { position: absolute; right: 0; bottom: -10rpx; width: 160rpx; height: 60rpx; background: linear-gradient(90deg, rgba(254, 131, 42, 1), rgba(255, 102, 0, 1)); box-shadow: 0px 7rpx 6rpx 0px rgba(255, 104, 4, 0.22); border-radius: 30rpx; font-size: 28rpx; font-family: PingFang SC; font-weight: 500; color: #fff; padding: 0; }
+        .group-num { font-size: 20rpx; font-family: PingFang SC; font-weight: 500; color: rgba(153, 153, 153, 1); margin-left: 20rpx; }
+        .sell-box { background: rgba(255, 224, 226, 0.3); border-radius: 16rpx; line-height: 32rpx; padding: 0 10rpx;
+            .sell-num { font-size: 20rpx; font-family: PingFang SC; font-weight: 400; color: rgba(247, 151, 156, 1); }
+
+            .cuIcon-hotfill { font-size: 26rpx; color: #e1212b; margin-right: 8rpx; }
+        }
+    }
+}
+.group-boxComponents.group-box { min-height: 50rpx; }
+
+.activity-goods-box { padding: 40rpx 20rpx; background: #fff;
+    .img-box { margin-right: 20rpx; width: 200rpx; height: 200rpx; overflow: hidden; position: relative;
+        .img { width: 200rpx; height: 200rpx; background-color: #ccc; }
+    }
+    .goods-right { width: 450rpx; min-height: 200rpx; align-items: flex-start; position: relative;
+        .title { font-size: 28rpx; line-height: 28rpx; width: 450rpx; }
+        .tip { font-size: 22rpx; color: #a8700d; width: 500rpx; }
+        .price-box {
+            .current { font-size: 28rpx; font-weight: 500; color: rgba(225, 33, 43, 1); }
+            .original { font-size: 22rpx; font-weight: 400; text-decoration: line-through; color: rgba(153, 153, 153, 1); margin-left: 14rpx; }
+        }
+    }
+}
+
+
+/*版权信息*/
+.coreshop-copyright { text-align: center; margin: 20rpx 0; width: 100%; overflow: hidden;
+    .beian {
+        a { text-decoration: none; color: #999 !important; }
+    }
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/coreTheme.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/coreTheme.scss
new file mode 100644
index 0000000000000000000000000000000000000000..6626a10e00b13e1735c983345581f8a93b7ae4cf
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/static/style/coreTheme.scss
@@ -0,0 +1,42 @@
+// 此文件为主题变量，这些变量目前只能通过uni.scss引入才有效，另外由于
+// uni.scss中引入的样式会同时混入到全局样式文件和单独每一个页面的样式中，造成微信程序包太大，
+// 故uni.scss只建议放scss变量名相关样式，其他的样式可以通过main.js或者App.vue引入
+
+//通用顶部状态栏加导航颜色
+$core-common-navbar-background-color: #e54d42;
+
+
+$core-main-color: #303133;
+$core-content-color: #606266;
+$core-tips-color: #909399;
+$core-light-color: #c0c4cc;
+$core-border-color: #e4e7ed;
+$core-bg-color: #f3f4f6;
+
+$core-type-primary: #2979ff;
+$core-type-primary-light: #ecf5ff;
+$core-type-primary-disabled: #a0cfff;
+$core-type-primary-dark: #2b85e4;
+
+$core-type-warning: #ff9900;
+$core-type-warning-disabled: #fcbd71;
+$core-type-warning-dark: #f29100;
+$core-type-warning-light: #fdf6ec;
+
+$core-type-success: #19be6b;
+$core-type-success-disabled: #71d5a1;
+$core-type-success-dark: #18b566;
+$core-type-success-light: #dbf1e1;
+
+$core-type-error: #fa3534;
+$core-type-error-disabled: #fab6b6;
+$core-type-error-dark: #dd6161;
+$core-type-error-light: #fef0f0;
+
+$core-type-info: #909399;
+$core-type-info-disabled: #c8c9cc;
+$core-type-info-dark: #82848a;
+$core-type-info-light: #f4f4f5;
+
+$core-form-item-height: 70rpx;
+$core-form-item-border-color: #dcdfe6;
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/coupon.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/coupon.scss
deleted file mode 100644
index f006aa88b29e77326ee534884bc763fe879a6b12..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/coupon.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-page { background: #fff; }
-.icon { width: 130rpx; height: 100rpx; top: 50%; transform: translateY(-50%); }
-.coreshop-sponsored-card-view { position: relative; margin: 27.27rpx 27.27rpx 0; }
-    .coreshop-sponsored-card-view .card-price-view { position: relative; background: #FFECED; border-radius: 14.54rpx 14.54rpx 0 0; padding: 18.18rpx; }
-        .coreshop-sponsored-card-view .card-price-view .price-left-view { position: absolute; height: 125.45rpx; width: 135.45rpx; text-align: center; line-height: 125.45rpx; }
-            .coreshop-sponsored-card-view .card-price-view .price-left-view .price { font-size: 45.45rpx; font-weight: 400; }
-        .coreshop-sponsored-card-view .card-price-view .name-content-view { position: relative; padding-left: 163.63rpx; padding-right: 145.45rpx; height: 125.45rpx; line-height: 1.8; color: #999898; }
-            .coreshop-sponsored-card-view .card-price-view .name-content-view::before { content: ''; position: absolute; top: -18.18rpx; bottom: -18.18rpx; margin-left: -18.18rpx; border-left: 2rpx dashed #fdbabc; }
-        .coreshop-sponsored-card-view .card-price-view .btn-right-view { position: absolute; right: 27.27rpx; top: 18.18rpx; height: 125.45rpx; line-height: 125.45rpx; }
-    .coreshop-sponsored-card-view .card-num-view { position: relative; background: #FFF5F5; border-radius: 0 0 14.54rpx 14.54rpx; border-top: 2rpx dashed #dedbdb; padding: 10.9rpx 27.27rpx; color: #999898; }
-        .coreshop-sponsored-card-view .card-num-view::before { content: ''; position: absolute; width: 36.36rpx; height: 36.36rpx; background: #ffffff; border-radius: 50%; top: -18.18rpx; left: -18.18rpx; }
-        .coreshop-sponsored-card-view .card-num-view::after { content: ''; position: absolute; width: 36.36rpx; height: 36.36rpx; background: #ffffff; border-radius: 50%; top: -18.18rpx; right: -18.18rpx; }
-        .coreshop-sponsored-card-view .card-num-view view { position: relative; padding-right: 72.72rpx; }
-        .coreshop-sponsored-card-view .card-num-view .btnUnfold { position: absolute; right: 27.27rpx; top: 14.54rpx; }
-
-
-.coreshop-lower-shelf { }
-    .coreshop-lower-shelf .card-price-view { opacity: 0.5; }
-    .coreshop-lower-shelf .card-num-view { opacity: 0.5; }
-    .coreshop-lower-shelf .img-lower-box { position: absolute; height: 100.9rpx; width: 100.9rpx; background-color: rgba(0, 0, 0, 0.6); border-radius: 181.81rpx; text-align: center; line-height: 100.9rpx; font-size: 24rpx; color: #dedede; top: 25.45rpx; left: 35rpx; -webkit-transition: left .15s; transition: left .15s; }
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/formDetails.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/formDetails.scss
deleted file mode 100644
index 15143ff40e245126fc2aec6bd92a79a1d0ff95f2..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/formDetails.scss
+++ /dev/null
@@ -1,123 +0,0 @@
-view { box-sizing: border-box; }
-.formContent { margin-bottom: 100rpx; background-color: #eeeeee; }
-.sw,
-.video { height: 350rpx; }
-.banner,
-.sw,
-.video { width: 100%; background-color: #fff; }
-    .banner image,
-    .sw swiper,
-    .sw swiper image,
-    .video video { width: 100%; height: 100%; }
-.plaintext { padding: 20rpx 30rpx; font-size: 30rpx; color: #333; background-color: #fff; }
-.goods { background-color: #fff; }
-.form-input-box-title { font-size: 28rpx; }
-.goods-box-item { overflow: hidden; padding: 20rpx 30rpx 20rpx 0; margin-left: 30rpx; border-bottom: 2rpx solid #eeeeee; }
-    .goods-box-item:nth-last-child(2) { border: none; }
-.goods-img { width: 150rpx; height: 150rpx; display: inline-block; float: left; }
-.goods-right { width: 520rpx; display: inline-block; float: left; margin-left: 20rpx; }
-.goods-name { font-size: 30rpx; color: #333; overflow: hidden; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; }
-.goods-mid { font-size: 24rpx; color: #999; }
-.goods-buttom { overflow: hidden; position: relative; height: 60rpx; }
-.goods-price { font-size: 28rpx; color: #eb0000; display: inline-block; }
-.red { color: #eb0000; font-size: 22rpx; }
-.stepper { float: right; }
-
-.choose-specs { width: 136rpx; height: 48rpx; line-height: 46rpx; border-radius: 50rpx; margin: 0 auto; text-align: center; display: inline-block; overflow: hidden; box-sizing: border-box; float: right; font-size: 24rpx; border: 2rpx solid #ccc; position: relative; top: 12rpx; }
-.goods-bottom { border-top: 2rpx solid #eeeeee; overflow: hidden; padding: 20rpx 30rpx; background-color: #fff; }
-.goods-total { float: right; color: #999; font-size: 28rpx; }
-.goods-total-r { color: #eb0000; font-size: 30rpx; }
-.input-box { margin: 20rpx 0; background-color: #fff; }
-.form-input-box-item { padding: 20rpx 30rpx 20rpx 0; margin-left: 30rpx; border-bottom: 2rpx solid #eeeeee; }
-.ib-item-left { display: inline-block; font-size: 28rpx; color: #333; width: 100%; padding: 10rpx 0; }
-.ib-item-right { width: 100%; display: inline-block; color: #666; font-size: 28rpx; padding: 6rpx 0; }
-.ib-item-input { color: #666; font-size: 28rpx; }
-.margin-r { margin-left: 40rpx; }
-.ib-item-input-c { color: #999; font-size: 28rpx; }
-.ib-item-label { display: inline-block; position: relative; min-width: 150rpx; margin-right: 20rpx; }
-    .ib-item-label radio { position: absolute; opacity: 0; width: 40rpx; height: 40rpx; }
-.ib-item-label-text { display: inline-block; margin-left: 60rpx; position: relative; top: 2rpx; }
-.label-icon { position: absolute; top: 0; }
-    .label-icon icon { margin: 0; }
-.ib-item-mid { padding-top: 4rpx; margin: 0; display: flex; align-items: center; justify-content: space-between; }
-    .ib-item-mid picker { height: 40rpx; }
-    .ib-item-mid .weui-select { border: none; height: 100%; line-height: 48rpx; min-height: 40rpx; }
-.ib-item-mid-text { margin-left: 40rpx; color: #999; }
-.icon-img { width: 32rpx; height: 32rpx; }
-.icon-img-right { width: 32rpx; height: 32rpx; right: 0; }
-.form-multiple-rows .form-input-box-item { border: none; }
-.f-m-r-item { color: #666; font-size: 28rpx; margin-top: 16upx; }
-    .f-m-r-item .ib-item-label { display: block; margin-bottom: 20rpx; }
-        .f-m-r-item .ib-item-label:last-child { margin-bottom: 0; }
-.various-spec-list { overflow: hidden; }
-.various-spec-item { padding: 10rpx 20rpx; display: inline-block; border: 2rpx solid #e2e2e2; margin-right: 20rpx; margin-bottom: 20rpx; border-radius: 6rpx; color: #666; background-color: #f7f7f7; min-width: 130rpx; text-align: center; }
-.vAactive { border: 2rpx solid #333; color: #333; }
-.various-spec-list:last-child .various-spec-item { margin-bottom: 0rpx; }
-.upload-img-list { overflow: hidden; }
-.upload-img-hd { position: relative; width: 150rpx; height: 150rpx; border: 2rpx solid #e2e2e2; background-color: #f7f7f7; border-radius: 6rpx; box-sizing: border-box; float: left; margin-left: 30rpx; }
-    .upload-img-hd input { position: absolute; width: 100%; height: 100%; opacity: 0; }
-    .upload-img-hd image { width: 48rpx; height: 48rpx; position: relative; top: 50%; left: 50%; transform: translate(-50%, -50%); }
-.upload-img-bd { /* width: 150rpx; */ /* height: 150rpx; */ float: left; overflow: hidden; }
-.upload-img .upload-camera { width: 100%; height: 100%; }
-.upload-img { width: 150rpx; height: 150rpx; position: relative; float: left; margin-right: 30rpx; }
-    .upload-img:last-child { margin-right: 0; }
-.del-img { width: 36rpx !important; height: 36rpx !important; position: absolute; right: 0; top: 0; z-index: 99; }
-.ib-item-textarea { width: 100%; height: 200rpx; box-sizing: border-box; border: 2rpx solid #e2e2e2; background-color: #f7f7f7; border-radius: 6rpx; padding: 20rpx 30rpx; }
-.bottom-btn { position: fixed; bottom: 0; width: 100%; z-index: 95; }
-    .bottom-btn button { width: 100%; height: 90rpx; line-height: 90rpx; margin: 0 auto; background-color: #333; color: #fff; font-size: 32rpx; border-radius: 0; }
-        .bottom-btn button::after { border-radius: 0; }
-.hidden { display: none; }
-.checkout-list { overflow: hidden; }
-.checkout-item { display: inline-block; float: left; }
-.checkout-item-c { padding: 4rpx 14rpx; border: 2rpx solid #ccc; margin-right: 10rpx; border-radius: 6rpx; color: #888; }
-    .checkout-item-c checkbox { display: none; }
-.black { background-color: rgb(55, 55, 55); color: #fff; border: 2rpx solid rgb(55, 55, 55); }
-/*支付按钮样式*/
-.content-bot { margin-top: 18rpx; }
-    .content-bot > view { padding: 16rpx 0; margin-bottom: 2rpx; position: relative; background-color: #fff; height: 75rpx; }
-        .content-bot > view button { background-color: #fff; width: 100%; height: 100%; padding: 0; position: static; text-align: left; }
-            .content-bot > view button::after { border: none; }
-    .content-bot .left-img { display: inline-block; height: 82rpx; width: 94rpx; border-right: 2rpx solid #f4f4f4; position: absolute; left: 30rpx; top: 50%; transform: translateY(-50%); }
-        .content-bot .left-img image { width: 64rpx; height: 64rpx; position: relative; top: 8rpx; }
-.content-bot-right { display: inline-block; margin-left: 150rpx; position: relative; top: 16rpx; }
-.modal-box { position: fixed; width: 100%; height: 100%; top: 0px; background: rgba(0, 0, 0, 0.4); overflow: hidden; z-index: 1000; }
-.modal-body { position: fixed; bottom: 0; background-color: #fff; width: 100%; z-index: 1001; font-size: 28rpx; }
-.modal-payment .item { height: 80rpx; width: 100%; line-height: 80rpx; text-align: center; }
-.modal-payment .immediate-pay { height: 80rpx; line-height: 80rpx; width: 100%; text-align: center; border: none; border-radius: 0; border-bottom: 2rpx solid #eee; box-sizing: border-box; background-color: #fff; }
-    .modal-payment .immediate-pay::after { border: none; }
-.specs-goods-t { position: relative; padding: 30rpx; border-bottom: 2rpx solid #f3f3f3; }
-.specs-goods-information { width: 520rpx; display: inline-block; }
-    .specs-goods-information .specs-goods-name { width: 100%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; display: block; font-size: 24rpx; margin-bottom: 20rpx; }
-    .specs-goods-information .specs-goods-price { display: block; color: #ff3b44; font-size: 30rpx; }
-.close-btn { width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; position: absolute; right: 30rpx; }
-    .close-btn image { width: 100%; height: 100%; }
-.modal-body .detail-footer-right { width: 100%; }
-.gray-text { color: #a5a5a5; font-size: 28rpx; }
-.salespromotion-service-name { margin-bottom: 30rpx; float: left; }
-
-.color,
-.number { padding: 22rpx 25rpx; border-bottom: 2rpx solid #f3f3f3; overflow: hidden; }
-.color { padding-bottom: 8rpx; }
-    .color .salespromotion-service-b,
-    .specifications .salespromotion-service-b { width: 600rpx; display: inline-block; float: left; }
-        .color .salespromotion-service-b > view,
-        .specifications .salespromotion-service-b > view { padding: 2rpx 20rpx; display: inline-block; text-align: center; border: 2rpx solid #e0e0e0; border-radius: 8rpx; color: #666; margin-right: 22rpx; margin-bottom: 12rpx; }
-.pitch-on { border: 2rpx solid #ff3b44; background-color: #ff3b44; color: #fff !important; }
-.nothing { border: 2rpx dashed #e0e0e0 !important; color: #c9c9c9 !important; }
-.specs-goods-c { margin-bottom: 100rpx; max-height: 432rpx; }
-.number { padding: 22rpx 25rpx; }
-    .number > text { color: #999; position: relative; font-size: 28rpx; }
-.detail-footer { overflow: hidden; height: 100rpx; position: fixed; bottom: 0; width: 750rpx; text-align: center; z-index: 1000; }
-.detail-footer-left { width: 30%; height: 100rpx; font-size: 24rpx; color: #666; background-color: #f7f7f7; padding-top: 10rpx; box-sizing: border-box; display: inline-block; }
-    .detail-footer-left > view { width: 50%; box-sizing: border-box; float: left; display: inline-block; }
-        .detail-footer-left > view image { height: 36rpx; width: 36rpx; }
-        .detail-footer-left > view text { display: block; }
-.detail-footer-right { width: 70%; display: inline-block; height: 100rpx; line-height: 100rpx; float: right; font-size: 28rpx; color: #fff; box-sizing: border-box; }
-    .detail-footer-right > view { width: 100%; display: inline-block; }
-.modal-body .detail-footer-right { width: 100%; }
-.detail-footer-right > view { background-color: #333; }
-.order-num { display: block; min-width: 16rpx; height: 28rpx; line-height: 28rpx; background-color: #ff3b44; color: #fff; font-size: 16rpx; border-radius: 50rpx; position: absolute; right: 0rpx; top: 0rpx; padding: 0 6rpx; text-align: center; }
-.uni-list-cell-pd { margin-right: 40upx; }
-.invoice-type-icon,
-.invoice-type-c { display: inline-block; }
-.ib-item-start { justify-content: flex-start; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/goodDetails.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/goodDetails.scss
deleted file mode 100644
index 3c6ac13e91516f31288621c296b3dd71eb47e25f..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/goodDetails.scss
+++ /dev/null
@@ -1,274 +0,0 @@
-
-.basis-1 { flex-basis: 10%; }
-.basis-2 { flex-basis: 20%; }
-.basis-3 { flex-basis: 30%; }
-.basis-4 { flex-basis: 40%; }
-.basis-5 { flex-basis: 50%; }
-.basis-6 { flex-basis: 60%; }
-.basis-7 { flex-basis: 70%; }
-.basis-8 { flex-basis: 80%; }
-.basis-9 { flex-basis: 90%; }
-.basis-10 { flex-basis: 100%; }
-
-
-.coreshop-banner-swiper-box { position: relative; width: 100%;
-    .screen-swiper { min-height: 750rpx; }
-    .tag { font-size: 24upx; vertical-align: middle; position: relative; display: inline-flex; align-items: center; justify-content: center; box-sizing: border-box; padding: 0upx 16upx; height: 48upx; font-family: Helvetica Neue, Helvetica, sans-serif; white-space: nowrap; }
-    .coreshop-page { position: absolute; bottom: 27.27rpx; right: 27.27rpx; padding: 18.18rpx; }
-}
-
-.coreshop-limited-seckill-box { position: relative; background-image: url('/static/images/good/titlebg.png'); background-repeat: no-repeat; background-size: 100% 100%; padding: 18.18rpx 27.27rpx; color: #ffffff; width: 100%;
-    .text-xxl { font-size: 54.54rpx; }
-    .coreshop-cost-price-num { position: absolute; font-weight: 200; left: 199.99rpx; top: 21.81rpx; }
-    .coreshop-cost-price-num.price-6 { left: 254.54rpx; }
-    .coreshop-cost-price-num.price-5 { left: 227.27rpx; }
-    .coreshop-cost-price-num.price-4 { left: 199.99rpx; }
-    .coreshop-cost-price-num.price-3 { left: 163.63rpx; }
-    .coreshop-cost-price-num.price-2 { left: 136.36rpx; }
-    .coreshop-cost-price-num.price-1 { left: 99.99rpx; }
-    .coreshop-time-right { position: absolute; right: 100rpx; top: 10rpx; }
-    .coreshop-share-right { position: absolute; right: 27.27rpx; top: 16.36rpx; }
-}
-    .coreshop-limited-seckill-box::after { content: ""; position: absolute; z-index: -1; background-color: inherit; width: 100%; height: 100%; left: 0; bottom: -10%; border-radius: 10upx; opacity: 0.2; transform: scale(0.9, 0.9); }
-
-
-.coreshop-view-box { position: relative; padding: 18.18rpx 27.27rpx; }
-.coreshop-title-view-box { position: relative; position: relative;
-    .cu-tag { margin-top: -9.09rpx; margin-right: 9.09rpx; }
-    .title-view { display: inline-block; flex-direction: row; align-items: center; }
-    .cu-tag { margin-top: -9.09rpx; margin-right: 9.09rpx; }
-    .coreshop-title-tip-box { position: relative; padding: 9.09rpx 18.18rpx; width: 100%;
-        .text-cut { padding-right: 27.27rpx; }
-        .icon { position: absolute; right: 18.18rpx; top: 12rpx; }
-    }
-}
-.coreshop-service-view-box { position: relative;
-    .flex {
-        .basis-1 { flex-basis: 10%; }
-        .basis-2 { flex-basis: 20%; }
-        .basis-3 { flex-basis: 30%; }
-        .basis-4 { flex-basis: 40%; }
-        .basis-5 { flex-basis: 50%; }
-        .basis-6 { flex-basis: 60%; }
-        .basis-7 { flex-basis: 70%; }
-        .basis-8 { flex-basis: 80%; }
-        .basis-9 { flex-basis: 90%; }
-    }
-    .tag-view-box { position: relative; top: -3.63rpx;
-        .tag-view { margin-right: 18.18rpx; padding: 0; }
-        .cu-tag + .cu-tag { margin-left: 0; }
-    }
-    .tag-view { margin-right: 9.09rpx; }
-    .icon-view { height: 100%; display: flex; align-items: center;
-        .icon { position: absolute; right: 15px; }
-    }
-}
-
-.coreshop-promotion-view-box {
-    .flex {
-        .basis-1 { flex-basis: 10%; }
-        .basis-2 { flex-basis: 20%; }
-        .basis-3 { flex-basis: 30%; }
-        .basis-4 { flex-basis: 40%; }
-        .basis-5 { flex-basis: 50%; }
-        .basis-6 { flex-basis: 60%; }
-        .basis-7 { flex-basis: 70%; }
-        .basis-8 { flex-basis: 80%; }
-        .basis-9 { flex-basis: 90%; }
-    }
-    .text-view { margin-left: 9.09rpx; }
-    .icon-view { height: 100%; display: flex; align-items: center;
-        .icon { position: absolute; right: 15px; }
-    }
-}
-
-.coreshop-select-view-box {
-    .flex {
-        .basis-1 { flex-basis: 10%; }
-        .basis-2 { flex-basis: 20%; }
-        .basis-3 { flex-basis: 30%; }
-        .basis-4 { flex-basis: 40%; }
-        .basis-5 { flex-basis: 50%; }
-        .basis-6 { flex-basis: 60%; }
-        .basis-7 { flex-basis: 70%; }
-        .basis-8 { flex-basis: 80%; }
-        .basis-9 { flex-basis: 90%; }
-    }
-    .coreshop-border-view { position: relative; background: #efebeb; margin: 21.81rpx 0; height: 2rpx; width: 100%; }
-    .icon { position: relative; top: 3.63rpx; }
-}
-
-.coreshop-comment-view-box {
-    .coreshop-border-view { position: relative; background: #efebeb; margin: 0 27.27rpx; height: 2rpx; }
-    .coreshop-view-box {
-        .flex {
-            .basis-1 { flex-basis: 10%; }
-            .basis-2 { flex-basis: 20%; }
-            .basis-3 { flex-basis: 30%; }
-            .basis-4 { flex-basis: 40%; }
-            .basis-5 { flex-basis: 50%; }
-            .basis-6 { flex-basis: 60%; }
-            .basis-7 { flex-basis: 70%; }
-            .basis-8 { flex-basis: 80%; }
-            .basis-9 { flex-basis: 90%; }
-        }
-    }
-}
-
-.coreshop-goods-info-view-box {
-    .coreshop-shop-view { position: relative; width: 100%;
-        .cu-avatar { position: absolute; height: 80rpx; width: 80rpx; }
-        .text-view { padding-left: 99.99rpx; padding-right: 145.45rpx; }
-        .cu-btn { position: absolute; top: 21.81rpx; right: 0; }
-    }
-    .coreshop-border-view { position: relative; background: #efebeb; margin: 21.81rpx 0; height: 2rpx; width: 100%; }
-    .live-tag-view { position: relative; width: 100%;
-        .text-view { padding-right: 127.27rpx;
-            .cu-tag { position: relative; top: -3.63rpx; }
-        }
-        .text-right-view { position: absolute; right: 0; top: 3.63rpx; }
-    }
-    .coreshop-recommend-list-box {
-        .recommend-scroll-box { position: relative; width: 100%;
-            .recommend-scroll { position: relative; height: 363.63rpx; white-space: nowrap; width: 100%;
-                .recommend-scroll-item { display: inline-block; padding-top: 27.27rpx; width: 199.99rpx; padding-right: 18.18rpx; white-space: initial;
-                    .cu-avatar { width: 181.81rpx; height: 181.81rpx; }
-                }
-            }
-        }
-    }
-}
-
-.coreshop-goods-details-box { position: relative; width: 100%;
-    image { width: 100%; }
-}
-
-.coreshop-goods-help-view-box {
-    .flex {
-        .basis-1 { flex-basis: 10%; }
-        .basis-2 { flex-basis: 20%; }
-        .basis-3 { flex-basis: 30%; }
-        .basis-4 { flex-basis: 40%; }
-        .basis-5 { flex-basis: 50%; }
-        .basis-6 { flex-basis: 60%; }
-        .basis-7 { flex-basis: 70%; }
-        .basis-8 { flex-basis: 80%; }
-        .basis-9 { flex-basis: 90%; }
-    }
-    .coreshop-border-view { position: relative; background: #efebeb; margin: 21.81rpx 0; height: 2rpx; width: 100%; }
-}
-
-.coreshop-recommend-list-view-box { padding: 18.18rpx 0;
-    .flex {
-        .img-aau { width: 81.81rpx; margin-top: 12.72rpx; }
-        .text-right {
-            .img-aau { margin-right: 14.54rpx; }
-        }
-        .text-left {
-            .img-aau { margin-left: 14.54rpx; }
-        }
-    }
-    .coreshop-goods-list-box { position: relative; width: 100%; margin: 27.27rpx 0;
-        .col-2 { margin: 0 18.18rpx;
-            .list-itme { padding: 9.09rpx;
-                .list-radius { border-radius: 18.18rpx;
-                    .goods-img { position: relative; width: 100%;
-                        .cu-avatar { width: 340rpx; height: 340rpx; border-radius: 18.18rpx 18.18rpx 0 0; }
-                        .mold-view { position: absolute; bottom: 0; }
-                    }
-                    .view-goods-info { position: relative; padding: 18.18rpx;
-                        .text-lg { font-size: 36.36rpx; }
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-.navigation { display: flex; position: fixed; bottom: 0; margin-top: 120rpx; border-top: solid 2rpx #f2f2f2; background-color: #ffffff; width: 100%; z-index: 1;
-    .left { display: flex; font-size: 20rpx;
-        .weinButton { margin: 0 30rpx; border: none; border-radius: 0; padding: 0 0; line-height: inherit; background-color: #ffffff; }
-        .weinButton:after { content: ""; display: block; clear: both; border: 0; }
-        .item { margin: 0 30rpx;
-            &.car { text-align: center; position: relative;
-                .car-num { position: absolute; top: -10rpx; right: -10rpx; border: none; }
-            }
-        }
-    }
-    .right { display: flex; font-size: 28rpx; align-items: center;
-        .cu-btn { padding: 0 20rpx; }
-        .cart { background-color: #ed3f14; margin-right: 30rpx; }
-        .buy { background-color: #ff7900; }
-    }
-}
-
-
-
-.coreshop-footer-fixed { display: flex; position: fixed; bottom: 0; margin-top: 120rpx; width: 100%; z-index: 1; border-top: solid 2rpx #f2f2f2; background-color: #ffffff;
-    .cu-bar.tabbar.shop { width: 100%;
-        .action { color: #333333; width: 110rpx; }
-    }
-}
-
-.coreshop-bottom-modal-box {
-    .coreshop-title-bar { position: relative; width: 100%;
-        .close-icon { position: absolute; right: 36.36rpx; }
-    }
-    .coreshop-modal-content { position: relative; width: 100%; overflow-y: auto; height: calc(100vh - 654.54rpx); padding: 0 29.09rpx 29.09rpx; margin-bottom: 118.18rpx;
-        .coreshop-view-box { position: relative; width: 100%; padding: 0; text-align: left; }
-        .coreshop-view-box.service {
-            .text-view { margin-bottom: 18.18rpx; }
-            .text-list-view { position: relative; width: 100%; margin-bottom: 18.18rpx;
-                .text-cut { padding-right: 21rpx; }
-            }
-            .text-list-view + .text-view { margin-top: 36.36rpx; }
-        }
-        .coreshop-view-box.promotion {
-            .text-view { margin-bottom: 18.18rpx;
-                .cu-tag { position: relative; top: -3.63rpx; }
-            }
-            .text-list-view { position: relative; width: 100%; margin-bottom: 18.18rpx;
-                .text-cut { padding-right: 218.18rpx; }
-                .text-right-view { position: absolute; right: 0; top: 2rpx; }
-            }
-            .text-list-view + .text-view { margin-top: 36.36rpx; }
-        }
-        .coreshop-view-box.select {
-            .cu-list.menu-avatar > .cu-item {
-                .content { width: calc(100% - 94.54rpx - 59.99rpx); }
-            }
-            .coreshop-select-btn-list-box {
-                .select-item { padding: 18.18rpx 0; border-bottom: 2rpx solid #f3f3f3;
-                    .select-btn { position: relative; margin-top: 14.54rpx; width: 100%;
-                        .cu-btn { font-size: 23.63rpx; margin: 5rpx 16.36rpx 5rpx 0; padding: 0 10rpx; height: 44rpx; }
-                        .cu-btn.light { border: 1rpx dashed; }
-                        .cu-btn[disabled] { color: #aaaaaa; }
-                    }
-                }
-            }
-        }
-        .coreshop-modal-footer-fixed { padding: 9.09rpx 29.09rpx 29.09rpx; }
-    }
-}
-    .coreshop-bottom-modal-box.cu-modal.bottom-modal {
-        .cu-dialog { border-radius: 36.36rpx 36.36rpx 0 0; }
-    }
-
-
-
-.coreshop-details-view-box { position: relative;
-    .title-view { padding: 9.09rpx 0 18.18rpx; }
-    .col-item { margin: 9.09rpx 0; }
-    .coreshop-text-content-view { margin: 27.27rpx 0; }
-    .coreshop-img-box { position: relative; width: 100%;
-        image { width: 100%; border-radius: 18.18rpx; }
-        image + image { margin-top: 18.18rpx; }
-    }
-}
-
-
-
-.nav-back { width: 100%; height: 44px; /* #ifndef MP-WEIXIN */ padding: 12px 12px 0; /* #endif */ /* #ifdef MP-WEIXIN */ padding: 26px 12px 0; /* #endif */ position: fixed; top: 20rpx; background-color: rgba(255, 255, 255, 0); z-index: 98; }
-.back-btn { height: 32px; width: 32px; border-radius: 50%; background-color: rgba(255, 255, 255, 0.8); }
-    .back-btn .icon { height: 20px; width: 20px; position: relative; top: 50%; left: 46%; transform: translate(-50%, -50%); }
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/member.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/member.scss
deleted file mode 100644
index 92f1e683e3e719891b4e8166d85ee53b6bfd8dc7..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/member.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-.coreshop-view-content { padding: 0 27.27rpx 54.54rpx; margin-top: -63.63rpx; }
-    .coreshop-view-content .coreshop-user-info-order-box { border-radius: 18.18rpx; }
-        .coreshop-view-content .coreshop-user-info-order-box .cu-list.grid.no-border { padding: 0; }
-            .coreshop-view-content .coreshop-user-info-order-box .cu-list.grid.no-border > .cu-item { padding-bottom: 9.09rpx; }
-    .coreshop-view-content .cu-list.grid > .cu-item text { color: inherit; }
-    .coreshop-view-content .coreshop-user-info-money-box { border-radius: 18.18rpx; }
-        .coreshop-view-content .coreshop-user-info-money-box .money-col { padding: 0 9.09rpx 9.09rpx; }
-            .coreshop-view-content .coreshop-user-info-money-box .money-col .money-item { position: relative; padding: 9.09rpx; }
-                .coreshop-view-content .coreshop-user-info-money-box .money-col .money-item .money-item-view { border: 1.81rpx solid #f3f2f3; border-radius: 18.18rpx; position: relative; padding: 9.09rpx; }
-                    .coreshop-view-content .coreshop-user-info-money-box .money-col .money-item .money-item-view .cu-avatar { position: absolute; left: 9.09rpx; }
-                    .coreshop-view-content .coreshop-user-info-money-box .money-col .money-item .money-item-view .money-content { position: relative; margin-left: 109.09rpx; margin-bottom: 27.27rpx; top: 12.72rpx; }
-    .coreshop-view-content .coreshop-user-info-tools-box { border-radius: 18.18rpx; }
-        .coreshop-view-content .coreshop-user-info-tools-box .tools-view { position: relative; }
-            .coreshop-view-content .coreshop-user-info-tools-box .tools-view .tools-title { padding-right: 81.81rpx; }
-            .coreshop-view-content .coreshop-user-info-tools-box .tools-view .tools-right { position: absolute; right: 9.09rpx; bottom: 23.63rpx; }
-
-/*.bg-gradual-red { background-image: linear-gradient(45deg, #f43f3b, #ec008c); color: #ffffff; }*/
-.my-box .head-box { padding-top: 0; padding-bottom: 72.72rpx; background-image: url('/static/images/common/bg.png'); background-size: cover; background-position: center; }
-    /*.my-box .head-box .user-info-box {*/ /* #ifdef MP */ /*padding-top: calc(var(--status-bar-height) + 50rpx);*/ /* #endif */ /*}*/
-    .my-box .head-box .user-info-box { /* #ifdef MP */ padding-top: 30rpx; /* #endif */ }
-        .my-box .head-box .user-info-box .login-user-view { position: relative; text-align: center; }
-            .my-box .head-box .user-info-box .login-user-view .login-user-avatar-view { position: relative; margin-bottom: 18.18rpx; }
-.text-border-x { margin-right: 25.45rpx; position: relative; }
-    .text-border-x:after { position: absolute; background: #dddddd; top: 10.45rpx; width: 1.81rpx; right: -12.72rpx; height: 16.36rpx; content: " "; }
-.u-tips-color { color: #909399; }
-
-.userItem { padding: 16rpx 10rpx 0rpx 10rpx; height: 140rpx; -webkit-box-pack: end; -webkit-justify-content: flex-end; justify-content: flex-end; -webkit-box-align: center; -webkit-align-items: center; align-items: center; }
-
-
-.head-bg-box { position: fixed; width: 100%; top: 0; z-index: 9999; background-color: rgba(229, 77, 66,0); padding-top: calc(var(--status-bar-height) + 15rpx); transition: top .25s; }
-
-.my-box .head-box .user-info-tip-box { position: relative; margin: 18.18rpx 27.27rpx; border-radius: 9.09rpx; padding: 18.18rpx 27.27rpx; }
-    .my-box .head-box .user-info-tip-box .text-cut { padding-right: 45.45rpx; }
-    .my-box .head-box .user-info-tip-box .icon { position: absolute; right: 27.27rpx; top: 23.63rpx; }
-
-.account-face { height: 60px; width: 60px; flex: 0 0 60px; background-color: transparent; border-radius: 500px; display: -webkit-inline-box; display: -webkit-inline-flex; display: inline-flex; -webkit-box-align: center; -webkit-align-items: center; align-items: center; -webkit-box-pack: center; -webkit-justify-content: center; justify-content: center; font-size: 28rpx; color: #606266; -webkit-border-radius: 10px; border-radius: 10px; position: relative; }
-
-
-.yqhy { background-image: url(/static/images/my/1.png); }
-.yqhy2 { background-image: url(/static/images/my/2.png); }
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/orderDetails.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/orderDetails.scss
deleted file mode 100644
index efe8e4651c23291819898566f8e451c39673dd17..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/orderDetails.scss
+++ /dev/null
@@ -1,142 +0,0 @@
-.cu-steps .cu-item {
-    &:before { width: calc(100% - 72.72rpx); border-bottom: 5.45rpx solid #FFF3F3; left: calc(0px - (100% - 72.72rpx) / 2); top: 34.54rpx; }
-    .icon-view { border-radius: 181.81rpx; height: 72.72rpx; width: 72.72rpx; margin: auto; margin-bottom: 14.54rpx; box-sizing: border-box; border: 7.27rpx solid #FFF3F3;
-        text { font-size: 36.36rpx; line-height: 61.81rpx; }
-    }
-}
-    .cu-steps .cu-item.select {
-        &:before { border-color: #e54d42; }
-        .icon-view { border: 7.27rpx solid #e54d42; }
-    }
-.coreshop-card-box { padding: 27.27rpx 27.27rpx 0; }
-.coreshop-card-hight-box { height: 45.45rpx; }
-.coreshop-card-view { position: relative; border-radius: 9.09rpx; padding: 18.18rpx; box-shadow: 0 0 14.54rpx #f1f1f1; }
-.coreshop-goods-ad-view {
-    .cu-avatar { position: absolute; height: 136.36rpx; width: 136.36rpx; }
-    .goods-info-view { position: relative; padding-left: 154.54rpx; padding-right: 145.45rpx; height: 136.36rpx;
-        .cu-tag { font-size: 21.81rpx; padding: 0 18.18rpx; height: 36.36rpx; border-radius: 18.18rpx 3.63rpx; }
-        .text-black { margin-top: 18.18rpx; margin-bottom: 7.27rpx; }
-    }
-    .goods-btn-view { position: absolute; line-height: 136.36rpx; height: 136.36rpx; right: 18.18rpx; top: 18.18rpx; }
-}
-.coreshop-shop-view { position: relative;
-    .shop-info-view { position: relative; margin-bottom: 27.27rpx; line-height: 47.27rpx; height: 47.27rpx;
-        .cu-avatar { position: absolute; }
-        .title-view { position: relative; padding-left: 63.63rpx; }
-    }
-    .goods-list-view { position: relative; margin: 18.18rpx 0;
-        .cu-avatar { position: absolute; height: 154.54rpx; width: 154.54rpx; }
-        .goods-info-view { position: relative; padding-left: 172.72rpx; height: 154.54rpx;
-            .name { position: relative; height: 38.18rpx; width: 100%; }
-            .introduce { position: relative; height: 32.72rpx; width: 100%; }
-            .tag-view { position: relative; margin-bottom: 9.09rpx; margin-top: 7.27rpx; width: 100%;
-                .cu-tag { position: relative; top: -2rpx; }
-            }
-            .text-price { position: relative; height: 36.36rpx; width: 100%; }
-        }
-    }
-    .coreshop-foot-view { position: relative; background: #FFFCFC; margin: 0 -18.18rpx -18.18rpx -18.18rpx; border-radius: 0 0 9.09rpx 9.09rpx; padding: 18.18rpx;
-        .left-view { position: relative; padding-right: 181.81rpx;
-            .af5-img { position: relative; margin-right: 9.09rpx; width: 36.36rpx; top: 3.63rpx; }
-        }
-        .text-right { position: absolute; right: 18.18rpx; top: 18.18rpx; }
-    }
-}
-.coreshop-price-view { position: relative;
-    .title-view { position: relative; margin-bottom: 18.18rpx;
-        .title { position: relative; padding-right: 181.81rpx; }
-        .text-right { position: absolute; top: 3.63rpx; right: 0; }
-    }
-    .title-right-view { position: relative; margin-top: 27.27rpx; text-align: right; }
-    .title-left-view { position: relative; margin-top: 27.27rpx; text-align: left; }
-    .solid-line { margin: 27.27rpx 0; }
-}
-.coreshop-order-view { position: relative;
-    .solid-line { margin: 27.27rpx 0; }
-    .title-view { position: relative; margin-bottom: 18.18rpx;
-        &:last-child { margin-bottom: 12.72rpx; }
-        .title { position: absolute; top: 3.63rpx; left: 0; }
-        .text-right { position: relative; padding-left: 181.81rpx;
-            .cu-btn { padding: 0 10.9rpx; height: 30.9rpx; top: -3.63rpx; }
-        }
-    }
-}
-.coreshop-address-view { position: relative;
-    .solid-line { margin: 18.18rpx 0; }
-    .cu-list.menu-avatar > .cu-item { height: 55px;
-        &:after { width: 0; height: 0; border-bottom: 0; }
-        .icon-view { position: absolute; border-radius: 100%; text-align: center; line-height: 45.45rpx; height: 45.45rpx; width: 45.45rpx; left: 9.09rpx; top: 25.45rpx; }
-        .content { left: 72.72rpx; width: calc(100% - 94.54rpx); }
-    }
-}
-.coreshop-status-img-view { position: relative;
-    .are-img-view { position: relative; margin-bottom: 18.18rpx;
-        .are-img { width: 327.27rpx; }
-    }
-}
-.coreshop-title-view { position: relative; margin: 36.36rpx;
-    .img-anc { position: relative; width: 36.36rpx; top: 3.63rpx; }
-}
-.coreshop-recommend-goods-list-view { position: relative;
-    .flex-wrap { padding: 9.09rpx;
-        .basis-df { width: 50%; padding: 0 9.09rpx; }
-    }
-    .list-itme { text-align: center; margin-bottom: 18.18rpx;
-        .cu-avatar { width: 347.27rpx; height: 347.27rpx; }
-        .goods-info-view { position: relative; padding: 14.54rpx; text-align: left;
-            .text-price { margin: 9.09rpx 0; }
-            .foot-box { position: relative;
-                .cu-tag { position: absolute; right: 0; top: 0; }
-            }
-        }
-    }
-}
-.foot-hight-view { width: 100%; height: calc((env(safe-area-inset-bottom) / 2) + 109.09rpx); }
-.coreshop-footer-fixed { box-shadow: 0 -3.63rpx 10.9rpx 0 #eaeaea; padding: 18.18rpx 27.27rpx; text-align: right;
-    .cu-btn { margin-left: 10px; }
-}
-.cu-modal.bottom-modal {
-    .cu-bar { min-height: 81.81rpx;
-        .title { position: relative; width: 100%; }
-        .close { position: absolute; font-size: 36.36rpx; right: 27.27rpx; }
-    }
-    .modal-view { position: relative; width: 100%;
-        .content { position: relative; text-align: left; padding: 27.27rpx 18.18rpx;
-            .tel-btn-view { position: relative; width: 100%;
-                .tel-view { position: relative; padding-right: 163.63rpx; line-height: 47.27rpx; height: 47.27rpx; }
-                .cu-btn { position: absolute; right: 0; top: 0; }
-            }
-            .code-view { position: relative; text-align: center;
-                .code { font-size: 54.54rpx; }
-                .code + .code { margin-left: 18.18rpx; }
-            }
-        }
-        .num-lock-view { position: relative; margin-bottom: -2rpx;
-            .solid-top::after { border-top: 2rpx solid rgba(0, 0, 0, 0.1); }
-            .cu-list.grid > .cu-item {
-                text { color: inherit; }
-                .num { font-size: 40rpx; }
-                .close { font-size: 32.72rpx; margin-top: 9.09rpx; }
-                &:active { background-color: #f0f0f0; }
-            }
-        }
-    }
-}
-
-
-
-.cell-item { width: auto; padding: 0rpx; }
-.cell-item-bd { margin-left: 0rpx; padding-right: 0rpx; }
-.cell-ft-view { font-size: 24rpx; }
-
-.priceBox { position: relative; }
-.nums { position: absolute; top: 0; right: 0; }
-
-
-
-.cell-item { margin-left: 0rpx; }
-.user-head-img-c { position: relative; width: 80upx; height: 80upx; border-radius: 50%; margin-right: 20upx; box-sizing: border-box; display: inline-block; float: left; border: 1px solid #f3f3f3; margin-bottom: 20rpx; margin-top: 20rpx; }
-.user-head-img-tip { position: absolute; top: -6upx; left: -10upx; display: inline-block; background-color: #FF7159; color: #fff; font-size: 22upx; z-index: 99; padding: 0 10upx; border-radius: 10upx; transform: scale(.8); }
-.group-swiper .cell-item .user-head-img { width: 100%; height: 100%; border-radius: 50%; }
-.group-swiper .cell-item .user-head-img-c:first-child { border: 1px solid #FF7159; }
-.uhihn { width: 80upx; height: 80upx; border-radius: 50%; margin-right: 20upx; display: inline-block; border: 2upx dashed #e1e1e1; text-align: center; line-height: 80upx; color: #d1d1d1; font-size: 40upx; box-sizing: border-box; }
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/pinTuan.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/pinTuan.scss
deleted file mode 100644
index 4c2ffe752a2a0b86f526ca01cbd5ec498d65e9aa..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Uni-App/CoreShop/static/style/pinTuan.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-.group-wrap { background: url('/static/images/pinTuan/pinTuanListBg.png') no-repeat; background-size: 100% 374rpx; }
-.group-head { padding: 0 25rpx; height: 100rpx;
-    .group-head__title { font-size: 32rpx; font-family: PingFang SC; font-weight: 500; color: rgba(255, 255, 255, 1); }
-    .group-head__notice { font-size: 26rpx; font-family: PingFang SC; font-weight: 500; color: rgba(255, 255, 255, 1); }
-}
-
-.group-box { width: 710rpx; background: linear-gradient(#fff, #f5f5f5); border-radius: 20rpx; margin: 0 auto; min-height: 1000rpx;
-    .goods-item { border-radius: 20rpx; overflow: hidden; position: relative; margin-bottom: 20rpx;
-        .tag { position: absolute; left: 0; top: 10rpx; z-index: 2; line-height: 35rpx; background: linear-gradient(132deg, rgba(255, 153, 93, 1), rgba(255, 99, 97, 1)); border-radius: 0px 18rpx 18rpx 0px; padding: 0 10rpx; font-size: 24rpx; font-family: PingFang SC; font-weight: bold; color: rgba(255, 255, 255, 0.8); }
-        .goods-right { width: 460rpx;
-            .title { width: 460rpx; color: $u-main-color }
-            .tip { width: 460rpx; }
-        }
-        .buy-btn { position: absolute; right: 0; bottom: -10rpx; width: 160rpx; height: 60rpx; background: linear-gradient(90deg, rgba(254, 131, 42, 1), rgba(255, 102, 0, 1)); box-shadow: 0px 7rpx 6rpx 0px rgba(255, 104, 4, 0.22); border-radius: 30rpx; font-size: 28rpx; font-family: PingFang SC; font-weight: 500; color: #fff; padding: 0; }
-        .group-num { font-size: 20rpx; font-family: PingFang SC; font-weight: 500; color: rgba(153, 153, 153, 1); margin-left: 20rpx; }
-        .sell-box { background: rgba(255, 224, 226, 0.3); border-radius: 16rpx; line-height: 32rpx; padding: 0 10rpx;
-            .sell-num { font-size: 20rpx; font-family: PingFang SC; font-weight: 400; color: rgba(247, 151, 156, 1); }
-
-            .cuIcon-hotfill { font-size: 26rpx; color: #e1212b; margin-right: 8rpx; }
-        }
-    }
-}
-.group-boxComponents.group-box { min-height: 50rpx; }
-
-.activity-goods-box { padding: 40rpx 20rpx; background: #fff;
-    .img-box { margin-right: 20rpx; width: 200rpx; height: 200rpx; overflow: hidden; position: relative;
-        .img { width: 200rpx; height: 200rpx; background-color: #ccc; }
-    }
-    .goods-right { width: 450rpx; min-height: 200rpx; align-items: flex-start; position: relative;
-        .title { font-size: 28rpx; line-height: 28rpx; width: 450rpx; }
-        .tip { font-size: 22rpx; color: #a8700d; width: 500rpx; }
-        .price-box {
-            .current { font-size: 28rpx; font-weight: 500; color: rgba(225, 33, 43, 1); }
-            .original { font-size: 22rpx; font-weight: 400; text-decoration: line-through; color: rgba(153, 153, 153, 1); margin-left: 14rpx; }
-        }
-    }
-}
diff --git a/CoreCms.Net.Uni-App/CoreShop/uni.scss b/CoreCms.Net.Uni-App/CoreShop/uni.scss
index de7bc370baca74eff302ea199bb5519c35ba4347..5d760a823aed5f9bb15a2888304353cd88cf9d31 100644
--- a/CoreCms.Net.Uni-App/CoreShop/uni.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/uni.scss
@@ -92,6 +92,9 @@ $fz20: 40upx;
 /* uni.scss */
 @import "uview-ui/theme.scss";
 
+
+@import "static/style/coreTheme.scss";
+
 //项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.coreshop.corecms.net
 //css中背景图片变量。js图片变量在constVarsHelper
 $apiFilesUrl: 'https://files.coreshop.corecms.net';
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 f562b7391fc4bde0a317a2f1eefe0ae5918ae790..e6ceed1a1dc636d855bda435ce985958f2a8deff 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,10 @@
-import {
-    apiFilesUrl
-} from '@/common/setting/constVarsHelper.js'
+import * as GlobalConstVars from '@/common/setting/constVarsHelper.js'
+
 
 module.exports = {
 	data() {
         return {
-            $apiFilesUrl: apiFilesUrl
+			$globalConstVars: GlobalConstVars
         }
 	},
 	onLoad() {
diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
index be5520981ac5214c342cf152e6386c2b31f5b868..bfd52545731b4d1ba7215ca88410f73d355faf0e 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
@@ -60,8 +60,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
         private readonly ICoreCmsArticleServices _coreCmsArticleServices;
         private readonly ICoreCmsArticleTypeServices _coreCmsArticleTypeServices;
         private readonly ICoreCmsFormServices _coreCmsFormServices;
-
-
         private readonly ICoreCmsGoodsServices _coreCmsGoodsServices;
         private readonly ICoreCmsNoticeServices _coreCmsNoticeServices;
         private readonly ICoreCmsPinTuanRuleServices _coreCmsPinTuanRuleServices;
@@ -72,10 +70,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
         private readonly ISysOrganizationServices _sysOrganizationServices;
         private readonly ISysRoleServices _sysRoleServices;
         private readonly ISysUserRoleServices _sysUserRoleServices;
-
         private readonly ISysRoleMenuServices _sysRoleMenuServices;
-
-
         private readonly ISysUserServices _sysUserServices;
         private readonly IHttpContextUser _user;
         private readonly IWebHostEnvironment _webHostEnvironment;
@@ -89,6 +84,8 @@ namespace CoreCms.Net.Web.Admin.Controllers
         private readonly ICoreCmsSettingServices _settingServices;
         private readonly ICoreCmsProductsServices _productsServices;
         private readonly ICoreCmsServicesServices _servicesServices;
+        private readonly ICoreCmsPagesServices _pagesServices;
+
 
         private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
 
@@ -114,7 +111,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
             , ISysMenuServices sysMenuServices
             , ISysUserRoleServices sysUserRoleServices
             , ISysOrganizationServices sysOrganizationServices, ICodeGeneratorServices codeGeneratorServices,
-            ICoreCmsLogisticsServices logisticsServices, ISysLoginRecordServices sysLoginRecordServices, ISysNLogRecordsServices sysNLogRecordsServices, ICoreCmsBillPaymentsServices paymentsServices, ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsUserServices userServices, ICoreCmsOrderServices orderServices, ICoreCmsBillAftersalesServices aftersalesServices, ICoreCmsSettingServices settingServices, ICoreCmsProductsServices productsServices, ICoreCmsServicesServices servicesServices, IOptions<FilesStorageOptions> filesStorageOptions, ISysRoleMenuServices sysRoleMenuServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory)
+            ICoreCmsLogisticsServices logisticsServices, ISysLoginRecordServices sysLoginRecordServices, ISysNLogRecordsServices sysNLogRecordsServices, ICoreCmsBillPaymentsServices paymentsServices, ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsUserServices userServices, ICoreCmsOrderServices orderServices, ICoreCmsBillAftersalesServices aftersalesServices, ICoreCmsSettingServices settingServices, ICoreCmsProductsServices productsServices, ICoreCmsServicesServices servicesServices, IOptions<FilesStorageOptions> filesStorageOptions, ISysRoleMenuServices sysRoleMenuServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, ICoreCmsPagesServices pagesServices)
         {
             _user = user;
             _webHostEnvironment = webHostEnvironment;
@@ -147,6 +144,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
             _servicesServices = servicesServices;
             _sysRoleMenuServices = sysRoleMenuServices;
             _weChatApiHttpClientFactory = weChatApiHttpClientFactory;
+            _pagesServices = pagesServices;
         }
 
         #region 获取登录用户用户信息(用于面板展示)====================================================
@@ -792,6 +790,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
             var formModel = await _coreCmsFormServices.QueryByIdAsync(entity.id);
             if (formModel == null)
             {
+                jm.code = 1;
                 jm.msg = "不存在此信息";
                 return Json(jm);
             }
@@ -917,6 +916,152 @@ namespace CoreCms.Net.Web.Admin.Controllers
 
         #endregion
 
+        #region 后台生成预览页面设计小程序码============================================================
+
+        // POST: Api/Tools/GetPageWxCode
+        /// <summary>
+        ///     后台生成预览页面设计小程序码
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Description("后台生成小程序码")]
+        public async Task<JsonResult> GetPageWxCode([FromBody] FMStringId entity)
+        {
+            //返回数据
+            var jm = new AdminUiCallBack { code = 0 };
+
+            var _filesStorageOptions = await _coreCmsSettingServices.GetFilesStorageOptions();
+
+
+            var pageModel = await _pagesServices.QueryByClauseAsync(p => p.code == entity.id);
+            if (pageModel == null)
+            {
+                jm.code = 1;
+                jm.msg = "不存在此信息";
+                return Json(jm);
+            }
+
+            var path = "pages/index/custom/custom?pageCode=" + entity.id;
+
+            var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
+            var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
+            var request = new CgibinWxaappCreateWxaQrcodeRequest();
+            request.AccessToken = accessToken;
+            request.Path = path;
+
+            var response = await client.ExecuteCgibinWxaappCreateWxaQrcodeAsync(request);
+            if (response.IsSuccessful())
+            {
+                var memStream = new MemoryStream(response.RawBytes);
+
+                var newFileName = DateTime.Now.ToString("yyyyMMddHHmmss_ffff", DateTimeFormatInfo.InvariantInfo) + ".jpg";
+                var today = DateTime.Now.ToString("yyyyMMdd");
+
+                if (_filesStorageOptions.StorageType == GlobalEnumVars.FilesStorageOptionsType.LocalStorage.ToString())
+                {
+                    var saveUrl = "/Upload/QrCode/" + today + "/";
+                    var dirPath = _webHostEnvironment.WebRootPath + saveUrl;
+                    string bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl;
+
+                    if (!Directory.Exists(dirPath)) Directory.CreateDirectory(dirPath);
+                    var filePath = dirPath + newFileName;
+                    var fileUrl = saveUrl + newFileName;
+
+                    //储存图片
+                    System.IO.File.Delete(filePath);
+                    await using (var fs = new FileStream(filePath, FileMode.CreateNew))
+                    {
+                        await memStream.CopyToAsync(fs).ConfigureAwait(false);
+                        await fs.FlushAsync().ConfigureAwait(false);
+                    }
+
+                    jm.code = 0;
+                    jm.msg = "上传成功!";
+                    jm.data = new
+                    {
+                        fileUrl,
+                        src = bucketBindDomain + fileUrl
+                    };
+                }
+                else if (_filesStorageOptions.StorageType == GlobalEnumVars.FilesStorageOptionsType.AliYunOSS.ToString())
+                {
+                    //上传到阿里云
+
+                    // 设置当前流的位置为流的开始
+                    memStream.Seek(0, SeekOrigin.Begin);
+
+                    await using var fileStream = memStream;
+
+                    var md5 = OssUtils.ComputeContentMd5(fileStream, memStream.Length);
+
+                    var filePath = "Upload/QrCode/" + today + "/" + newFileName; //云文件保存路径
+                                                                                 //初始化阿里云配置--外网Endpoint、访问ID、访问password
+                    var aliyun = new OssClient(_filesStorageOptions.Endpoint, _filesStorageOptions.AccessKeyId, _filesStorageOptions.AccessKeySecret);
+                    //将文件md5值赋值给meat头信息，服务器验证文件MD5
+                    var objectMeta = new ObjectMetadata
+                    {
+                        ContentMd5 = md5
+                    };
+                    //文件上传--空间名、文件保存路径、文件流、meta头信息(文件md5) //返回meta头信息(文件md5)
+                    aliyun.PutObject(_filesStorageOptions.BucketName, filePath, fileStream, objectMeta);
+                    //返回给UEditor的插入编辑器的图片的src
+                    jm.code = 0;
+                    jm.msg = "上传成功";
+                    jm.data = new
+                    {
+                        fileUrl = _filesStorageOptions.BucketBindUrl + filePath,
+                        src = _filesStorageOptions.BucketBindUrl + filePath
+                    };
+                }
+                else if (_filesStorageOptions.StorageType == GlobalEnumVars.FilesStorageOptionsType.QCloudOSS.ToString())
+                {
+                    //上传到腾讯云OSS
+                    //初始化 CosXmlConfig
+                    string appid = _filesStorageOptions.AccountId;//设置腾讯云账户的账户标识 APPID
+                    string region = _filesStorageOptions.CosRegion; //设置一个默认的存储桶地域
+                    CosXmlConfig config = new CosXmlConfig.Builder()
+                        //.SetAppid(appid)
+                        .IsHttps(true)  //设置默认 HTTPS 请求
+                        .SetRegion(region)  //设置一个默认的存储桶地域
+                        .SetDebugLog(true)  //显示日志
+                        .Build();  //创建 CosXmlConfig 对象
+
+                    long durationSecond = 600;  //每次请求签名有效时长，单位为秒
+                    QCloudCredentialProvider qCloudCredentialProvider = new DefaultQCloudCredentialProvider(
+                        _filesStorageOptions.AccessKeyId, _filesStorageOptions.AccessKeySecret, durationSecond);
+
+
+                    var cosXml = new CosXmlServer(config, qCloudCredentialProvider);
+
+                    byte[] bytes = memStream.ToArray();
+
+                    var filePath = "Upload/QrCode/" + today + "/" + newFileName; //云文件保存路径
+                    COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(_filesStorageOptions.TencentBucketName, filePath, bytes);
+
+                    cosXml.PutObject(putObjectRequest);
+
+                    jm.code = 0;
+                    jm.msg = "上传成功";
+                    jm.data = new
+                    {
+                        fileUrl = _filesStorageOptions.BucketBindUrl + filePath,
+                        src = _filesStorageOptions.BucketBindUrl + filePath
+                    };
+                }
+            }
+            else
+            {
+                jm.code = 1;
+                jm.msg = response.ErrorMessage;
+            }
+            jm.otherData = response;
+
+
+            return Json(jm);
+        }
+
+        #endregion
+
         //通用页面获取=========================================================================
 
         #region 获取商品列表====================================================
diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
index a7bd65e6311141d06c6951be8c3d3bd2d9d6e710..106c2f0b64f894fde38790792df93ebb7bcccd2c 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
@@ -696,6 +696,34 @@ namespace CoreCms.Net.Web.Admin.Controllers
         }
         #endregion
 
+        #region 还原订单============================================================
+        // POST: Api/CoreCmsOrder/DoRestore/10
+        /// <summary>
+        /// 还原订单
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Description("还原订单")]
+        public async Task<JsonResult> DoRestore([FromBody] FMStringId entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var model = await _coreCmsOrderServices.QueryByIdAsync(entity.id);
+            if (model == null)
+            {
+                jm.msg = GlobalConstVars.DataisNo;
+                return Json(jm);
+            }
+            //还原
+            var bl = await _coreCmsOrderServices.UpdateAsync(p => new CoreCmsOrder() { isdel = false }, p => p.orderId == model.orderId);
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+            return Json(jm);
+
+        }
+        #endregion
+
         #region 判断是否存在售后============================================================
         // POST: Api/CoreCmsOrder/GetDoHaveAfterSale/10
         /// <summary>
diff --git a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs
index ad5b346291c499438a8c88198d94037b46017a7d..9239291a734ce673f8ce17192bcc25c5c94f78ce 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Shop/CoreCmsPagesController.cs
@@ -192,14 +192,10 @@ namespace CoreCms.Net.Web.Admin.Controllers
         {
             //返回数据
             var jm = new AdminUiCallBack { code = 0 };
-
-            var pagesType = EnumHelper.EnumToList<GlobalEnumVars.PagesType>();
             var pagesLayout = EnumHelper.EnumToList<GlobalEnumVars.PagesLayout>();
-
             jm.data = new
             {
                 pagesLayout,
-                pagesType
             };
 
             return Json(jm);
@@ -219,23 +215,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
         [Description("创建提交")]
         public async Task<JsonResult> DoCreate([FromBody] CoreCmsPages entity)
         {
-            var jm = new AdminUiCallBack();
-            entity.code = entity.code.Trim();
-            var synonym = await _coreCmsPagesServices.ExistsAsync(p => p.code == entity.code);
-            if (synonym)
-            {
-                jm.msg = "存在相同【区域编码】请更正";
-                return Json(jm);
-            }
-
-
-            entity.layout = 1;
-            entity.type = 1;
-
-            var bl = await _coreCmsPagesServices.InsertAsync(entity) > 0;
-            jm.code = bl ? 0 : 1;
-            jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
-
+            var jm = await _coreCmsPagesServices.InsertAsync(entity);
             return Json(jm);
         }
 
@@ -262,14 +242,12 @@ namespace CoreCms.Net.Web.Admin.Controllers
             }
             jm.code = 0;
 
-            var pagesType = EnumHelper.EnumToList<GlobalEnumVars.PagesType>();
             var pagesLayout = EnumHelper.EnumToList<GlobalEnumVars.PagesLayout>();
 
             jm.data = new
             {
                 model,
                 pagesLayout,
-                pagesType
             };
 
             return Json(jm);
@@ -287,50 +265,12 @@ namespace CoreCms.Net.Web.Admin.Controllers
         [Description("编辑提交")]
         public async Task<JsonResult> DoEdit([FromBody] CoreCmsPages entity)
         {
-            var jm = new AdminUiCallBack();
-            entity.code = entity.code.Trim();
-            var newCode = entity.code;
-            var oldCode = string.Empty;
-            var synonym = await _coreCmsPagesServices.ExistsAsync(p => p.code == entity.code && p.id != entity.id);
-            if (synonym)
-            {
-                jm.msg = "存在相同【区域编码】请更正";
-                return Json(jm);
-            }
-
-            var oldModel = await _coreCmsPagesServices.QueryByIdAsync(entity.id, false);
-            if (oldModel == null)
-            {
-                jm.msg = "不存在此信息";
-                return Json(jm);
-            }
-            oldCode = oldModel.code;
-
-            //事物处理过程开始
-            //oldModel.id = entity.id;
-            oldModel.code = entity.code;
-            oldModel.name = entity.name;
-            oldModel.description = entity.description;
-            oldModel.layout = entity.layout;
-            oldModel.type = entity.type;
-
-            //事物处理过程结束
-            var bl = await _coreCmsPagesServices.UpdateAsync(oldModel);
-
-            if (bl && newCode != oldCode)
-            {
-                await _pagesItemsServices.UpdateAsync(p => new CoreCmsPagesItems() { pageCode = oldModel.code },
-                    p => p.pageCode == oldCode);
-            }
-
-            jm.code = bl ? 0 : 1;
-            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+            var jm = await _coreCmsPagesServices.UpdateAsync(entity);
 
             return Json(jm);
         }
         #endregion
 
-
         #region 删除数据============================================================
 
         // POST: Api/CoreCmsPages/DoDelete/10
@@ -343,34 +283,33 @@ namespace CoreCms.Net.Web.Admin.Controllers
         [Description("单选删除")]
         public async Task<JsonResult> DoDelete([FromBody] FMIntId entity)
         {
-            var jm = new AdminUiCallBack();
+            var jm = await _coreCmsPagesServices.DeleteByIdAsync(entity.id);
+            return Json(jm);
 
-            var model = await _coreCmsPagesServices.QueryByIdAsync(entity.id);
-            if (model == null)
-            {
-                jm.msg = GlobalConstVars.DataisNo;
-                return Json(jm);
-            }
+        }
 
-            if (model.id == 1)
-            {
-                jm.msg = "初始化数据禁止删除";
-                return Json(jm);
-            }
+        #endregion
 
-            var bl = await _coreCmsPagesServices.DeleteByIdAsync(model.id);
-            if (bl)
-            {
-                await _pagesItemsServices.DeleteAsync(p => p.pageCode == model.code);
-            }
-            jm.code = bl ? 0 : 1;
-            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+        #region 复制数据============================================================
+
+        // POST: Api/CoreCmsPages/Copy/10
+        /// <summary>
+        ///     复制数据
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Description("复制数据")]
+        public async Task<JsonResult> DoCopy([FromBody] FMIntId entity)
+        {
+            var jm = await _coreCmsPagesServices.CopyByIdAsync(entity.id);
             return Json(jm);
 
         }
 
         #endregion
 
+
         #region 版面设计============================================================
 
         // POST: Api/CoreCmsPages/GetEdit
@@ -428,7 +367,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
         [Description("版面设计提交")]
         public async Task<JsonResult> DoDesign([FromBody] FmPagesUpdate entity)
         {
-            var jm = await _coreCmsPagesServices.UpdateAsync(entity);
+            var jm = await _coreCmsPagesServices.UpdateDesignAsync(entity);
             return Json(jm);
         }
 
@@ -509,6 +448,5 @@ namespace CoreCms.Net.Web.Admin.Controllers
 
         #endregion
 
-
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
index 36ab2b6a3f7bd7a6e25620e7f5d6ce55ab2c4e21..8ff3ddeb9a48656f93e29bf660e317ecd50bb84e 100644
--- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
+++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
@@ -233,7 +233,6 @@
 
   <ItemGroup>
     <Folder Include="Controllers\Order\" />
-    <Folder Include="wwwroot\views\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/content/customform/form/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/content/customform/form/edit.html
index 7091965ed47a7936f4dc72cb502fe6efb0152f54..f9ecdae6b61cb0f15d40851ab2f7ca20ce55991a 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/content/customform/form/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/content/customform/form/edit.html
@@ -543,9 +543,8 @@
 
 
                 form.verify({
-
                     verifyname: [/^[\S]{0,100}$/, '表单名称最大只允许输入100位字符，且不能出现空格'],
-                    verifydescription: [/^[\S]{0,255}$/, '表单描述最大只允许输入255位字符，且不能出现空格'],
+                    verifydescription: [/^(.|\n){0,500}$/, '表单描述最大只允许输入255位字符，且不能出现空格'],
                     verifyheadTypeValue: [/^[\S]{0,200}$/, '表单头值最大只允许输入200位字符，且不能出现空格'],
                     verifyheadTypeVideo: [/^[\S]{0,200}$/, '表单视频最大只允许输入200位字符，且不能出现空格'],
                     verifybuttonName: [/^[\S]{0,50}$/, '表单提交按钮名称最大只允许输入50位字符，且不能出现空格'],
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/demo/icon.html b/CoreCms.Net.Web.Admin/wwwroot/views/demo/icon.html
deleted file mode 100644
index 83ea5b70f448dbac2e62b6b2dd0d87fdab856019..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Web.Admin/wwwroot/views/demo/icon.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>图标选择组件 - layui</title>
-
-    <link href="/lib/layui/css/layui.css" rel="stylesheet" />
-</head>
-<body>
-
-    <div class="layui-container layui-inline-container" style="padding: 30px 0;">
-        <input type="hidden" name="test" id="test1" class="test" placeholder="select icon">
-        <input type="hidden" name="test" id="test2" value="layui-icon-chrome" title="Chrome" class="test" placeholder="请选择">
-
-        <br>
-
-        <input type="hidden" name="test" id="test3" value="layui-icon-chrome" class="test" placeholder="请选择" lay-options="{isSplit: true, replace: 'icon'}">
-        <input type="hidden" name="test" id="test4" value="&#xe684;" class="test" placeholder="请选择" lay-options="{isSplit: true, type:'unicode', replace: 'icon'}">
-
-        <br>
-
-        <input type="hidden" name="test" id="test5" value="" class="test" lay-options="{isSplit: true, replace: 'icon'}">
-        <input type="hidden" name="test" id="test6" value="" title="Chrome" class="test" placeholder="请选择" lay-options="{style:'', replace: 'title'}">
-
-        <br>
-        <br>
-
-        <div class="layui-input-wrap layui-inline">
-            <input type="text" name="test" id="test7" class="layui-input test" placeholder="请选择" lay-options="{replace: false}">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-find-fill"></i>
-            </div>
-        </div>
-
-        <div class="layui-input-wrap layui-inline">
-            <input type="text" name="test" id="test8" class="layui-input test" placeholder="不开启分页" lay-options="{replace: false, page: false}">
-        </div>
-
-        <br>
-
-        <div class="layui-input-wrap layui-inline">
-            <input type="text" name="test" id="test9" class="layui-input test" placeholder="fontclass" lay-options="{replace: false}">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-down"></i>
-            </div>
-        </div>
-
-        <div class="layui-input-wrap layui-inline">
-            <input type="text" name="test" id="test10" class="layui-input test" placeholder="unicode" lay-options="{replace: false, type:'unicode'}">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-down"></i>
-            </div>
-        </div>
-
-        <br>
-
-        <div class="layui-input-wrap layui-inline">
-            <input type="text" name="test" id="test100" class="layui-input" placeholder="自定义默认图标">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-down"></i>
-            </div>
-        </div>
-
-        <div class="layui-input-wrap layui-inline">
-            <input type="text" name="test" id="test101" class="layui-input" placeholder="扩展第三方图标">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-down"></i>
-            </div>
-        </div>
-
-    </div>
-
-    <script src="/lib/layui/layui.js"></script>
-    <script>
-        layui.use('icon', function () {
-            var icon = layui.icon;
-
-            icon.render({
-                elem: '.test'
-                , style: 'color: #5FB878;'
-                , placeholder: ''
-                //,isSplit: true
-                , page: true
-                //,search: false
-                , click: function (obj) {
-                    console.log(obj)
-                    //this.elem.val(obj.className)
-                }
-                , ready: function () {
-                    console.log(1)
-                }
-            });
-
-
-
-            icon.render({
-                elem: '#test100'
-                , id: 'diy-test100'
-                , data: [
-                    { "title": "Android 安卓", "fontclass": "layui-icon-android", "unicode": "&#xe684;" }
-                    , { "title": "Apple IOS 苹果", "fontclass": "layui-icon-ios", "unicode": "&#xe680;" }
-                    , { "title": "Windows", "fontclass": "layui-icon-windows", "unicode": "&#xe67f;" }
-                    , { "title": "实心", "fontclass": "layui-icon-heart-fill", "unicode": "&#xe68f;" }
-                ]
-                , replace: false //不替换绑定元素
-                , search: false
-                , page: false
-            });
-
-            icon.render({
-                elem: '#test101'
-                , data: [
-                    {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}
-                ]
-                , fontfamily: 'iconfont'
-                , replace: false //不替换绑定元素
-            });
-
-        });
-    </script>
-</body>
-</html>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/demo/keyboard.html b/CoreCms.Net.Web.Admin/wwwroot/views/demo/keyboard.html
deleted file mode 100644
index e6f5e9fb1dcae6cea4eaf670ddcc006383c87fa1..0000000000000000000000000000000000000000
--- a/CoreCms.Net.Web.Admin/wwwroot/views/demo/keyboard.html
+++ /dev/null
@@ -1,211 +0,0 @@
-
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>通用选择键组件 - layui</title>
-
-    <link href="/lib/layui/css/layui.css" rel="stylesheet" />
-
-</head>
-<body>
-
-    <div class="layui-container layui-inline-container" style="padding: 30px 0;">
-        <div class="layui-input-wrap layui-inline">
-            <input type="input" name="test" id="test1" class="layui-input test" placeholder="默认" lay-options="{}">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-keyboard"></i>
-            </div>
-        </div>
-
-        <div class="layui-input-wrap layui-inline">
-            <input type="input" name="test" id="test2" readonly class="layui-input test" placeholder="字母" lay-options="{
-      type: 'letter'
-      ,setData: {
-        'caps': {selected: true},
-        'q': {disabled: true},
-        'a': {disabled: true},
-        'b': {disabled: true},
-        'd': {style: 'background-color: #5FB878; border-width: 0; color: #fff;'}
-      }
-    }">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-keyboard"></i>
-            </div>
-        </div>
-
-        <div class="layui-input-wrap layui-inline">
-            <input type="input" name="test" id="test3" readonly class="layui-input test" placeholder="数字" lay-options="{
-      type: 'number'
-      ,setData: {
-        '.': {disabled: true}
-      }
-    }">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-keyboard"></i>
-            </div>
-        </div>
-
-        <br>
-
-        <div class="layui-input-wrap layui-inline" style="width: 65px;">
-            <input type="input" name="test" id="test99" readonly class="layui-input test" placeholder="省" lay-options="{type: 'province'}">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-down"></i>
-            </div>
-        </div>
-
-        <div class="layui-input-wrap layui-inline">
-            <button class="layui-btn layui-btn-primary" id="test100">
-                <span>城市</span>
-                <i class="layui-icon layui-icon-down"></i>
-            </button>
-        </div>
-
-        <br>
-
-        <div class="layui-input-wrap layui-inline">
-            <input type="input" name="test" id="test101" class="layui-input" placeholder="表情">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-down"></i>
-            </div>
-        </div>
-
-        <div class="layui-input-wrap layui-inline">
-            <input type="input" name="test" id="test102" class="layui-input" placeholder="自定义">
-            <div class="layui-input-suffix">
-                <i class="layui-icon layui-icon-down"></i>
-            </div>
-        </div>
-
-    </div>
-
-
-    <script src="/lib/layui/layui.js"></script>
-    <script>
-        layui.config({
-            version: new Date().getTime()
-        })
-        layui.use('keyboard', function () {
-            var keyboard = layui.keyboard;
-
-            //为了做到足够的通用，我们在 keyboard 组件中除了内置「常见的选择键」类型之外，
-            //还将在以下示例中为您演示各类其他场景的选择键配置
-            //你将体会这个组件的适用范围，是怎样的广袤无垠
-
-            keyboard.render({
-                elem: '.test'
-                //,style: 'background-color: #E7EAF7;'
-                //,isHeader: false
-                //,width: 320
-
-                , click: function (obj) {
-                    console.log(obj)
-                    //this.elem.val(obj.className)
-                }
-                , ready: function () {
-                    console.log(1)
-                }
-            });
-
-            //自定义
-            keyboard.render({
-                elem: '#test100'
-                , type: 'test123'
-                , title: '开通城市'
-                , style: 'width: 210px'
-                , keyStyle: 'width: 60px'
-                , single: true
-                , data: [
-                    { title: '北京' }
-                    , { title: '上海', disabled: true }
-                    , { title: '广州' }
-                    , { title: '深圳' }
-                    , { title: '杭州' }
-                    , { title: '成都' }
-                    , { type: 'br' }
-                    , { title: '其他城市', style: "width: 190px;" }
-                ]
-                , click: function (obj) {
-                    var keyData = obj.keyData;
-                    this.elem.find('span').html(keyData.value);
-                    keyboard.close(this.id);
-                }
-                , clear: function (obj) {
-                    this.elem.find('span').html('城市');
-                    keyboard.close(this.id);
-                    console.log(obj);
-                }
-                , done: function (obj) {
-                    console.log(obj);
-                }
-            });
-
-            keyboard.render({
-                elem: '#test101'
-                , type: 'testface'
-                , title: '表情'
-                , style: 'max-height: 215px; overflow: auto;'
-                , keyStyle: 'width: 45px; font-size: 16px;'
-                , data: [
-                    { title: '😁' }
-                    , { title: '😂' }
-                    , { title: '😃' }
-                    , { title: '😄' }
-                    , { title: '😅' }
-                    , { title: '😆' }
-                    , { type: 'br' }
-                    , { title: '😂' }
-                    , { title: '😂' }
-                    , { title: '😃' }
-                    , { title: '😄' }
-                    , { title: '😅' }
-                    , { title: '😆' }
-                    , { type: 'br' }
-                    , { title: '😂' }
-                    , { title: '😂' }
-                    , { title: '😃' }
-                    , { title: '😄' }
-                    , { title: '😅' }
-                    , { title: '😆' }
-                    , { type: 'br' }
-                    , { title: '😂' }
-                    , { title: '😂' }
-                    , { title: '😃' }
-                    , { title: '😄' }
-                    , { title: '😅' }
-                    , { title: '😆' }
-                    , { type: 'br' }
-                    , { title: '😂' }
-                    , { title: '😂' }
-                    , { title: '😃' }
-                    , { title: '😄' }
-                    , { title: '😅' }
-                    , { title: '😆' }
-                    , { type: 'br' }
-                    , { title: '😂' }
-                    , { title: '😂' }
-                    , { title: '😃' }
-                    , { title: '😄' }
-                    , { title: '😅' }
-                    , { title: '😆' }
-                ]
-            });
-
-            //颜文字
-            keyboard.render({
-                elem: '#test102'
-                , type: 'testywz'
-            })
-
-            //快捷语
-
-            //符号
-
-            //图像验证码
-
-        });
-    </script>
-</body>
-</html>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
index 5724965a72b4dadc586da52eab10f1660218cc28..1797e6d1a8ea6a82358e6d4c967ef4fcdd0ffa32 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
@@ -820,6 +820,10 @@
                                             });
                                     });
                                 }
+                                , btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsGoodsCategory-createForm-submit").click();
+                                }
                             });
                         } else {
                             layer.msg(e.msg);
@@ -870,6 +874,10 @@
                                             });
                                     });
                                 }
+                                , btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsGoodsTypeSpec-createForm-submit").click();
+                                }
                             });
                         } else {
                             layer.msg(e.msg);
@@ -913,6 +921,10 @@
                                             });
                                     });
                                 }
+                                , btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsGoodsParams-createForm-submit").click();
+                                }
                             });
                         } else {
                             layer.msg(e.msg);
@@ -958,6 +970,10 @@
                                             });
                                     });
                                 }
+                                , btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsBrand-createForm-submit").click();
+                                }
                             });
                         } else {
                             layer.msg(e.msg);
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
index 671905ddba2ae4ba4695c63281126033cbaa681a..924e0f9c3e647f1f36610a7aad795d36ffe89c8f 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
@@ -904,6 +904,10 @@
                                             });
                                     });
                                 }
+                                , btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsGoodsCategory-createForm-submit").click();
+                                }
                             });
                         } else {
                             layer.msg(e.msg);
@@ -954,6 +958,10 @@
                                             });
                                     });
                                 }
+                                , btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsGoodsTypeSpec-createForm-submit").click();
+                                }
                             });
                         } else {
                             layer.msg(e.msg);
@@ -998,6 +1006,10 @@
                                             });
                                     });
                                 }
+                                , btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsGoodsParams-createForm-submit").click();
+                                }
                             });
                         } else {
                             layer.msg(e.msg);
@@ -1043,6 +1055,10 @@
                                             });
                                     });
                                 }
+                                , btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsBrand-createForm-submit").click();
+                                }
                             });
                         } else {
                             layer.msg(e.msg);
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
index fb2b52b9dc6448f3fa07745790d43884831f5766..b6977e4e15145d829ffaa07ded41c42445f4da94 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
@@ -492,6 +492,11 @@
                         var id = $(this).attr('data-id');
                         delOrder(id);
                     },
+                    //还原订单
+                    restoreOrder: function () {
+                        var id = $(this).attr('data-id');
+                        restoreOrder(id);
+                    },
                     //打印购物订单
                     shoppingPrint: function () {
                         var id = $(this).attr('data-id');
@@ -565,6 +570,21 @@
                         }
                     });
                 }
+                
+                //还原订单
+                function restoreOrder(id) {
+                    layer.confirm('确认还原：' + id + ' 的订单吗？', {
+                        title: '提示', btn: ['确认', '取消'] //按钮
+                    }, function () {
+                        coreHelper.Post("Api/CoreCmsOrder/DoRestore", { id: id }, function (e) {
+                            layer.msg(e.msg, { time: 1300 }, function () {
+                                layui.table.reloadData('LAY-app-CoreCmsOrder-tableBox'); //重载表格
+                                doreLoadOrderCount();
+                            });
+                        });
+                    });
+                    return false;
+                }
 
                 //秒发货
                 function doSecondsShip(id) {
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/create.html
index 30f90ce7cc0338b5fca83df6a7f3d3137738b499..a42e1ce05190bf8244dd3398baa5bba67a8d2dd9 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/create.html
@@ -37,14 +37,10 @@
         </div>
 
         <div class="layui-form-item">
-            <label for="type" class="layui-form-label  layui-form-required">类型</label>
+            <label for="type" class="layui-form-label  layui-form-required">是否默认</label>
             <div class="layui-input-block">
-                <select name="type" required lay-verType="tips" lay-verify="required" lay-reqText="请选择类型" placeholder="请选择类型">
-                    <option value="">请选择</option>
-                    {{# layui.each(d.params.data.pagesType, function(index, item){ }}
-                    <option value="{{ item.value }}">{{ item.description }}</option>
-                    {{# }); }}
-                </select>
+                <input type="radio" name="type" value="1" title="是" checked>
+                <input type="radio" name="type" value="2" title="否">
             </div>
         </div>
 
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/edit.html
index 256263dc530390020c220dcd55348e1454b27f63..6e06f1bc3d15f7e7087596cf19b071772ae8c069 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/edit.html
@@ -38,14 +38,10 @@
         </div>
 
         <div class="layui-form-item">
-            <label for="type" class="layui-form-label  layui-form-required">类型</label>
+            <label for="type" class="layui-form-label  layui-form-required">是否默认</label>
             <div class="layui-input-block">
-                <select name="type" required lay-verType="tips" lay-verify="required" lay-reqText="请选择类型" placeholder="请选择类型">
-                    <option value="">请选择</option>
-                    {{# layui.each(d.params.data.pagesType, function(index, item){ }}
-                    <option value="{{ item.value }}" {{d.params.data.model.type==item.value?'selected="selected"':''}}>{{ item.description }}</option>
-                    {{# }); }}
-                </select>
+                <input type="radio" name="type" value="1" title="是" {{ d.params.data.model.type==1 ? 'checked' : '' }}>
+                <input type="radio" name="type" value="2" title="否" {{ d.params.data.model.type==2 ? 'checked' : '' }}>
             </div>
         </div>
 
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/index.html
index a6b32bee2303e1368e2ea8866117eb3fa42d70a1..0d62d1672e050ea055a7544a55c975b2cf9efbf5 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/index.html
@@ -22,11 +22,13 @@
     </div>
 </script>
 <script type="text/html" id="LAY-app-CoreCmsPages-tableBox-bar">
+    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="qrcode">预览</a>
+    <a class="layui-btn  layui-btn-warm layui-btn-xs" lay-event="copy">复制</a>
     <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
     <a class="layui-btn layui-btn-xs" lay-event="design">版面设计</a>
-    {{#  if(d.id > 1){ }}
+    {{# if(d.type != 1){ }}
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
-    {{#  } }}
+    {{# } }}
 </script>
 
 <script>
@@ -80,8 +82,16 @@
                             { field: 'name', title: '可编辑区域名称', sort: false, width: 205 },
                             { field: 'description', title: '描述', sort: false },
                             //{ field: 'layout', title: '布局样式编码，1，手机端', sort: false, width: 105 },
-                            //{ field: 'type', title: '1手机端，2PC端', sort: false, width: 105 },
-                            { width: 182, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsPages-tableBox-bar' }
+                            {
+                                field: 'type', title: '是否默认', sort: false, width: 105, templet: function (data) {
+                                    if (data.type == 1) {
+                                        return "<button type='button' class='layui-btn  layui-btn-normal  layui-btn-xs'>是</button>";
+                                    } else if (data.type == 2) {
+                                        return "<button type='button' class='layui-btn  layui-btn-primary layui-btn-xs'>否</button>";
+                                    }
+                                }
+                            },
+                            { width: 260, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsPages-tableBox-bar' }
                         ]
                     ]
                 });
@@ -118,6 +128,10 @@
                             doEdit(obj)
                         } else if (obj.event === 'design') {
                             doDesign(obj)
+                        } else if (obj.event === 'qrcode') {
+                            doQrCode(obj)
+                        } else if (obj.event === 'copy') {
+                            doCopy(obj)
                         }
                     });
                 //执行创建操作
@@ -214,6 +228,39 @@
                     location.hash = '/shop/pages/design.html?id=' + obj.data.id;
                 }
 
+
+                //获取小程序码
+                function doQrCode(obj) {
+                    coreHelper.Post("Api/Tools/GetPageWxCode", { id: obj.data.code }, function (e) {
+                        if (e.code === 0) {
+                            admin.popup({
+                                shadeClose: false,
+                                title: '查看小程序码',
+                                area: ['380px', '480px'],
+                                id: 'LAY-popup-CoreCmsPages-QrCode',
+                                success: function (layero, index) {
+                                    view(this.id).render('shop/pages/qrCode', { data: e.data }).done(function () {
+                                        form.render();
+                                    });
+                                }
+                            });
+                        } else {
+                            layer.msg(e.msg);
+                        }
+                    });
+                }
+
+                //执行复制操作
+                function doCopy(obj) {
+                    layer.confirm('确定复制吗？', function (index) {
+                        coreHelper.Post("Api/CoreCmsPages/DoCopy", { id: obj.data.id }, function (e) {
+                            if (debug) { console.log(e); } //开启调试返回数据
+                            table.reloadData('LAY-app-CoreCmsPages-tableBox');
+                            layer.msg(e.msg);
+                        });
+                    });
+                }
+
                 //执行单个删除
                 function doDelete(obj) {
                     layer.confirm('确定删除吗？删除后将无法恢复。', function (index) {
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/qrCode.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/qrCode.html
new file mode 100644
index 0000000000000000000000000000000000000000..5338450971afab72f1d22e6baf02a3aaa403ff7a
--- /dev/null
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/qrCode.html
@@ -0,0 +1,25 @@
+<script type="text/html" template lay-done="layui.data.done(d);">
+    <div style="text-align: center" lay-filter="LAY-app-CoreCmsPages-QrCode" id="LAY-app-CoreCmsPages-QrCode">
+        <img id="cavasimg" src="{{d.params.data.fileUrl}}" width="300" height="341" style="border: 1px solid #c0c0c0" />
+        <div style="width: 100%;text-align:center;margin-top: 20px;">
+            <a class="layui-btn" href="{{d.params.data.fileUrl}}" target="_blank">下载二维码</a>
+        </div>
+    </div>
+
+</script>
+<script>
+    var debug = layui.setter.debug;
+    layui.data.done = function (d) {
+        //开启调试情况下获取接口赋值数据
+        if (debug) { console.log(d.params.data); }
+
+        layui.use(['admin', 'form', 'coreHelper'], function () {
+            var $ = layui.$
+                , setter = layui.setter
+                , admin = layui.admin
+                , coreHelper = layui.coreHelper
+                , form = layui.form;
+            form.render(null, 'LAY-app-CoreCmsPages-detailsForm');
+        });
+    };
+</script>
\ No newline at end of file
diff --git a/README.md b/README.md
index 56add6d5cbfd526e47d7bf2b3f6a6a2606958c7b..69c66f4f092c63d93edd985db47e84fbf607580c 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@
 
 <div align="center">
 
-<h3 align="center">核心商城（CoreShop）Beta 版</h3>
+<h3 align="center">核心商城系统（CoreShop）</h3>
 
-<h4 align="center">支持可视化布局的.Net小程序商城</h4>
+<h4 align="center">支持可视化布局的.Net商城系统</h4>
 
 [![star](https://gitee.com/CoreUnion/CoreShop/badge/star.svg)](https://gitee.com/CoreUnion/CoreShop.git) [![fork](https://gitee.com/CoreUnion/CoreShop/badge/fork.svg)](https://gitee.com/CoreUnion/CoreShop.git)
 [![GitHub stars](https://img.shields.io/github/stars/CoreUnion/CoreShop?logo=github)](https://github.com/CoreUnion/CoreShop) 
@@ -23,14 +23,14 @@
 
 ------------------------------------------------------------------------
 
-[![](https://img.shields.io/badge/官方网站-coreshop.com.cn-brightgreen)](https://www.corecms.net/)  [![](https://img.shields.io/badge/QQ群-70494974-red)](https://jq.qq.com/?_wv=1027&k=y83TiQC7)
+[![](https://img.shields.io/badge/官方网站-coreshop.cn-brightgreen)](https://www.coreshop.cn/)  [![](https://img.shields.io/badge/QQ群-70494974-red)](https://jq.qq.com/?_wv=1027&k=y83TiQC7)
 
 ------------------------------------------------------------------------
 
 </div>
 
 #### 💐 核心商城（CoreShop）介绍
-> 核心小程序商城系统`（CoreShop）` 是基于 Asp.Net 5.0、Uni-App开发、支持可视化布局的小程序商城系统；前后端分离，支持分布式部署，跨平台运行；拥有分销、代理、团购秒杀、接龙、拼团、直播、优惠券、自定义表单等众多营销功能，拥有完整SKU、下单、售后、物流流程，支持可视化自定义首页模块布局效果。    
+> 核心商城系统`（CoreShop）` 是基于 Asp.Net 5.0、Uni-App开发、支持可视化布局的小程序商城系统；前后端分离，支持分布式部署，跨平台运行；拥有分销、代理、团购秒杀、接龙、拼团、直播、优惠券、自定义表单等众多营销功能，拥有完整SKU、下单、售后、物流流程，支持可视化自定义首页模块布局效果。    
 
 > 支持一套代码编译发布微信小程序版、H5版、Android版、iOS版、支付宝小程序版、百度小程序版、字节跳动小程序版、QQ小程序版、快应用、360小程序共10个平台。    
 
@@ -180,7 +180,6 @@ https://api.demo.coreshop.cn/job
 | --- | --- | --- | --- |
 | uni-app | https://uniapp.dcloud.io/ |  | 跨平台应用前端框架 | 
 | uView UI | http://uviewui.com/ | v1.8.4 | 组件功能强丰富|
-| Color UI | https://www.color-ui.com/ | V2.02 | 很漂亮的UI组件，专注于视觉 |
 
 
 ### 📀 开发环境
@@ -254,6 +253,11 @@ https://api.demo.coreshop.cn/job
 | 16 | 小百货 | 100 | 2021-08-17 | 
 | 17 | 火星上的男人-18983076500 | 188 | 2021-08-25 | 
 | 18 | 累挺 | 188.88 | 2021-08-25 | 
+| 19 | *长 | 20 | 2021-09-14 | 
+| 20 | a*d | 5 | 2021-09-15 | 
+| 21 | Handsome Man | 50 | 2021-09-15 | 
+| 22 | Handsome Man | 8.5 | 2021-09-21 | 
+| 23 | On-line | 66 | 2021-10-02 | 
 
 
 ### ☀️ 组织