wupengfei 3 years ago
parent
commit
df2d267cae
34 changed files with 88 additions and 68 deletions
  1. 1 1
      application/api/common.php
  2. 3 3
      application/api/controller/Crystal.php
  3. 5 5
      application/api/controller/ExchangeOrder.php
  4. 9 9
      application/api/controller/Expedite.php
  5. 1 1
      application/api/controller/General.php
  6. 7 7
      application/api/controller/GoodsOrder.php
  7. 3 3
      application/api/controller/MagicCase.php
  8. 4 4
      application/api/controller/MagicMarket.php
  9. 2 2
      application/api/controller/Pay.php
  10. 2 2
      application/api/controller/Qc.php
  11. 1 1
      application/api/controller/Usercenter.php
  12. 3 3
      application/api/controller/Usermanage.php
  13. 1 1
      application/common.php
  14. 1 1
      application/market/view/goods/form.html
  15. 1 1
      application/market/view/goods/index.html
  16. 1 1
      application/market/view/market_order/detail.html
  17. 1 1
      application/order/controller/CrystalCash.php
  18. 1 1
      application/order/controller/CrystalOrder.php
  19. 1 1
      application/order/view/crystal_order/index.html
  20. 1 1
      application/order/view/goods_order/detail.html
  21. 1 1
      application/order/view/magic_order/detail.html
  22. 2 0
      application/store/view/config/index.html
  23. 18 0
      application/store/view/config/platform-rule.html
  24. 2 2
      application/store/view/config/platform-set.html
  25. 3 3
      application/store/view/goods/form.html
  26. 3 3
      application/store/view/goods/goods_no.html
  27. 1 1
      application/store/view/integral/index.html
  28. 1 1
      application/store/view/integral_goods/form.html
  29. 1 1
      application/store/view/integral_goods/index.html
  30. 1 1
      application/user/controller/CrystalCash.php
  31. 4 4
      application/user/controller/Integral.php
  32. 1 1
      application/user/view/integral/index.html
  33. 1 1
      application/user/view/member/index.html
  34. 0 0
      public/static/plugs/ckeditor/lang/zh-cn.js

+ 1 - 1
application/api/common.php

@@ -206,7 +206,7 @@ function resolve_magic($user_id = 0)
             'case_id' => $value['id'],
             'crystal' =>$crystal ,
         ];
-        //更新圆币余额
+        //更新明信片余额
         $member_info = Db::table('store_member')->field('id,crystal_cash')->find($value['user_id']);
         // 扣减魔玩柜的数量
         Db::startTrans();

+ 3 - 3
application/api/controller/Crystal.php

@@ -147,8 +147,8 @@ class Crystal extends Base
 
 
     /**
-     * @title  获取圆币明细
-     * @desc  获取圆币明细
+     * @title  获取明信片明细
+     * @desc  获取明信片明细
      * @author  qc
      * @url /api/Crystal/getCrystalLog
      * @method GET
@@ -157,7 +157,7 @@ class Crystal extends Base
      * @param  name:page_num type:int  : default:20 desc:每页数
      * @return name:desc type:string default:-- desc:描述
      * @return name:type type:int default:-- desc:类型
-     * @return name:crystal type:int default:-- desc:圆币变更数
+     * @return name:crystal type:int default:-- desc:明信片变更数
      * @return name:create_at type:string default:-- desc:时间
      */
     public function getCrystalLog()

+ 5 - 5
application/api/controller/ExchangeOrder.php

@@ -86,7 +86,7 @@ class ExchangeOrder extends Base
      * @param name:num type:int require:1 default:1 desc:商品数量
      * @param name:add_id type:int require:1 default:0 desc:收货地址id
      * @param name:coupon_id type:int require:0 default:0 desc:券id
-     * @param name:exchange_type type:int require:1 default:1 desc:1圆币2余额
+     * @param name:exchange_type type:int require:1 default:1 desc:1明信片2余额
      * @return  name:order_id type:int require:0 default:0 desc:成功时返回订单id
      */
     public function createOrderByImmediately()
@@ -138,7 +138,7 @@ class ExchangeOrder extends Base
             'send_info'          =>json_encode($send_info),
         ];
         $user_info =Db::table('store_member')->find($this->uid);
-        if($exchange_type == 1 && $user_info['crystal']< $order_int['crystal']) $this->error('圆币不足!');
+        if($exchange_type == 1 && $user_info['crystal']< $order_int['crystal']) $this->error('明信片不足!');
         if($exchange_type == 2 && $user_info['crystal_cash']< $order_int['crystal']) $this->error('余额不足!');
         Db::startTrans();
         $msg= '';$com=true;
@@ -156,7 +156,7 @@ class ExchangeOrder extends Base
             Db::table('exchange_order')->insert($order_int);
             $order_id = Db::getLastInsID();
             if($exchange_type == 1) {
-                crystal_log($this->uid,$order_int['crystal']*-1,'圆币兑换',5,$order_id);
+                crystal_log($this->uid,$order_int['crystal']*-1,'明信片兑换',5,$order_id);
             }else{
                 balance_log($this->uid,$order_int['crystal']*-1,'余额兑换',5,$order_id);
             }
@@ -194,7 +194,7 @@ class ExchangeOrder extends Base
      * @return name:goods_name type:string default:-- desc:商品名
      * @return name:goods_cover type:string default:-- desc:商品图片
      * @return name:goods_num type:int default:-- desc:商品数量
-     * @return name:exchange_type type:int default:-- desc:兑换方式(1圆币2余额)
+     * @return name:exchange_type type:int default:-- desc:兑换方式(1明信片2余额)
      * @return name:express_company_title type:string default:-- desc:物流公司
      * @return name:express_send_no type:string default:-- desc:物流单号
      * @return name:express_send_at type:string default:-- desc:发货时间
@@ -231,7 +231,7 @@ class ExchangeOrder extends Base
      * @return name:goods_name type:string default:-- desc:商品名
      * @return name:goods_cover type:string default:-- desc:商品图片
      * @return name:goods_num type:int default:-- desc:商品数量
-     * @return name:exchange_type type:int default:-- desc:兑换方式(1圆币2余额)
+     * @return name:exchange_type type:int default:-- desc:兑换方式(1明信片2余额)
      * @return name:express_company_title type:string default:-- desc:物流公司
      * @return name:express_send_no type:string default:-- desc:物流单号
      * @return name:express_send_at type:string default:-- desc:发货时间

+ 9 - 9
application/api/controller/Expedite.php

@@ -36,7 +36,7 @@ class Expedite extends Base
      * @return name:spec.spec_img type:string default:-- desc:封面
      * @return name:spec.store_num type:string default:-- desc:剩余库存
      * @return name:spec.base_num type:string default:-- desc:初始库存
-     * @return name:spec.crystal type:string default:-- desc:圆币价值
+     * @return name:spec.crystal type:string default:-- desc:明信片价值
      * @return name:spec.color type:int default:-- desc:0黑色,1红色,2金色
      * @return name:spec.rate type:string default:-- desc:抽中概率
      * @return name:goods_info.first_classify type:int default:-- desc:分类id
@@ -48,7 +48,7 @@ class Expedite extends Base
      * @return name:goods_info.special_award.title type:string default:-- desc:标题
      * @return name:goods_info.special_award.goods type:string default:-- desc:商品名
      * @return name:goods_info.special_award.cover type:string default:-- desc:图片
-     * @return name:goods_info.special_award.crystal type:string default:-- desc:圆币
+     * @return name:goods_info.special_award.crystal type:string default:-- desc:明信片
      * @return name:goods_info.special_award.is_over type:string default:-- desc:奖励是否完成
      * @return name:goods_info.special_award.color type:int default:-- desc:0黑色,1红色,2金色
      * @return name:goods_info.special_point type:int default:-- desc:前后场分割数
@@ -58,7 +58,7 @@ class Expedite extends Base
      * @return name:goods_info.last_award.title type:string default:-- desc:标题
      * @return name:goods_info.last_award.goods type:string default:-- desc:商品名
      * @return name:goods_info.last_award.cover type:string default:-- desc:图片
-     * @return name:goods_info.last_award.crystal type:string default:-- desc:圆币
+     * @return name:goods_info.last_award.crystal type:string default:-- desc:明信片
      * @return name:goods_info.last_award.is_over type:string default:-- desc:奖励是否完成
      * @return name:goods_info.last_award.color type:int default:-- desc:0黑色,1红色,2金色
      *
@@ -99,7 +99,7 @@ class Expedite extends Base
      * @return name:spec.spec_img type:string default:-- desc:封面
      * @return name:spec.store_num type:string default:-- desc:剩余库存
      * @return name:spec.base_num type:string default:-- desc:初始库存
-     * @return name:spec.crystal type:string default:-- desc:圆币价值
+     * @return name:spec.crystal type:string default:-- desc:明信片价值
      * @return name:spec.color type:int default:-- desc:0黑色,1红色,2金色
      * @return name:first_classify type:int default:-- desc:一级分类id
      * @return name:detail type:int default:-- desc:商品详情
@@ -110,7 +110,7 @@ class Expedite extends Base
      * @return name:goods_info.special_award.title type:string default:-- desc:标题
      * @return name:goods_info.special_award.goods type:string default:-- desc:商品名
      * @return name:goods_info.special_award.cover type:string default:-- desc:图片
-     * @return name:goods_info.special_award.crystal type:string default:-- desc:圆币
+     * @return name:goods_info.special_award.crystal type:string default:-- desc:明信片
      * @return name:goods_info.special_award.is_over type:string default:-- desc:奖励是否完成
      * @return name:msg_num type:int default:-- desc:消息未读数量
      */
@@ -278,7 +278,7 @@ class Expedite extends Base
      * @return name:name type:string default:-- desc:商品名称
      * @return name:cover type:string default:-- desc:商品封面图
      * @return name:desc type:string default:-- desc:商品简述
-     * @return name:crystal type:int default:-- desc:售价(圆币||余额)
+     * @return name:crystal type:int default:-- desc:售价(明信片||余额)
      * @return name:first_classify type:int default:-- desc:一级分类id
      * @return name:detail type:int default:-- desc:商品详情
      * @return name:stock type:float default:-- desc:剩余库存
@@ -310,7 +310,7 @@ class Expedite extends Base
      * @return name:name type:string default:-- desc:商品名称
      * @return name:cover type:string default:-- desc:商品封面图
      * @return name:desc type:string default:-- desc:商品简述
-     * @return name:crystal type:int default:-- desc:售价(圆币||余额)
+     * @return name:crystal type:int default:-- desc:售价(明信片||余额)
      * @return name:first_classify type:int default:-- desc:一级分类id
      * @return name:detail type:int default:-- desc:商品详情
      * @return name:stock type:float default:-- desc:剩余库存
@@ -377,7 +377,7 @@ class Expedite extends Base
      * @return name:pro_info.num type:int default:-- desc:数量
      * @return name:pro_info.case_name type:int default:-- desc:名称
      * @return name:pro_info.case_cover type:int default:-- desc:图片
-     * @return name:pro_info.crystal type:int default:-- desc:圆币
+     * @return name:pro_info.crystal type:int default:-- desc:明信片
      */
     public function getMarketGoodsDetail()
     {
@@ -411,7 +411,7 @@ class Expedite extends Base
      * @return name:pro_info.num type:int default:-- desc:数量
      * @return name:pro_info.case_name type:int default:-- desc:名称
      * @return name:pro_info.case_cover type:int default:-- desc:图片
-     * @return name:pro_info.crystal type:int default:-- desc:圆币
+     * @return name:pro_info.crystal type:int default:-- desc:明信片
      * @return name:pro_info.headimg type:string default:-- desc:头像
      * @return name:pro_info.name type:string default:-- desc:名称
      */

+ 1 - 1
application/api/controller/General.php

@@ -104,7 +104,7 @@ class General extends Base
      * @url /api/General/userSign
      * @method POST
      * @header name:Authorization require:1 desc:Token
-     * @return name:sign_crystal type:int  default:--  desc:圆币
+     * @return name:sign_crystal type:int  default:--  desc:明信片
      * @return name:coupon_id type:int  default:--  desc:券id(没有券是0)
      */
     public function userSign()

+ 7 - 7
application/api/controller/GoodsOrder.php

@@ -31,7 +31,7 @@ class GoodsOrder extends Base
      * @return name:pay_state type:int default:-- desc:支付状态(0未支付,1已支付)
      * @return name:pay_no type:string default:-- desc:支付单号
      * @return name:create_at type:string default:-- desc:订单创建时间
-     * @return name:pay_type type:string default:-- desc:支付方式(0未支付,1圆币,2余额)
+     * @return name:pay_type type:string default:-- desc:支付方式(0未支付,1明信片,2余额)
      * @return name:pay_time type:string default:-- desc:支付时间
      * @return name:cancel_state type:int default:-- desc:取消状态
      * @return name:goods_id type:int default:-- desc:商品id
@@ -55,7 +55,7 @@ class GoodsOrder extends Base
      * @header name:Authorization require:1 desc:Token
      * @param name:goods_id type:int require:1 default:-- desc:商品id
      * @param name:num type:int require:1 default:1 desc:商品数量
-     * @param name:pay_type type:int require:1 default:1 desc:支付方式(1圆币,2余额)
+     * @param name:pay_type type:int require:1 default:1 desc:支付方式(1明信片,2余额)
      * @return  name:order_id type:int require:0 default:0 desc:成功时返回订单id
      */
     public function payOrderImmediately()
@@ -72,7 +72,7 @@ class GoodsOrder extends Base
         $user_info = Db::table('store_member')->find($this->uid);
         if($price_total <= 0) $this->error('金额有误');
         if(!in_array($pay_type,[1,2])) $this->error('支付方式有误!');
-        if($pay_type == 1 && $user_info['crystal'] < $price_total) $this->error('圆币不足!');
+        if($pay_type == 1 && $user_info['crystal'] < $price_total) $this->error('明信片不足!');
         if($pay_type == 2 && $user_info['crystal_cash'] < $price_total) $this->error('余额不足!');
         $order_info =[
             'uid'=>$this->uid,
@@ -192,7 +192,7 @@ class GoodsOrder extends Base
                 // 扣除余额
                 if($pay_type == 1) {
                     Db::table('store_member')->where(['id'=>$this->uid])->update(['crystal'=>bcsub($user_info['crystal'],$order_info['price_total'],2)]);
-                    crystal_log($this->uid,$order_info['price_total'],'圆币支付',6);
+                    crystal_log($this->uid,$order_info['price_total'],'明信片支付',6);
                }else{
                     Db::table('store_member')->where(['id'=>$this->uid])->update(['crystal_cash'=>bcsub($user_info['crystal_cash'],$order_info['price_total'],2)]);
                     balance_log($this->uid,$order_info['price_total'],'余额支付',6);
@@ -446,7 +446,7 @@ class GoodsOrder extends Base
      * @return name:list.case_name type:string default:0 desc:名称
      * @return name:list.case_cover type:string default:0 desc:封面
      * @return name:list.num type:string default:0 desc:数量
-     * @return name:list.crystal type:float default:0.00 desc:每个圆币价值
+     * @return name:list.crystal type:float default:0.00 desc:每个明信片价值
      * @return name:list.title type:float default:-- desc:标题
      */
     public function getMagicCaseByOrderId()
@@ -506,7 +506,7 @@ class GoodsOrder extends Base
      * @return name:pay_state type:int default:-- desc:支付状态(0未支付,1已支付)
      * @return name:pay_no type:string default:-- desc:支付单号
      * @return name:create_at type:string default:-- desc:订单创建时间
-     * @return name:pay_type type:string default:-- desc:支付方式(0未支付,1圆币,2余额)
+     * @return name:pay_type type:string default:-- desc:支付方式(0未支付,1明信片,2余额)
      * @return name:pay_time type:string default:-- desc:支付时间
      * @return name:cancel_state type:int default:-- desc:取消状态
      * @return name:goods_id type:int default:-- desc:商品id
@@ -548,7 +548,7 @@ class GoodsOrder extends Base
      * @return name:pay_state type:int default:-- desc:支付状态(0未支付,1已支付)
      * @return name:pay_no type:string default:-- desc:支付单号
      * @return name:create_at type:string default:-- desc:订单创建时间
-     * @return name:pay_type type:string default:-- desc:支付方式(0未支付,1圆币,2余额)
+     * @return name:pay_type type:string default:-- desc:支付方式(0未支付,1明信片,2余额)
      * @return name:pay_time type:string default:-- desc:支付时间
      * @return name:cancel_state type:int default:-- desc:取消状态
      * @return name:goods_id type:int default:-- desc:商品id

+ 3 - 3
application/api/controller/MagicCase.php

@@ -31,7 +31,7 @@ class MagicCase extends Base
      * @return name:list.case_name type:string default:0 desc:名称
      * @return name:list.case_cover type:string default:0 desc:封面
      * @return name:list.num type:string default:0 desc:数量
-     * @return name:list.crystal type:float default:0.00 desc:每个圆币价值
+     * @return name:list.crystal type:float default:0.00 desc:每个明信片价值
      * @return name:list.past_at type:string default:0.00 desc:过期时间
      * @return name:will_past type:int default:-- desc:10分钟内将要到期的记录
      */
@@ -61,7 +61,7 @@ class MagicCase extends Base
      * @method POST
      * @header name:Authorization require:1 desc:Token
      * @param  name:json_str type:string  : default:1 desc:分解的json串[{'id':'';'num':'数量'}]  [{"id":11,"num":1}]
-     * @return name:total_crystal type:float default:0.00 desc:分级模玩柜获得的圆币
+     * @return name:total_crystal type:float default:0.00 desc:分级模玩柜获得的明信片
      */
     public function resolveMagicCase()
     {
@@ -96,7 +96,7 @@ class MagicCase extends Base
             Db::rollback();
             $this->error('分解数据有误');
         }
-        //更新圆币
+        //更新明信片
         $member_info = Db::table('store_member')->field('id,crystal,crystal_cash')->find($this->uid);
         Db::table('store_member')->where('id',$this->uid)->update(['crystal'=>bcadd($member_info['crystal'],$total_crystal,2)]);
         Db::table('magic_resolve')->insertAll($log_data);// 分解日志

+ 4 - 4
application/api/controller/MagicMarket.php

@@ -127,13 +127,13 @@ class MagicMarket extends Base
      * @return name:goods_data.user_id type:int default:-- desc:售卖商品会员id
      * @return name:goods_data.stock type:int default:-- desc:数量
      * @return name:goods_data.sell_price type:int default:-- desc:售价(所有数量的售价)
-     * @return name:goods_data.crystal type:float default:-- desc:圆币总价值
+     * @return name:goods_data.crystal type:float default:-- desc:明信片总价值
      * @return name:goods_data.order_status type:int default:-- desc:售卖状态0售卖中1已售卖/待发货2待收货3已完成
      * @return name:goods_data.pro_info type:array default:-- desc:详情
      * @return name:goods_data.pro_info.num type:int default:-- desc:数量
      * @return name:goods_data.pro_info.case_name type:int default:-- desc:名称
      * @return name:goods_data.pro_info.case_cover type:int default:-- desc:图片
-     * @return name:goods_data.pro_info.crystal type:int default:-- desc:圆币(每个)
+     * @return name:goods_data.pro_info.crystal type:int default:-- desc:明信片(每个)
      * @return name:market_freight type:float  default:--  desc:运费
      * @return name:coupon_list type:array  default:--  desc:可用运费券
      * @return name:coupon_list.id type:int  default:--  desc:券id
@@ -266,7 +266,7 @@ class MagicMarket extends Base
      * @return name:pro_info.num type:int default:-- desc:数量
      * @return name:pro_info.case_name type:int default:-- desc:名称
      * @return name:pro_info.case_cover type:int default:-- desc:图片
-     * @return name:pro_info.crystal type:int default:-- desc:圆币
+     * @return name:pro_info.crystal type:int default:-- desc:明信片
      * @return name:send_info type:int default:-- desc:收货地址
      * @return name:send_info.pro_name type:string default:-- desc:省
      * @return name:send_info.city_name type:string default:-- desc:市
@@ -361,7 +361,7 @@ class MagicMarket extends Base
      * @return name:pro_info.num type:int default:-- desc:数量
      * @return name:pro_info.case_name type:int default:-- desc:名称
      * @return name:pro_info.case_cover type:int default:-- desc:图片
-     * @return name:pro_info.crystal type:int default:-- desc:圆币
+     * @return name:pro_info.crystal type:int default:-- desc:明信片
      */
     public function getMyOrderList()
     {

+ 2 - 2
application/api/controller/Pay.php

@@ -293,7 +293,7 @@ class Pay extends Controller
 
 
     /**
-     *圆币充值
+     *明信片充值
      */
     public function crystalRecharge()
     {
@@ -309,7 +309,7 @@ class Pay extends Controller
                 $user_info = Db::table('store_member')->find($order_info['uid']);
                 // 更新会员余额
                 Db::table('store_member')->where('id',$order_info['uid'])->update(['crystal_cash'=>bcadd($user_info['crystal_cash'],$order_info['crystal'],2)]);
-                // 圆币明细
+                // 明信片明细
                 balance_log($order_info['uid'],$order_info['crystal'],'余额充值',2,$order_info['id']);
                 // 更新订单状态
                 $res = Db::table('crystal_order')->where('id',$order_info['id'])

+ 2 - 2
application/api/controller/Qc.php

@@ -86,8 +86,8 @@ class Qc extends Base {
         ];
         var_dump([
             'goods_price'=>'商品售价',
-            'crystal'=>'圆币成本',
-            'award_crystal'=>'已中圆币',
+            'crystal'=>'明信片成本',
+            'award_crystal'=>'已中明信片',
             'sell_money'=>'已售金额',
             'all_money'=>'售完金额',
             'profit'=>'利润',

+ 1 - 1
application/api/controller/Usercenter.php

@@ -27,7 +27,7 @@ class Usercenter extends Base
      * @return name:phone type:int default:-- desc:手机号
      * @return name:name type:string default:-- desc:姓名
      * @return name:headimg type:string default:-- desc:头像地址
-     * @return name:crystal type:int default:-- desc:圆币
+     * @return name:crystal type:int default:-- desc:明信片
      * @return name:crystal_cash type:string default:-- desc:余额(充值的)
      * @return name:coupon_num type:string default:-- desc:优惠券数量
      */

+ 3 - 3
application/api/controller/Usermanage.php

@@ -198,8 +198,8 @@ class Usermanage extends Base
 
 
     /**
-     * @title 获取圆币变更日志
-     * @desc  获取圆币变更日志
+     * @title 获取明信片变更日志
+     * @desc  获取明信片变更日志
      * @author  qc
      * @url /api/Usermanage/getCrystalLog
      * @method GET
@@ -348,7 +348,7 @@ class Usermanage extends Base
      * @return name:pro_info.num type:int default:-- desc:数量
      * @return name:pro_info.case_name type:int default:-- desc:名称
      * @return name:pro_info.case_cover type:int default:-- desc:图片
-     * @return name:pro_info.crystal type:int default:-- desc:圆币
+     * @return name:pro_info.crystal type:int default:-- desc:明信片
      */
     public function getMyMarketGoods()
     {

+ 1 - 1
application/common.php

@@ -262,7 +262,7 @@ function to_reload()
     }
 }
 
-// 圆币日志
+// 明信片日志
 function crystal_log($user_id,$crystal,$desc,$type,$rel_id=0)
 {
     $log_data = [

+ 1 - 1
application/market/view/goods/form.html

@@ -13,7 +13,7 @@
                 <th class='text-left nowrap'>名称</th>
                 <th class='text-left nowrap'>图片</th>
                 <th class='text-left nowrap'>数量</th>
-                <th class='text-left nowrap'>圆币</th>
+                <th class='text-left nowrap'>明信片</th>
             </tr>
             </thead>
             <tbody class="no_html">

+ 1 - 1
application/market/view/goods/index.html

@@ -10,7 +10,7 @@
         <tr>
             <th class='text-left nowrap'>售卖会员</th>
             <th class='text-left nowrap'>头像</th>
-            <th class='text-left nowrap'>圆币价值</th>
+            <th class='text-left nowrap'>明信片价值</th>
             <th class='text-left nowrap'>价格</th>
             <th class='text-left nowrap'>剩余数量</th>
             <th class="text-left nowrap">时间</th>

+ 1 - 1
application/market/view/market_order/detail.html

@@ -54,7 +54,7 @@
                     <th class='text-left nowrap'>商品</th>
                     <th class='text-left nowrap'>图片</th>
                     <th class='text-left nowrap'>数量</th>
-                    <th class='text-left nowrap'>圆币</th>
+                    <th class='text-left nowrap'>明信片</th>
                 </tr>
                 </thead>
                 <tbody class="no_html">

+ 1 - 1
application/order/controller/CrystalCash.php

@@ -3,7 +3,7 @@ namespace app\order\controller;
 use library\Controller;
 use think\Db;
 /**
- * 圆币提现管理
+ * 明信片提现管理
  * Class CrystalCash
  * @package app\order\controller
  */

+ 1 - 1
application/order/controller/CrystalOrder.php

@@ -3,7 +3,7 @@ namespace app\order\controller;
 use library\Controller;
 use think\Db;
 /**
- * 圆币充值订单管理
+ * 明信片充值订单管理
  * Class CrystalOrder
  * @package app\order\controller
  */

+ 1 - 1
application/order/view/crystal_order/index.html

@@ -10,7 +10,7 @@
             <th class='text-left nowrap'>用户名</th>
             <th class='text-left nowrap'>手机号</th>
             <th class='text-left nowrap'>订单金额</th>
-            <th class='text-left nowrap'>充值圆币</th>
+            <th class='text-left nowrap'>充值明信片</th>
             <th class='text-left nowrap'>订单号</th>
             <th class='text-left nowrap'>订单状态</th>
             <th class="text-left nowrap">支付时间</th>

+ 1 - 1
application/order/view/goods_order/detail.html

@@ -70,7 +70,7 @@
                     <th class='text-left nowrap'>名称</th>
                     <th class='text-left nowrap'>图片</th>
                     <th class='text-left nowrap'>数量</th>
-                    <th class='text-left nowrap'>圆币</th>
+                    <th class='text-left nowrap'>明信片</th>
                 </tr>
                 </thead>
                 <tbody class="no_html">

+ 1 - 1
application/order/view/magic_order/detail.html

@@ -54,7 +54,7 @@
                     <th class='text-left nowrap'>商品</th>
                     <th class='text-left nowrap'>图片</th>
                     <th class='text-left nowrap'>数量</th>
-                    <th class='text-left nowrap'>圆币</th>
+                    <th class='text-left nowrap'>明信片</th>
                 </tr>
                 </thead>
                 <tbody class="no_html">

+ 2 - 0
application/store/view/config/index.html

@@ -9,6 +9,7 @@
         <li data-type="store-config-type-sms2">购买须知</li>
         <li data-type="store-config-type-sms2">平台消息</li>
         <li data-type="store-config-type-sms2">邀请规则</li>
+        <li data-type="store-config-type-sms2">平台协议</li>
     </ul>
     <div class="layui-tab-content">
         <div class="layui-tab-item">{include file='config/platform-set'}</div>
@@ -16,6 +17,7 @@
         <div class="layui-tab-item">{include file='config/purchase-notice'}</div>
         <div class="layui-tab-item">{include file='config/platform-notice'}</div>
         <div class="layui-tab-item">{include file='config/invite-rule'}</div>
+        <div class="layui-tab-item">{include file='config/platform-rule'}</div>
     </div>
 </div>
 

+ 18 - 0
application/store/view/config/platform-rule.html

@@ -0,0 +1,18 @@
+<form onsubmit="return false;" data-auto="true" action="{:url('save')}" method="post" class='layui-form layui-card' autocomplete="off">
+
+    <div class="layui-card-body padding-40">
+        <label class="layui-form-item margin-top-20 block relative">
+            <span class="color-green margin-right-10">平台协议</span><span class="nowrap color-desc">PlatformRule</span>
+            <textarea name="platform_rule">{:sysconf('platform_rule')}</textarea>
+        </label>
+        <div class="layui-form-item text-center margin-top-20">
+            <button class="layui-btn" type="submit">保存配置</button>
+        </div>
+    </div>
+    <script>
+        window.form.render();
+        require(['ckeditor', 'angular'], function () {
+            window.createEditor('[name="platform_rule"]', {height: 500});
+        })
+    </script>
+</form>

+ 2 - 2
application/store/view/config/platform-set.html

@@ -32,13 +32,13 @@
         <label class="layui-form-item block relative">
             <span class="color-green margin-right-10">一级返利比率</span><span class="nowrap color-desc">FirstRebate</span>
             <input name="first_rebate" type="number" required placeholder="一级返利" value="{:sysconf('first_rebate')}" class="layui-input">
-            <p class="help-block">返利比率(整数),若设置为0则不返利,例如:设置返利比率为5 ,返利上级5%圆币</p>
+            <p class="help-block">返利比率(整数),若设置为0则不返利,例如:设置返利比率为5 ,返利上级5%明信片</p>
         </label>
 
         <label class="layui-form-item block relative">
             <span class="color-green margin-right-10">二级返利比率</span><span class="nowrap color-desc">SecondRebate</span>
             <input name="second_rebate" type="number" required placeholder="一级返利" value="{:sysconf('second_rebate')}" class="layui-input">
-            <p class="help-block">返利比率(整数),若设置为0则不返利,例如:设置返利比率为5 ,返上级的上级5%圆币</p>
+            <p class="help-block">返利比率(整数),若设置为0则不返利,例如:设置返利比率为5 ,返上级的上级5%明信片</p>
         </label>
 
         <label class="layui-form-item block relative">

+ 3 - 3
application/store/view/goods/form.html

@@ -98,7 +98,7 @@
                                     <th class='text-left nowrap' style="width: 20%">标题</th>
                                     <th class='text-left nowrap' style="width: 30%">商品</th>
                                     <th class='text-left nowrap' style="width: 10%">图片</th>
-                                    <th class='text-left nowrap'  style="width: 10%">圆币</th>
+                                    <th class='text-left nowrap'  style="width: 10%">明信片</th>
                                     <th class='text-left nowrap'  style="width: 10%">颜色</th>
                                 </tr>
                                 </thead>
@@ -141,7 +141,7 @@
                                     <th class='text-left nowrap' style="width: 20%">标题</th>
                                     <th class='text-left nowrap' style="width: 30%">商品</th>
                                     <th class='text-left nowrap' style="width: 10%">图片</th>
-                                    <th class='text-left nowrap'  style="width: 10%">圆币</th>
+                                    <th class='text-left nowrap'  style="width: 10%">明信片</th>
                                     <th class='text-left nowrap'  style="width: 10%">颜色</th>
                                 </tr>
                                 </thead>
@@ -185,7 +185,7 @@
                                 <th class='text-left nowrap'>图片</th>
                                 <th class='text-left nowrap'>剩余数量</th>
                                 <th class='text-left nowrap'>初始数量</th>
-                                <th class='text-left nowrap'  style="width: 12%">圆币</th>
+                                <th class='text-left nowrap'  style="width: 12%">明信片</th>
                                 <th class='text-left nowrap' style="width: 12%">颜色</th>
                                 <th class='text-left nowrap'>指定中奖</th>
                             </tr>

+ 3 - 3
application/store/view/goods/goods_no.html

@@ -95,7 +95,7 @@
                                 <th class='text-left nowrap' style="width: 20%">标题</th>
                                 <th class='text-left nowrap' style="width: 30%">商品</th>
                                 <th class='text-left nowrap' style="width: 10%">图片</th>
-                                <th class='text-left nowrap'  style="width: 10%">圆币</th>
+                                <th class='text-left nowrap'  style="width: 10%">明信片</th>
                                 <th class='text-left nowrap'  style="width: 10%">颜色</th>
                             </tr>
                             </thead>
@@ -156,7 +156,7 @@
                                 <th class='text-left nowrap' style="width: 20%">标题</th>
                                 <th class='text-left nowrap' style="width: 30%">商品</th>
                                 <th class='text-left nowrap' style="width: 10%">图片</th>
-                                <th class='text-left nowrap'  style="width: 10%">圆币</th>
+                                <th class='text-left nowrap'  style="width: 10%">明信片</th>
                                 <th class='text-left nowrap'  style="width: 10%">颜色</th>
                             </tr>
                             </thead>
@@ -219,7 +219,7 @@
                                 <th class='text-left nowrap' style="width: 25%">名称</th>
                                 <th class='text-left nowrap'>图片</th>
                                 <th class='text-left nowrap'>数量</th>
-                                <th class='text-left nowrap' style="width: 12%">圆币</th>
+                                <th class='text-left nowrap' style="width: 12%">明信片</th>
                                 <th class='text-left nowrap' style="width: 12%">颜色</th>
                                 <th class='text-left nowrap'>指定中奖</th>
                                 <th class='text-left nowrap'>操作</th>

+ 1 - 1
application/store/view/integral/index.html

@@ -9,7 +9,7 @@
             <th class='text-left nowrap'>头像</th>
             <th class='text-left nowrap'>名称</th>
             <th class='text-left nowrap'>手机号</th>
-            <th class='text-left nowrap'>圆币</th>
+            <th class='text-left nowrap'>明信片</th>
             <th class='text-left nowrap'>变更类型</th>
             <th class="text-center nowrap">时间</th>
             <th class="text-center nowrap">操作</th>

+ 1 - 1
application/store/view/integral_goods/form.html

@@ -61,7 +61,7 @@
                     </div>
 
                     <div class="layui-form-item">
-                        <label class="layui-form-label label-required">圆币</label>
+                        <label class="layui-form-label label-required">明信片</label>
                         <div class="layui-input-block">
                             <input name="crystal" type="number" step="1" class="layui-input"  value="{$vo.crystal|default=''}">
                         </div>

+ 1 - 1
application/store/view/integral_goods/index.html

@@ -19,7 +19,7 @@
             </th>
             <th class='text-left nowrap'>商品名称</th>
             <th class='text-left nowrap'>封面</th>
-            <th class='text-left nowrap'>圆币</th>
+            <th class='text-left nowrap'>明信片</th>
             <th class='text-left nowrap'>库存</th>
             <th class="text-center">添加时间</th>
             <th class="text-center">操作</th>

+ 1 - 1
application/user/controller/CrystalCash.php

@@ -49,7 +49,7 @@ class CrystalCash extends Controller
 
 
     /**
-     * 删除圆币日志
+     * 删除明信片日志
      * @auth true
      * @menu true
      */

+ 4 - 4
application/user/controller/Integral.php

@@ -7,7 +7,7 @@ use library\Controller;
 use think\Db;
 
 /**
- * 会员圆币
+ * 会员明信片
  * Class Integral
  * @package app\user\controller
  */
@@ -17,13 +17,13 @@ class Integral extends Controller
 
 
     /**
-     * 圆币变更列表
+     * 明信片变更列表
      * @auth true
      * @menu true
      */
     public function index()
     {
-        $this->title = '圆币列表';
+        $this->title = '明信片列表';
         $query = $this->_query($this->table);
         $where= [];
         $int_type = Db::table('crystal_type')->where('status',1)->select();
@@ -38,7 +38,7 @@ class Integral extends Controller
     }
 
     /**
-     * 删除圆币日志
+     * 删除明信片日志
      * @auth true
      * @menu true
      */

+ 1 - 1
application/user/view/integral/index.html

@@ -9,7 +9,7 @@
             <th class='text-left nowrap'>头像</th>
             <th class='text-left nowrap'>名称</th>
             <th class='text-left nowrap'>手机号</th>
-            <th class='text-left nowrap'>圆币</th>
+            <th class='text-left nowrap'>明信片</th>
             <th class='text-left nowrap'>变更类型</th>
             <th class="text-center nowrap">时间</th>
             <th class="text-center nowrap">操作</th>

+ 1 - 1
application/user/view/member/index.html

@@ -10,7 +10,7 @@
             <th class='text-left nowrap' style="width: 10%">头像</th>
             <th class='text-left nowrap' style="width: 15%">姓名</th>
             <th class='text-left nowrap' style="width: 15%">会员等级</th>
-            <th class='text-left nowrap' style="width: 15%">圆币</th>
+            <th class='text-left nowrap' style="width: 15%">明信片</th>
             <th class='text-left nowrap' >余额</th>
             <th class='text-left nowrap' style="width: 15%">手机号</th>
             <th class='text-left nowrap' style="width: 20%">注册时间</th>

File diff suppressed because it is too large
+ 0 - 0
public/static/plugs/ckeditor/lang/zh-cn.js


Some files were not shown because too many files changed in this diff