1

app/admin/controller/order/StoreOrder.php

@@ -237,7 +237,7 @@ class StoreOrder extends AuthController
         $f[] = Form::number('total_postage', '原始邮费', $product->getData('total_postage'))->min(0);
         $f[] = Form::number('pay_price', '实际支付金额', $product->getData('pay_price'))->min(0);
         $f[] = Form::number('pay_postage', '实际支付邮费', $product->getData('pay_postage'));
-        $f[] = Form::number('gain_integral', '赠送积分', $product->getData('gain_integral'));
+        $f[] = Form::number('gain_integral', '赠送健康豆', $product->getData('gain_integral'));
 //        $f[] = Form::radio('status','状态',$product->getData('status'))->options([['label'=>'开启','value'=>1],['label'=>'关闭','value'=>0]]);
         $form = Form::make_post_form('修改订单', $f, Url::buildUrl('update', array('id' => $id)));
         $this->assign(compact('form'));

app/admin/controller/order/combinationOrder.php

@@ -147,7 +147,7 @@ class CombinationOrder extends AuthController
         Form::number('total_postage', '原始邮费', $product->getData('total_postage'))->min(0);
         Form::number('pay_price', '实际支付金额', $product->getData('pay_price'))->min(0);
         Form::number('pay_postage', '实际支付邮费', $product->getData('pay_postage'))->min(0);
-        Form::number('gain_integral', '赠送积分', $product->getData('gain_integral'))->min(0);
+        Form::number('gain_integral', '赠送健康豆', $product->getData('gain_integral'))->min(0);
         return Form::builder();
     }
 

app/admin/controller/ump/StoreBargain.php

@@ -114,7 +114,7 @@ class StoreBargain extends AuthController
         $f[] = Form::number('bargain_max_price', '单次砍价的最大金额', 10)->min(0)->col(12);
         $f[] = Form::number('bargain_min_price', '单次砍价的最小金额', 0.01)->min(0)->col(12);
         $f[] = Form::number('sort', '排序')->col(12);
-        $f[] = Form::number('give_integral', '赠送积分')->min(0)->col(12);
+        $f[] = Form::number('give_integral', '赠送健康豆')->min(0)->col(12);
         $f[] = Form::radio('is_hot', '热门推荐', 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]])->col(12);
         $form = Form::make_post_form('开启砍价活动', $f, Url::buildUrl('update'));
         $this->assign(compact('form'));
@@ -153,7 +153,7 @@ class StoreBargain extends AuthController
         $f[] = Form::hidden('stock', $product->getData('stock'));
         $f[] = Form::hidden('sales', $product->getData('sales'));
         $f[] = Form::number('sort', '排序', $product->getData('sort'))->col(12);
-        $f[] = Form::number('give_integral', '赠送积分', $product->getData('give_integral'))->min(0)->col(12);
+        $f[] = Form::number('give_integral', '赠送健康豆', $product->getData('give_integral'))->min(0)->col(12);
         $f[] = Form::radio('is_hot', '热门推荐', $product->getData('is_hot'))->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]])->col(12);
         $f[] = Form::hidden('status', $product->getData('status'));
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('update', array('id' => $id)));
@@ -340,7 +340,7 @@ class StoreBargain extends AuthController
         $f[] = Form::number('sales', '销量', $product->getData('sales'))->min(0)->col(12);
         $f[] = Form::number('sort', '排序', $product->getData('sort'))->col(12);
         $f[] = Form::number('num', '单次购买的砍价商品数量', 1)->col(12);
-        $f[] = Form::number('give_integral', '赠送积分', $product->getData('give_integral'))->min(0)->col(12);
+        $f[] = Form::number('give_integral', '赠送健康豆', $product->getData('give_integral'))->min(0)->col(12);
         $f[] = Form::number('weight', '重量', 0)->min(0)->col(12);
         $f[] = Form::number('volume', '体积', 0)->min(0)->col(12);
         $f[] = Form::radio('is_hot', '热门推荐', $product->getData('is_hot'))->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]])->col(12);

app/admin/controller/ump/StoreSeckill.php

@@ -123,7 +123,7 @@ class StoreSeckill extends AuthController
         $f[] = Form::frameImages('images', '商品轮播图(640*640px)', Url::buildUrl('admin/widget.images/index', array('fodder' => 'images')))->maxLength(5)->icon('images')->width('100%')->height('500px');
         $f[] = Form::number('sort', '排序')->col(12);
         $f[] = Form::number('num', '单次购买商品个数')->precision(0)->col(12);
-        $f[] = Form::number('give_integral', '赠送积分')->min(0)->precision(0)->col(12);
+        $f[] = Form::number('give_integral', '赠送健康豆')->min(0)->precision(0)->col(12);
         $f[] = Form::radio('is_hot', '热门推荐', 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]])->col(12);
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('save'));
         $this->assign(compact('form'));
@@ -234,7 +234,7 @@ class StoreSeckill extends AuthController
         $f[] = Form::number('sales', '销量', $product->getData('sales'))->min(0)->precision(0)->col(12);
         $f[] = Form::number('sort', '排序', $product->getData('sort'))->col(12);
         $f[] = Form::number('num', '单次购买商品个数', 1)->precision(0)->col(12);
-        $f[] = Form::number('give_integral', '赠送积分', $product->getData('give_integral'))->min(0)->precision(0)->col(12);
+        $f[] = Form::number('give_integral', '赠送健康豆', $product->getData('give_integral'))->min(0)->precision(0)->col(12);
         $f[] = Form::number('weight', '重量', 0)->min(0)->col(12);
         $f[] = Form::number('volume', '体积', 0)->min(0)->col(12);
         $f[] = Form::radio('is_hot', '热门推荐', 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]])->col(12);
@@ -286,7 +286,7 @@ class StoreSeckill extends AuthController
         $f[] = Form::hidden('ot_price', $product->getData('ot_price'));
         $f[] = Form::hidden('sales', $product->getData('sales'));
         $f[] = Form::number('num', '单次购买商品个数', $product->getData('num'))->precision(0)->col(12);
-        $f[] = Form::number('give_integral', '赠送积分', $product->getData('give_integral'))->min(0)->precision(0)->col(12);
+        $f[] = Form::number('give_integral', '赠送健康豆', $product->getData('give_integral'))->min(0)->precision(0)->col(12);
         $f[] = Form::radio('is_hot', '热门推荐', $product->getData('is_hot'))->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]])->col(12);
         $f[] = Form::hidden('status', $product->getData('status'));
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('save', compact('id')));

app/admin/view/store/copy_taobao/index.php

@@ -94,7 +94,7 @@
                                 </div>
                             </div>
                             <div class="layui-inline">
-                                <label class="layui-form-label">赠送积分</label>
+                                <label class="layui-form-label">赠送健康豆</label>
                                 <div class="layui-input-inline">
                                     <input type="number" name="number"  autocomplete="off" class="layui-input" v-model="productInfo.give_integral">
                                 </div>

app/admin/view/store/store_product/create.php

@@ -671,10 +671,10 @@
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">赠送积分</label>
+                                                <label class="layui-form-label">赠送健康豆</label>
                                                 <div class="layui-input-block">
                                                     <input type="number" name="give_integral" lay-verify="title"
-                                                           autocomplete="off" placeholder="请输入赠送积分" class="layui-input"
+                                                           autocomplete="off" placeholder="请输入赠送健康豆" class="layui-input"
                                                            v-model="formData.give_integral">
                                                 </div>
                                             </div>

h5/src/views/order/MyOrder.vue

@@ -335,7 +335,7 @@ export default {
               promoterNum: `恭喜您获得${
                 res.data.gain_integral
               }积分，购买商品时可抵现哦～`,
-              title: "赠送积分"
+              title: "赠送健康豆"
             };
             return;
           } else if (

h5/src/views/order/OrderDetails.vue

@@ -728,7 +728,7 @@ export default {
               promoterNum: `恭喜您获得${
                 res.data.gain_integral
               }积分，购买商品时可抵现哦～`,
-              title: "赠送积分"
+              title: "赠送健康豆"
             };
             return;
           } else if (

view/pages/order_details/index.js

@@ -259,7 +259,7 @@ Page({
               that.setData({
                 generalActive: true,
                 [generalContent]: `恭喜您获得${res.data.gain_integral}积分，购买商品时可抵现哦～`,
-                [title]: '赠送积分'
+                [title]: '赠送健康豆'
               });
               return;
             }else if(res.data.gain_coupon!="0.00"){