修正细节

Author: weishakeji

Sourcecode/Song.ViewData/Methods/Account.cs

@@ -1739,33 +1739,38 @@ public Song.Entities.Accounts UserUnbind(string field)
         [HttpPost]
         public Song.Entities.Accounts UserCreate(Song.Entities.Accounts acc, string openid,string field)
         {
-            //账号为空，则自动创建；如果不为空，则判断是否重复
-            bool accexist = false;
-            if (string.IsNullOrWhiteSpace(acc.Ac_AccName))
-                acc.Ac_AccName = WeiSha.Core.Request.SnowID().ToString();
+            if (string.IsNullOrWhiteSpace(acc.Ac_AccName)) acc.Ac_AccName = WeiSha.Core.Request.SnowID().ToString();
+            //判断账号是否已经存在
+            Accounts accorig = Business.Do<IAccounts>().IsAccountsExist(acc.Ac_AccName);
+            //如果不存在，则新增
+            if (accorig == null)
+            {
+                //默认账号为审核通过和启用
+                acc.Ac_IsPass = acc.Ac_IsUse = true;
+                acc.Ac_Pw = WeiSha.Core.Request.UniqueID();
+                //头像图片
+                string headurl = acc.Ac_Photo;
+                if (!string.IsNullOrWhiteSpace(headurl))
+                {
+                    string photoPath = _phyPath + openid + ".jpg";
+                    WeiSha.Core.Request.LoadFile(headurl, photoPath);
+                    acc.Ac_Photo = openid + ".jpg";
+                }
+                Business.Do<IAccounts>().AccountsAdd(acc);
+                Business.Do<IAccounts>().BindThirdparty(acc, openid, acc.Ac_Name, headurl, field);
+                accorig = Business.Do<IAccounts>().AccountsSingle(acc.Ac_ID);
+            }
             else
-                accexist = Business.Do<IAccounts>().IsAccountExist(acc.Ac_AccName, -1);
-            if (accexist) acc.Ac_AccName += "_" + WeiSha.Core.Request.SnowID().ToString();
-
-            acc.Ac_IsPass = acc.Ac_IsUse = true;
-            acc.Ac_Pw = WeiSha.Core.Request.UniqueID();
-            //头像图片
-            string headurl = acc.Ac_Photo;
-            if (!string.IsNullOrWhiteSpace(headurl))
             {
-                string photoPath = _phyPath + openid + ".jpg";
-                WeiSha.Core.Request.LoadFile(headurl, photoPath);
-                acc.Ac_Photo = openid + ".jpg";
+                //生成绑定记录
+                Business.Do<IAccounts>().BindThirdparty(accorig, openid, acc.Ac_Name, acc.Ac_Photo, field);
             }
-            int acid = Business.Do<IAccounts>().AccountsAdd(acc);
-            //生成绑定记录
-            acc = Business.Do<IAccounts>().BindThirdparty(acc, openid, acc.Ac_Name, headurl, field);           
-            Song.Entities.Accounts nacc = Business.Do<IAccounts>().AccountsSingle(acid);
-            _tran(nacc);
-            nacc = Business.Do<IAccounts>().AccountsLogin(nacc);
-            nacc.Ac_Pw = LoginAccount.Status.Generate_Checkcode(nacc);
-            LoginAccount.Status.Fresh(nacc);
-            return nacc;
+
+            _tran(accorig);
+            accorig = Business.Do<IAccounts>().AccountsLogin(accorig);
+            accorig.Ac_Pw = LoginAccount.Status.Generate_Checkcode(accorig);
+            LoginAccount.Status.Fresh(accorig);
+            return accorig;
         }
         /// <summary>
         /// 获取学员账号绑定的第三方平台的信息

Sourcecode/Song.WebSite/Templates/OrgAdmin/Default/Learningcard/OutputExcel.html

@@ -31,7 +31,7 @@
 
         <el-card shadow="never" class="files">
             <div slot="header" class="clearfix">
-                <span icon="&#xe6a7"> 文件列表
+                <span icon="&#xe6a7"> 导出文件的下载列表
                     <span v-if="files.length>0">({{files.length}})</span>
                 </span>
                 <el-popconfirm title="确定删除所有文件吗？" @confirm="deleteFileAll()"  v-if="files.length>0">

Sourcecode/Song.WebSite/Templates/OrgAdmin/Default/RechargeCode/Codeset.html

@@ -43,9 +43,9 @@
                         </el-link>
                     </template>
                 </el-table-column>
-                <el-table-column label="数量"  width="150"  class-name="countscope">
+                <el-table-column label="数量" width="150" class-name="countscope">
                     <template slot-scope="scope">
-                        <span title="已经使用">{{scope.row.Rs_UsedCount}}</span> 
+                        <span title="已经使用">{{scope.row.Rs_UsedCount}}</span>
                         <span> / </span>
                         <span title="总数">{{scope.row.Rs_Count}}</span>
                     </template>
@@ -56,7 +56,7 @@
 
                     </template>
                 </el-table-column>
-                <el-table-column label="有效期" width="250"  align="center">
+                <el-table-column label="有效期" width="250" align="center">
                     <template slot-scope="scope">
                         <span class="limit">{{scope.row.Rs_LimitStart|date('yyyy-MM-dd')}}</span>
                         至
@@ -84,9 +84,11 @@
                                         查看充值码
                                     </span>
                                 </el-dropdown-item>
-                                <el-dropdown-item icon="el-icon-position" @click.native="outputExcel(scope.row)">导出Excel
+                                <el-dropdown-item @click.native="outputExcel(scope.row)">
+                                    <span icon="&#xe85e">导出Excel</span>
                                 </el-dropdown-item>
-                                <el-dropdown-item icon="el-icon-position" @click.native="outputQrCode(scope.row)">导出二维码
+                                <el-dropdown-item  @click.native="outputQrCode(scope.row)">
+                                    <span icon="&#xa053">导出二维码</span>
                                 </el-dropdown-item>
 
 

Sourcecode/Song.WebSite/Templates/OrgAdmin/Default/Student/Batchdisable.html

@@ -9,9 +9,19 @@
 
 <body>
     <div id="vapp" v-cloak>
-
-        <el-tabs v-model="activeName" type="border-card">
-            <el-tab-pane label="信息录入" name="first">
+        <div class="panel">
+            <el-tabs v-model="activeName" type="border-card">
+                <el-tab-pane label="信息录入" name="first">
+                </el-tab-pane>
+                <el-tab-pane label="录入数据解析" name="second">
+                </el-tab-pane>
+                <el-tab-pane label="帮助" name="help">
+                    <span slot="label">
+                        <icon>&#xa026</icon> 操作说明
+                    </span>
+                </el-tab-pane>
+            </el-tabs>
+            <div v-show="activeName=='first'" remark="信息录入" tab="first">
                 <div class="first_intro">
                     请在下面输入框录入学员信息，换行分隔<br />并明确录入的是：
                     <el-radio-group v-model="search_type">
@@ -22,8 +32,8 @@
                 </div>
                 <el-input type="textarea" class="inputText" :rows="2" placeholder="请输入内容" v-model="inputText">
                 </el-input>
-            </el-tab-pane>
-            <el-tab-pane label="录入数据解析" name="second">
+            </div>
+            <div v-show="activeName=='second'" remark="录入数据解析" tab="second">
                 <el-table ref="datatables" border resizable :stripe="true" :data="datas" tooltip-effect="dark"
                     style="width: 100%">
                     <el-table-column type="index" label="#" align="center">
@@ -51,11 +61,8 @@
                         </template>
                     </el-table-column>
                 </el-table>
-            </el-tab-pane>
-            <el-tab-pane label="帮助" name="help">
-                <span slot="label">
-                    <icon>&#xa026</icon> 操作说明
-                </span>
+            </div>
+            <div v-show="activeName=='help'" remark="基本信息" tab="help">
                 <div class="help_title">
                     第一步：
                 </div>
@@ -74,8 +81,8 @@
                 <div class="help_intro">
                     点击按钮“批量禁用学员”，等待完成即可。
                 </div>
-            </el-tab-pane>
-        </el-tabs>
+            </div>
+        </div>
         <div class="footer">
             <el-button type="primary" native-type="submit" :loading="loading" plain @click="btnBatch()">
                 <icon v-if="!loading">&#xa048</icon>批量禁用学员

Sourcecode/Song.WebSite/Templates/OrgAdmin/Default/Student/Styles/Batchdisable.css

@@ -1,28 +1,39 @@
 @charset "utf-8";
 
-#vapp {
-    padding: 10px;
+.panel {
+    width: 100%;
+    height: calc(100% - 55px);
+    border: 1px solid #DCDFE6;
     box-sizing: border-box;
 }
 
-.el-tabs {
-    height: calc(100% - 40px);
+.panel>div:not(:first-child) {
+    border-top: none;
+}
+.panel>div[tab]{
+    box-sizing: border-box;
+    height: calc(100% - 50px);
+    padding: 10px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    box-sizing: border-box;
+}
+.panel>div[tab='second']{
+    padding: 0px;
+}
+.el-tabs__content {
+    display: none;
+}
+.el-tabs--border-card {
+    box-shadow: none;
+    border: none;
 }
 
 .first_intro {
     margin: 10px 0px 10px 0px;
     line-height: 30px;
 }
 
-div.el-tabs__content {
-    height: calc(100% - 70px);
-    overflow-y: auto;
-}
-
-div.el-tabs__content>div {
-    height: calc(100% - 10px);
-}
-
 .inputText {
     height: calc(100% - 80px);
 }

Sourcecode/Song.WebSite/Utilities/Styles/Public.css

@@ -260,28 +260,27 @@ dl.files {
     counter-reset: dd;
     list-style-type: none;
     margin: 8px 0px;
+    padding: 0px;
 }
 
-dl.files, dl.files dd, dl.files dt {
+dl.files dd, dl.files dt {
     padding: 0px;
     margin: 0px;
 }
 
 dl.files dt {
     padding: 8px;
-
 }
 
 dl.files dd::before {
     counter-increment: dd;
     content: ""counter(dd) " . ";
-
 }
 
 dl.files dd {
     display: flex;
     justify-content: space-between;
-    padding: 3px 10px;
+    padding: 3px 10px 3px 15px;
     box-sizing: content-box;
 }