diff --git a/docs/xiugai/wx20230220.txt b/docs/xiugai/wx20230220.txt
index bd159d9..c9674f4 100644
--- a/docs/xiugai/wx20230220.txt
+++ b/docs/xiugai/wx20230220.txt
@@ -81,4 +81,76 @@ APP
 
 聂金义:
 7.上拉显示不了更多。
+8.点击升级功能，提示“已经是最新版本。”后期做。
 
+现在有个功能需要处理一下，注册时需要判断是不是汇融用户，如果是的话做个汇融会员的标记，只有汇融会员才能领取优惠券。
+
+5.优惠券不能对应商品。
+
+后台
+1.后台登陆title改为“汇惠云链管理后台”。
+2.去掉背景，拉大登陆框，把图标换成云链图标。
+3.后台首页上面四个图改成竖的，柱状图在右侧。
+4.商品页去掉商品关联。
+5.优惠券不能对应商品。
+ 现在急需处理的是注册时需要判断为会员，只有会员再能领优惠券
+
+APP
+1.马上注册把邀请码换成“汇融乡村振兴卡号”，验证前11位为“62350109317”，并验证共19位。注册后如果验证成功则直接成为会员。给后台一个状态，设置为会员。汇融乡村振兴卡号输入有误，将无法享受惠农价。是否继续注册？
+2.右上角的消息去掉，左上角扫描去掉。
+3.列表页里的惠农价和市场价换价格。
+4.市场价所有的杠都去掉。
+5.商品页“市场价”改为“惠农价”。
+6.优惠为负数。
+7.上拉显示不了更多。
+8.商户入驻、绑定社区去掉。
+9.立即升级，提示“已经是最新版本。”
+10.升级功能后期做。
+11.优惠券必须是会员才能领取。
+12.注册完提示成功，几秒后跳转。“恭喜您注册成功。（3秒）”，如果卡号验证成功“恭喜您注册成功，并成为惠农会员。（3秒）”
+13.收藏不能使用（测试正常）
+14.领完优惠券自动刷新，页面上不再显示。
+15.地址管理里的地址即“取货点”。
+16.编辑地址里所在地不能保存。
+17.注册后时默认头像需要改掉。
+
+APP
+1.马上注册把邀请码换成“汇融乡村振兴卡号”，验证前11位为“62350109317”，并验证共19位。注册后如果验证成功则直接成为会员。给后台一个状态，设置为会员。汇融乡村振兴卡号输入有误，将无法享受惠农价。是否继续注册？
+2.右上角的消息去掉，左上角扫描去掉。
+3.列表页里的“市场价”改为“惠农价”。
+4.市场价所有的杠都去掉。（完成）
+5.商品页“市场价”改为“惠农价”。（完成）
+6.优惠为负数。（完成）
+7.上拉显示不了更多。（有时正常有时拉取不出来）
+8.商户入驻、绑定社区去掉。（完成）
+9.立即升级，提示“已经是最新版本。”
+10.升级功能后期做。
+11.优惠券必须是会员才能领取。
+12.注册完提示成功，几秒后跳转。“恭喜您注册成功。（3秒）”，如果卡号验证成功“恭喜您注册成功，并成为惠农会员。（3秒）”
+13.收藏不能使用（测试正常）
+14.领完优惠券自动刷新，页面上不再显示。
+15.地址管理里的地址即“取货点”。
+16.编辑地址里所在地不能保存。
+17.注册后时默认头像需要改掉。
+18.点击立即使后转圈。
+19.我的优惠券下方直接用日期。
+
+1.马上注册把邀请码换成“汇融乡村振兴卡号”，验证前11位为“62350109317”，并验证共19位。注册后如果验证成功则直接成为会员。给后台一个状态，设置为会员。汇融乡村振兴卡号输入有误，将无法享受惠农价。是否继续注册？（完成）
+2.右上角的消息去掉，左上角扫描去掉。（完成）
+3.列表页里的“市场价”改为“惠农价”。（完成）
+4.市场价所有的杠都去掉。（完成）
+5.商品页“市场价”改为“惠农价”。（完成）
+6.优惠为负数。（完成）
+7.上拉显示不了更多。（有时正常有时拉取不出来）（完成）
+8.商户入驻、绑定社区去掉。（完成）
+9.立即升级，提示“已经是最新版本。”（完成）
+10.升级功能后期做。
+11.优惠券必须是会员才能领取。
+12.注册完提示成功，几秒后跳转。“恭喜您注册成功。（3秒）”，如果卡号验证成功“恭喜您注册成功，并成为惠农会员。（3秒）”（完成）
+13.收藏不能使用（测试正常）（完成）
+14.领完优惠券自动刷新，页面上不再显示。（完成）
+15.地址管理里的地址即“取货点”。
+16.编辑地址里所在地不能保存。
+17.注册后时默认头像需要改掉。
+18.点击立即使后转圈。（完成）
+19.我的优惠券下方直接用日期。（完成）
\ No newline at end of file
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java
index 4908c7e..d3372f0 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java
@@ -329,7 +329,7 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
     @Override
     public List<PmsProduct> list(String keyword) {
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("delete_status", 0);
+        queryWrapper.eq("delete_status", 1);
 
         if (!StringUtils.isEmpty(keyword)) {
             queryWrapper.like("name", keyword);
diff --git a/mallplus-admin/src/main/resources/application.properties b/mallplus-admin/src/main/resources/application.properties
index 0288546..bef9847 100644
--- a/mallplus-admin/src/main/resources/application.properties
+++ b/mallplus-admin/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 #\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883
-#spring.profiles.active=dev
-spring.profiles.active=test
+spring.profiles.active=dev
+#spring.profiles.active=test
 server.port=8085
 spring.jackson.time-zone=GMT+8
 
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
index cd85f74..4222720 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
@@ -513,8 +513,19 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
         //没有该用户进行添加操作
 
         UmsMember umsMember = new UmsMember();
-        umsMember.setMemberLevelId(9999L);
-        umsMember.setMemberLevelName("未开通会员");
+        // umsMember.setMemberLevelId(9999L);
+        // umsMember.setMemberLevelName("未开通会员");
+        // 验证前11位为“62350109317”，并验证共19位
+        String invitecode = user.getInvitecode();
+        if (ValidatorUtils.notEmpty(invitecode)&& invitecode.length()==19 && invitecode.startsWith("62350109317")) {
+            umsMember.setInvitecode(invitecode);
+            umsMember.setMemberLevelId(2L);
+            umsMember.setMemberLevelName("惠农会员");
+        }else{
+            umsMember.setInvitecode("");
+            umsMember.setMemberLevelId(1L);
+            umsMember.setMemberLevelName("普通会员");
+        }
         umsMember.setUsername(user.getUsername());
         umsMember.setNickname(user.getUsername());
         umsMember.setSourceType(user.getSourceType());
@@ -526,27 +537,24 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
         umsMember.setBuyMoney(BigDecimal.ZERO);
         umsMember.setBlance(new BigDecimal(0));
         umsMember.setIntegration(0);
-        if (ValidatorUtils.notEmpty(user.getInvitecode())) {
-            umsMember.setInvitecode(user.getInvitecode());
-        }
         String defaultIcon = mallplusProperties.getDefaultIcon();
         umsMember.setIcon(defaultIcon);
         memberMapper.insert(umsMember);
-        try {
-            //这是要生成二维码的url
-            String url = mallplusProperties.getDomain()+"/?invitecode=" + user.getId();
-            //要添加到二维码下面的文字
-            String words = user.getUsername() + "的二维码";
-            //调用刚才的工具类
-            ByteArrayResource qrCode = MatrixToImageWriter.createQrCode(url, words);
-            InputStream inputStream = new ByteArrayInputStream(qrCode.getByteArray());
-            UmsMember member = new UmsMember();
-            member.setId(umsMember.getId());
-            member.setAvatar(aliyunOSSUtil.upload("png", inputStream));
-            memberMapper.updateById(member);
-        } catch (Exception e) {
-            log.error(e.getMessage());
-        }
+        // try {
+        //     //这是要生成二维码的url
+        //     String url = mallplusProperties.getDomain()+"/?invitecode=" + user.getId();
+        //     //要添加到二维码下面的文字
+        //     String words = user.getUsername() + "的二维码";
+        //     //调用刚才的工具类
+        //     ByteArrayResource qrCode = MatrixToImageWriter.createQrCode(url, words);
+        //     InputStream inputStream = new ByteArrayInputStream(qrCode.getByteArray());
+        //     UmsMember member = new UmsMember();
+        //     member.setId(umsMember.getId());
+        //     member.setAvatar(aliyunOSSUtil.upload("png", inputStream));
+        //     memberMapper.updateById(member);
+        // } catch (Exception e) {
+        //     log.error(e.getMessage());
+        // }
 
         redisService.set(String.format(Rediskey.MEMBER, umsMember.getUsername()), JsonUtils.objectToJson(umsMember));
 
diff --git a/mallplus-portal/src/main/resources/application-prod.properties b/mallplus-portal/src/main/resources/application-prod.properties
index f9eb67e..b40c59f 100644
--- a/mallplus-portal/src/main/resources/application-prod.properties
+++ b/mallplus-portal/src/main/resources/application-prod.properties
@@ -33,7 +33,7 @@ spring.datasource.druid.stat-view-servlet.login-password=druid
 
 # \u7CFB\u7EDF\u914D\u7F6E
 mallplus.domain=http://51wangshi.com:8082
-mallplus.defaultIcon=https://mmbiz.qpic.cn/mmbiz_jpg/5oOYgozg9P2Jd9Ozn72E745xJsttQIQLIz0bKWibDeaYWJticTRyaX7HfALWsWf6TLzib0libyicV4m221fZibmibDMoQ/0?wx_fmt=jpeg
+mallplus.defaultIcon=https://mall.yyundong.com/avatar.png
 mallplus.name=mallplus-b2b2c
 mallplus.version=1.1.0
 mallplus.company=mallplus technology
diff --git a/mallplus-portal/src/main/resources/application-test.properties b/mallplus-portal/src/main/resources/application-test.properties
index 7f8d778..ca541a4 100644
--- a/mallplus-portal/src/main/resources/application-test.properties
+++ b/mallplus-portal/src/main/resources/application-test.properties
@@ -25,7 +25,7 @@ spring.datasource.druid.stat-view-servlet.login-username=druid
 spring.datasource.druid.stat-view-servlet.login-password=druid
 
 mallplus.domain=http://51wangshi.com:8082
-mallplus.defaultIcon=https://mmbiz.qpic.cn/mmbiz_jpg/5oOYgozg9P2Jd9Ozn72E745xJsttQIQLIz0bKWibDeaYWJticTRyaX7HfALWsWf6TLzib0libyicV4m221fZibmibDMoQ/0?wx_fmt=jpeg
+mallplus.defaultIcon=https://mall.yyundong.com/avatar.png
 mallplus.name=mallplus-b2b2c
 mallplus.version=1.1.0
 mallplus.company=mallplus technology
diff --git a/mallplusui-web-admin/config/dev.env.js b/mallplusui-web-admin/config/dev.env.js
index f2246c7..1d2045d 100644
--- a/mallplusui-web-admin/config/dev.env.js
+++ b/mallplusui-web-admin/config/dev.env.js
@@ -4,5 +4,6 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://mall.yyundong.com/adminapi"'
+  // BASE_API: '"http://mall.yyundong.com/adminapi"',
+  BASE_API: '"http://127.0.0.1:8085"'
 })
diff --git a/mallplusui-web-admin/index.html b/mallplusui-web-admin/index.html
index 1fb21bd..f28b510 100644
--- a/mallplusui-web-admin/index.html
+++ b/mallplusui-web-admin/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>mallplus-platform</title>
+    <title>汇惠云链管理后台</title>
   </head>
   <body>
     <script src="./static/tinymce4.7.5/tinymce.min.js"></script>
diff --git a/mallplusui-web-admin/src/assets/img/logo.png b/mallplusui-web-admin/src/assets/img/logo.png
index 80dd845..42b8b75 100644
Binary files a/mallplusui-web-admin/src/assets/img/logo.png and b/mallplusui-web-admin/src/assets/img/logo.png differ
diff --git a/mallplusui-web-admin/src/views/home/index-liu.vue b/mallplusui-web-admin/src/views/home/index-liu.vue
new file mode 100644
index 0000000..f7be58b
--- /dev/null
+++ b/mallplusui-web-admin/src/views/home/index-liu.vue
@@ -0,0 +1,205 @@
+<template>
+    <section class="data_section" ref="data_section">
+        <a :href="github" target="_blank">
+            <el-row :gutter="20">
+                <el-col :span="6">
+                    <div class="total-frame">
+                        <svg-icon icon-class="order" class="total-icon">
+                        </svg-icon>
+                        <div class="total-title">今日下单</div>
+                        <div class="total-value">123</div>
+                    </div>
+                </el-col>
+                <el-col :span="6">
+                    <div class="total-frame">
+                        <svg-icon icon-class="total-today" class="total-icon">
+                        </svg-icon>
+                        <div class="total-title">今日销售总额</div>
+                        <div class="total-value">￥456</div>
+                    </div>
+                </el-col>
+                <el-col :span="6">
+                    <div class="total-frame">
+                        <svg-icon icon-class="total-yesterday" class="total-icon">
+                        </svg-icon>
+                        <div class="total-title">昨日销售总额</div>
+                        <div class="total-value">￥111</div>
+                    </div>
+                </el-col>
+                <el-col :span="6">
+                    <div class="total-frame">
+                        <svg-icon icon-class="total-week" class="total-icon">
+                        </svg-icon>
+                        <div class="total-title">近7天销售总额</div>
+                        <div class="total-value">￥222</div>
+                    </div>
+                </el-col>
+            </el-row>
+        </a>
+        <el-row :gutter="10" class="row_list order_list">
+            <el-col :span="7">
+                <log-list></log-list>
+            </el-col>
+            <el-col :span="17">
+                <bar-chart type="barChart"></bar-chart>
+            </el-col>
+        </el-row>
+        <el-row :gutter="10" class="row_list order_list">
+            <el-col :span="7">
+                <pie-chart type="ordertype"></pie-chart>
+            </el-col>
+            <el-col :span="10">
+                <line-chart></line-chart>
+            </el-col>
+            <el-col :span="7">
+                <radar-chart></radar-chart>
+            </el-col>
+        </el-row>
+        <el-row :gutter="10" class="row_list">
+            <el-col :span="11">
+                <sales-table></sales-table>
+            </el-col>
+            <el-col :span="7">
+                <comment-list></comment-list>
+            </el-col>
+            <el-col :span="6">
+                <card-list></card-list>
+            </el-col>
+        </el-row>
+
+    </section>
+</template>
+
+<script>
+    import echarts from 'echarts'
+    import salesTable from "./components/salesTable";  // 销售数据表格
+    import commentList from "./components/commentList";  // 用户评论列表
+    import cardList from "./components/cardList";  // card列表
+    import logList from "./components/logList";  // 日志列表
+    import barChart from '@/components/echarts/barChart' // 用户投资类型 柱状图
+    import pieChart from '@/components/echarts/pieChart' // 用户投资类型 饼状图
+    import radarChart from '@/components/echarts/radarChart' // 用户投资类型 雷达图
+    import lineChart from '@/components/echarts/lineChart' // 用户投资类型 折线图
+    import { github } from "@/utils/env";
+
+    export default {
+        data(){
+            return {
+                github:github
+            }
+        },
+        components: {
+            salesTable,
+            commentList,
+            cardList,
+            logList,
+            barChart,
+            pieChart,
+            radarChart,
+            lineChart
+        },
+        created(){
+        },
+        mounted(){
+        },
+        methods: {
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    .total-frame {
+        border: 1px solid #DCDFE6;
+        padding: 20px;
+        height: 100px;
+    }
+
+    .total-icon {
+        913656
+        color: #409EFF;
+        width: 60px;
+        height: 60px;
+    }
+
+    .total-title {
+        position: relative;
+        font-size: 16px;
+        color: #909399;
+        left: 70px;
+        top: -35px;
+    }
+
+    .total-value {
+        position: relative;
+        font-size: 18px;
+        color: #606266;
+        left: 70px;
+        top: -25px;
+    }
+    .data_section{
+        margin: 20px;
+        border-radius: 2px;
+        .row_list{
+            margin-bottom: 20px;
+            .row_base{
+                padding: 10px;
+                box-sizing: border-box;
+                background: #fff;
+                border-radius: 6px;
+                height: 120px;
+            }
+        }
+        .order_list{
+            .orderArea{
+                width: 100%;
+                height: 300px;
+                background: #fff !important;
+                border-radius: 6px;
+                box-sizing: border-box;
+                padding: 10px;
+                padding-top: 40px;
+                overflow: hidden;
+            }
+            .orderbarArea{
+                height: 370px;
+            }
+        }
+        .data_list{
+            text-align: center;
+            font-size: 14px;
+            border-radius: 6px;
+            padding: 10px;
+            color:#fff;
+            height: 80px;
+            .leftItem{
+                align-items: start;
+                justify-content: space-between;
+                text-align: left;
+            }
+            .rightItem{
+                width:62px;
+
+                align-items: center;
+                justify-content: center;
+                .svg-icon{
+                    font-size: 30px;
+                }
+            }
+            .number{
+                font-size: 22px;
+                font-weight: bold;
+                .perTitle{
+                    font-size: 13px;
+                    margin-left: 5px;
+                }
+            }
+        }
+        .pay{
+            .leftItem{
+                justify-content: space-around;
+            }
+        }
+
+    }
+
+</style>
diff --git a/mallplusui-web-admin/src/views/home/index.vue b/mallplusui-web-admin/src/views/home/index.vue
index f7be58b..c11ffdb 100644
--- a/mallplusui-web-admin/src/views/home/index.vue
+++ b/mallplusui-web-admin/src/views/home/index.vue
@@ -1,205 +1,143 @@
 <template>
-    <section class="data_section" ref="data_section">
-        <a :href="github" target="_blank">
-            <el-row :gutter="20">
-                <el-col :span="6">
-                    <div class="total-frame">
-                        <svg-icon icon-class="order" class="total-icon">
-                        </svg-icon>
-                        <div class="total-title">今日下单</div>
-                        <div class="total-value">123</div>
-                    </div>
-                </el-col>
-                <el-col :span="6">
-                    <div class="total-frame">
-                        <svg-icon icon-class="total-today" class="total-icon">
-                        </svg-icon>
-                        <div class="total-title">今日销售总额</div>
-                        <div class="total-value">￥456</div>
-                    </div>
-                </el-col>
-                <el-col :span="6">
-                    <div class="total-frame">
-                        <svg-icon icon-class="total-yesterday" class="total-icon">
-                        </svg-icon>
-                        <div class="total-title">昨日销售总额</div>
-                        <div class="total-value">￥111</div>
-                    </div>
-                </el-col>
-                <el-col :span="6">
-                    <div class="total-frame">
-                        <svg-icon icon-class="total-week" class="total-icon">
-                        </svg-icon>
-                        <div class="total-title">近7天销售总额</div>
-                        <div class="total-value">￥222</div>
-                    </div>
-                </el-col>
-            </el-row>
-        </a>
-        <el-row :gutter="10" class="row_list order_list">
-            <el-col :span="7">
-                <log-list></log-list>
-            </el-col>
-            <el-col :span="17">
-                <bar-chart type="barChart"></bar-chart>
-            </el-col>
-        </el-row>
-        <el-row :gutter="10" class="row_list order_list">
-            <el-col :span="7">
-                <pie-chart type="ordertype"></pie-chart>
-            </el-col>
-            <el-col :span="10">
-                <line-chart></line-chart>
-            </el-col>
-            <el-col :span="7">
-                <radar-chart></radar-chart>
-            </el-col>
-        </el-row>
-        <el-row :gutter="10" class="row_list">
-            <el-col :span="11">
-                <sales-table></sales-table>
-            </el-col>
-            <el-col :span="7">
-                <comment-list></comment-list>
-            </el-col>
-            <el-col :span="6">
-                <card-list></card-list>
-            </el-col>
-        </el-row>
-
-    </section>
+	<section class="data_section" ref="data_section">
+		<el-row :gutter="20">
+			<el-col :span="6">
+				<div class="total-frame">
+					<svg-icon icon-class="order" class="total-icon"></svg-icon>
+					<div class="total-title">今日下单</div>
+					<div class="total-value">123</div>
+				</div>
+				<div class="total-frame">
+					<svg-icon icon-class="total-today" class="total-icon"></svg-icon>
+					<div class="total-title">今日销售总额</div>
+					<div class="total-value">￥456</div>
+				</div>
+				<div class="total-frame">
+					<svg-icon icon-class="total-yesterday" class="total-icon"></svg-icon>
+					<div class="total-title">昨日销售总额</div>
+					<div class="total-value">￥111</div>
+				</div>
+				<div class="total-frame">
+					<svg-icon icon-class="total-week" class="total-icon"></svg-icon>
+					<div class="total-title">近7天销售总额</div>
+					<div class="total-value">￥222</div>
+				</div>
+			</el-col>
+			<el-col :span="18" class="row_list order_list"><bar-chart type="barChart"></bar-chart></el-col>
+		</el-row>
+	</section>
 </template>
 
 <script>
-    import echarts from 'echarts'
-    import salesTable from "./components/salesTable";  // 销售数据表格
-    import commentList from "./components/commentList";  // 用户评论列表
-    import cardList from "./components/cardList";  // card列表
-    import logList from "./components/logList";  // 日志列表
-    import barChart from '@/components/echarts/barChart' // 用户投资类型 柱状图
-    import pieChart from '@/components/echarts/pieChart' // 用户投资类型 饼状图
-    import radarChart from '@/components/echarts/radarChart' // 用户投资类型 雷达图
-    import lineChart from '@/components/echarts/lineChart' // 用户投资类型 折线图
-    import { github } from "@/utils/env";
+import echarts from 'echarts'
+import barChart from '@/components/echarts/barChart' // 用户投资类型 柱状图
 
-    export default {
-        data(){
-            return {
-                github:github
-            }
-        },
-        components: {
-            salesTable,
-            commentList,
-            cardList,
-            logList,
-            barChart,
-            pieChart,
-            radarChart,
-            lineChart
-        },
-        created(){
-        },
-        mounted(){
-        },
-        methods: {
-        }
-    }
+export default {
+	data() {
+		return {
+			name: ''
+		}
+	},
+	components: {
+		barChart
+	},
+	created() {},
+	mounted() {},
+	methods: {}
+}
 </script>
 
 <style lang="less" scoped>
-    .total-frame {
-        border: 1px solid #DCDFE6;
-        padding: 20px;
-        height: 100px;
-    }
-
-    .total-icon {
-        913656
-        color: #409EFF;
-        width: 60px;
-        height: 60px;
-    }
-
-    .total-title {
-        position: relative;
-        font-size: 16px;
-        color: #909399;
-        left: 70px;
-        top: -35px;
-    }
+.total-frame {
+	border: 1px solid #dcdfe6;
+	padding: 20px;
+	height: 100px;
+	margin-bottom: 5px;
+}
 
-    .total-value {
-        position: relative;
-        font-size: 18px;
-        color: #606266;
-        left: 70px;
-        top: -25px;
-    }
-    .data_section{
-        margin: 20px;
-        border-radius: 2px;
-        .row_list{
-            margin-bottom: 20px;
-            .row_base{
-                padding: 10px;
-                box-sizing: border-box;
-                background: #fff;
-                border-radius: 6px;
-                height: 120px;
-            }
-        }
-        .order_list{
-            .orderArea{
-                width: 100%;
-                height: 300px;
-                background: #fff !important;
-                border-radius: 6px;
-                box-sizing: border-box;
-                padding: 10px;
-                padding-top: 40px;
-                overflow: hidden;
-            }
-            .orderbarArea{
-                height: 370px;
-            }
-        }
-        .data_list{
-            text-align: center;
-            font-size: 14px;
-            border-radius: 6px;
-            padding: 10px;
-            color:#fff;
-            height: 80px;
-            .leftItem{
-                align-items: start;
-                justify-content: space-between;
-                text-align: left;
-            }
-            .rightItem{
-                width:62px;
+.total-icon {
+	913656color: #409eff;
+	width: 60px;
+	height: 60px;
+}
 
-                align-items: center;
-                justify-content: center;
-                .svg-icon{
-                    font-size: 30px;
-                }
-            }
-            .number{
-                font-size: 22px;
-                font-weight: bold;
-                .perTitle{
-                    font-size: 13px;
-                    margin-left: 5px;
-                }
-            }
-        }
-        .pay{
-            .leftItem{
-                justify-content: space-around;
-            }
-        }
+.total-title {
+	position: relative;
+	font-size: 16px;
+	color: #909399;
+	left: 70px;
+	top: -35px;
+}
 
-    }
+.total-value {
+	position: relative;
+	font-size: 18px;
+	color: #606266;
+	left: 70px;
+	top: -25px;
+}
+.data_section {
+	margin: 20px;
+	border-radius: 2px;
+	.row_list {
+		margin-bottom: 20px;
+		.row_base {
+			padding: 10px;
+			box-sizing: border-box;
+			background: #fff;
+			border-radius: 6px;
+			height: 120px;
+		}
+	}
+	.order_list {
+		.orderArea {
+			width: 100%;
+			height: 300px;
+			background: #fff !important;
+			border-radius: 6px;
+			box-sizing: border-box;
+			padding: 10px;
+			padding-top: 40px;
+			overflow: hidden;
+		}
+		.orderbarArea {
+			height: 370px;
+		}
+	}
+	.data_list {
+		text-align: center;
+		font-size: 14px;
+		border-radius: 6px;
+		padding: 10px;
+		color: #fff;
+		height: 80px;
+		.leftItem {
+			align-items: start;
+			justify-content: space-between;
+			text-align: left;
+		}
+		.rightItem {
+			width: 62px;
 
+			align-items: center;
+			justify-content: center;
+			.svg-icon {
+				font-size: 30px;
+			}
+		}
+		.number {
+			font-size: 22px;
+			font-weight: bold;
+			.perTitle {
+				font-size: 13px;
+				margin-left: 5px;
+			}
+		}
+	}
+	.pay {
+		.leftItem {
+			justify-content: space-around;
+		}
+	}
+}
 </style>
diff --git a/mallplusui-web-admin/src/views/login/index.vue b/mallplusui-web-admin/src/views/login/index.vue
index 47dbbd8..a94c442 100644
--- a/mallplusui-web-admin/src/views/login/index.vue
+++ b/mallplusui-web-admin/src/views/login/index.vue
@@ -2,8 +2,8 @@
 	<div>
 		<el-card class="login-form-layout">
 			<el-form autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left">
-				<div style="text-align: center"><svg-icon icon-class="login-mall" style="width: 56px;height: 56px;color: #409EFF"></svg-icon></div>
-				<h2 class="login-title color-main">汇融云链管理平台</h2>
+				<div style="text-align: center"><img src="../../assets/img/logo.png" width="140px"/></div>
+				<h2 class="login-title color-main">汇惠云链管理后台</h2>
 				<el-form-item prop="username">
 					<el-input name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="请输入用户名">
 						<span slot="prefix"><svg-icon icon-class="user" class="color-main"></svg-icon></span>
@@ -131,7 +131,7 @@ export default {
 	position: absolute;
 	left: 0;
 	right: 0;
-	width: 360px;
+	width: 560px;
 	margin: 140px auto;
 	border-top: 10px solid #409eff;
 }
diff --git a/mallplusui-web-admin/src/views/pms/product/components/ProductAttrDetail.vue b/mallplusui-web-admin/src/views/pms/product/components/ProductAttrDetail.vue
index 2d3f94a..ebc601b 100644
--- a/mallplusui-web-admin/src/views/pms/product/components/ProductAttrDetail.vue
+++ b/mallplusui-web-admin/src/views/pms/product/components/ProductAttrDetail.vue
@@ -13,7 +13,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="商品规格：">
+     <!-- <el-form-item label="商品规格：">
         <el-card shadow="never" class="cardBg">
           <div v-for="(productAttr,idx) in selectProductAttr">
             {{productAttr.name}}：
@@ -106,7 +106,7 @@
                 style="margin-top: 20px"
                 @click="handleSyncProductSkuPrice">同步价格
         </el-button>
-      </el-form-item>
+      </el-form-item> -->
       <!--<el-form-item label="属性图片：" v-if="hasAttrPic">
         <el-card shadow="never" class="cardBg">
           <div v-for="(item,index) in selectProductAttrPics">
@@ -116,7 +116,7 @@
           </div>
         </el-card>
       </el-form-item>-->
-      <el-form-item label="商品参数：">
+<!--      <el-form-item label="商品参数：">
         <el-card shadow="never" class="cardBg">
           <div v-for="(item,index) in selectProductParam" :class="{littleMarginTop:index!==0}">
             <div class="paramInputLabel">{{item.name}}:</div>
@@ -131,7 +131,7 @@
             <el-input v-else class="paramInput" v-model="selectProductParam[index].value"></el-input>
           </div>
         </el-card>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="商品相册：">
         <multi-upload v-model="selectProductPics"></multi-upload>
       </el-form-item>
@@ -146,8 +146,9 @@
         </el-tabs>
       </el-form-item>
       <el-form-item style="text-align: center">
-        <el-button size="medium" @click="handlePrev">上一步，填写商品促销</el-button>
-        <el-button type="primary" size="medium" @click="handleNext">下一步，选择商品关联</el-button>
+        <el-button size="medium" @click="handlePrev">上一步</el-button>
+        <!-- <el-button type="primary" size="medium" @click="handleNext">下一步，选择商品关联</el-button> -->
+        <el-button type="primary" size="medium" @click="handleFinishCommit">保存商品</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -573,7 +574,10 @@
                 this.mergeProductAttrValue();
                 this.mergeProductAttrPics();
                 this.$emit('nextStep')
-            }
+            },
+      handleFinishCommit(){
+        this.$emit('finishCommit',this.isEdit);
+      }
         }
     }
 </script>
diff --git a/mallplusui-web-admin/src/views/pms/product/components/ProductDetail.vue b/mallplusui-web-admin/src/views/pms/product/components/ProductDetail.vue
index 2513558..f25b2ed 100644
--- a/mallplusui-web-admin/src/views/pms/product/components/ProductDetail.vue
+++ b/mallplusui-web-admin/src/views/pms/product/components/ProductDetail.vue
@@ -1,10 +1,9 @@
 <template> 
   <el-card class="form-container" shadow="never">
     <el-steps :active="active" finish-status="success" align-center>
-      <el-step title="填写商品信息"></el-step>
-      <el-step title="填写商品促销"></el-step>
-      <el-step title="填写商品属性"></el-step>
-      <el-step title="选择商品关联"></el-step>
+      <el-step title="商品息信"></el-step>
+      <el-step title="商品展示"></el-step>
+      <el-step title="图片及详情"></el-step>
     </el-steps>
     <product-info-detail
       v-show="showStatus[0]"
@@ -23,6 +22,7 @@
       v-show="showStatus[2]"
       v-model="productParam"
       :is-edit="isEdit"
+      @finishCommit="finishCommit"
       @nextStep="nextStep"
       @prevStep="prevStep">
     </product-attr-detail>
diff --git a/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue b/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue
index 512fc58..ffc0bbf 100644
--- a/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue
+++ b/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue
@@ -27,7 +27,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-       <el-form-item label="店内分类：" prop="storeClassId">
+<!--       <el-form-item label="店内分类：" prop="storeClassId">
               <el-select
                 v-model="value.storeClassId"
 
@@ -46,7 +46,7 @@
                 v-model="selectAreaValue"
                 :options="areaOptions">
         </el-cascader>
-      </el-form-item>
+      </el-form-item> -->
        <el-form-item  label="标签" prop="tags">
                     <el-select
                       v-model="value.tagList"
@@ -102,7 +102,7 @@
         <el-input v-model="value.weight" style="width: 300px"></el-input>
         <span style="margin-left: 20px">千克</span>
       </el-form-item>
-      <el-form-item label="固定运费：">
+<!--      <el-form-item label="固定运费：">
         <el-input v-model="value.transfee" style="width: 300px"></el-input>
         <span style="margin-left: 20px">优先于运费模版</span>
       </el-form-item>
@@ -116,7 +116,7 @@
                 :label="item.label"
                 :value="item.value">
         </el-option>
-      </el-select>
+      </el-select> -->
 
       </el-form-item>
 
@@ -124,7 +124,7 @@
         <el-input v-model="value.sort"></el-input>
       </el-form-item>
       <el-form-item style="text-align: center">
-        <el-button type="primary" size="medium" @click="handleNext('productInfoForm')">下一步，填写商品促销</el-button>
+        <el-button type="primary" size="medium" @click="handleNext('productInfoForm')">下一步</el-button>
       </el-form-item>
     </el-form>
   </div>
diff --git a/mallplusui-web-admin/src/views/pms/product/components/ProductSaleDetail.vue b/mallplusui-web-admin/src/views/pms/product/components/ProductSaleDetail.vue
index 3d65e98..e66055b 100644
--- a/mallplusui-web-admin/src/views/pms/product/components/ProductSaleDetail.vue
+++ b/mallplusui-web-admin/src/views/pms/product/components/ProductSaleDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="margin-top: 50px">
     <el-form :model="value" ref="productSaleForm" label-width="120px" style="width: 600px" size="small">
-      <el-form-item label="赠送积分：">
+<!--      <el-form-item label="赠送积分：">
         <el-input v-model="value.giftPoint"></el-input>
       </el-form-item>
       <el-form-item label="赠送成长值：">
@@ -16,7 +16,7 @@
           :active-value="1"
           :inactive-value="0">
         </el-switch>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="商品上架：">
         <el-switch
           v-model="value.publishStatus"
@@ -24,7 +24,7 @@
           :inactive-value="0">
         </el-switch>
       </el-form-item>
-      <el-form-item label="分销商品：">
+<!--      <el-form-item label="分销商品：">
               <el-switch
                 v-model="value.isFenxiao"
                 :active-value="1"
@@ -37,7 +37,7 @@
                             :active-value="1"
                             :inactive-value="0">
                           </el-switch>
-                        </el-form-item>
+                        </el-form-item> -->
       <el-form-item label="商品推荐：">
         <span style="margin-right: 10px">新品</span>
         <el-switch
@@ -71,7 +71,7 @@
       <el-form-item label="商品备注：">
         <el-input v-model="value.note" type="textarea" :autoSize="true"></el-input>
       </el-form-item>
-      <el-form-item label="选择优惠方式：">
+<!--      <el-form-item label="选择优惠方式：">
         <el-radio-group v-model="value.promotionType" size="small">
           <el-radio-button :label="0">无优惠</el-radio-button>
           <el-radio-button :label="1">特惠促销</el-radio-button>
@@ -79,7 +79,7 @@
           <el-radio-button :label="3">阶梯价格</el-radio-button>
           <el-radio-button :label="4">满减价格</el-radio-button>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item v-show="value.promotionType===1">
         <div>
           开始时间：
@@ -172,8 +172,8 @@
         </el-table>
       </el-form-item>
       <el-form-item style="text-align: center">
-        <el-button size="medium" @click="handlePrev">上一步，填写商品信息</el-button>
-        <el-button type="primary" size="medium" @click="handleNext">下一步，填写商品属性</el-button>
+        <el-button size="medium" @click="handlePrev">上一步</el-button>
+        <el-button type="primary" size="medium" @click="handleNext">下一步</el-button>
       </el-form-item>
     </el-form>
   </div>
diff --git a/mallplusui-web-admin/src/views/pms/product/index.vue b/mallplusui-web-admin/src/views/pms/product/index.vue
index 5b324bc..ae83f69 100644
--- a/mallplusui-web-admin/src/views/pms/product/index.vue
+++ b/mallplusui-web-admin/src/views/pms/product/index.vue
@@ -435,19 +435,7 @@
 					value: 4,
 					label: '回收站'
 				}],
-				btnList: [{
-					type: 'primary',
-					size: 'small',
-					icon: 'add',
-					btnKey: 'toAdd',
-					btnLabel: '新增'
-				}, {
-					type: 'info',
-					size: 'small',
-					icon: 'cross',
-					btnKey: 'doClose',
-					btnLabel: '关闭'
-				}],
+				btnList: [],
 				queryParams: {
 					current: 1,
 					size: 10,
diff --git a/mallplusui-web-admin/static/avatar.png b/mallplusui-web-admin/static/avatar.png
new file mode 100644
index 0000000..b732a21
Binary files /dev/null and b/mallplusui-web-admin/static/avatar.png differ