Merge branch 'develop' into 'master'

Develop

See merge request jianweie/coreshoppro!16

CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs

@@ -391,7 +391,7 @@ namespace CoreCms.Net.Services
             where = where.And(p => p.isAutoReceive == true);  //自动领取状态
             where = where.And(p => p.isDel == false);  //是否被删除
 
-            var data = await _dal.QueryPageAndChildsAsync(where, p => p.id, OrderByType.Desc, false, 0, limit);
+            var data = await _dal.QueryPageAndChildsAsync(where, p => p.sort, OrderByType.Asc, false, 0, limit);
 
             if (data != null && data.Any())
             {
@@ -438,7 +438,7 @@ namespace CoreCms.Net.Services
             where = where.And(p => p.isAutoReceive == true);  //自动领取状态
             where = where.And(p => p.isDel == false);  //是否被删除
 
-            var data = await _dal.QueryPageAndChildsAsync(where, p => p.id, OrderByType.Desc, true, page, limit);
+            var data = await _dal.QueryPageAndChildsAsync(where, p => p.sort, OrderByType.Asc, true, page, limit);
 
             if (data != null && data.Any())
             {

CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue

@@ -476,6 +476,21 @@
                     this.$store.commit('hasLogin', val);
                 }
             },
+            userInfo: {
+                get() {
+                    return this.$store.state.userInfo;
+                },
+                set(val) {
+                    this.$store.commit('userInfo', val);
+                }
+            },
+            pointSwitch() { return this.$store.state.config.pointSwitch },
+            pointShowExchangePrice() { return this.$store.state.config.pointShowExchangePrice },
+            pointDiscountedProportion() { return this.$store.state.config.pointDiscountedProportion },
+            pointExchangeModel() { return this.$store.state.config.pointExchangeModel },
+            pointShowName() { return this.$store.state.config.pointShowName },
+            pointGetModel() { return this.$store.state.config.pointGetModel },
+            pointShowPoint() { return this.$store.state.config.pointShowPoint },
             shopName() {
                 return this.$store.state.config.shopName;
             },

CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue

@@ -485,6 +485,21 @@
                     this.$store.commit('hasLogin', val);
                 }
             },
+            userInfo: {
+                get() {
+                    return this.$store.state.userInfo;
+                },
+                set(val) {
+                    this.$store.commit('userInfo', val);
+                }
+            },
+            pointSwitch() { return this.$store.state.config.pointSwitch },
+            pointShowExchangePrice() { return this.$store.state.config.pointShowExchangePrice },
+            pointDiscountedProportion() { return this.$store.state.config.pointDiscountedProportion },
+            pointExchangeModel() { return this.$store.state.config.pointExchangeModel },
+            pointShowName() { return this.$store.state.config.pointShowName },
+            pointGetModel() { return this.$store.state.config.pointGetModel },
+            pointShowPoint() { return this.$store.state.config.pointShowPoint },
             shopName() {
                 return this.$store.state.config.shopName;
             },

CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/index.html

@@ -464,7 +464,7 @@
                         if (e.code === 0) {
                             admin.popup({
                                 shadeClose: false,
-                                title: '修改余额',
+                                title: '修改积分',
                                 area: ['500px', '300px'],
                                 id: 'LAY-popup-CoreCmsUser-EditPoint',
                                 success: function (layero, index) {
@@ -499,13 +499,13 @@
                     });
                 }
 
-                //执行编辑积分
+                //执行修改推荐人
                 function doEditParentId(obj) {
                     coreHelper.Post("Api/CoreCmsUser/GetEditParentId", { id: obj.data.id }, function (e) {
                         if (e.code === 0) {
                             admin.popup({
                                 shadeClose: false,
-                                title: '修改余额',
+                                title: '修改推荐人',
                                 area: ['500px', '300px'],
                                 id: 'LAY-popup-CoreCmsUser-EditParentId',
                                 success: function (layero, index) {