调整

application/admin/lang/zh-cn/exam/paper.php

@@ -11,17 +11,17 @@ return [
     'Quantity'        => '题目数量',
     'Total_score'     => '试卷总分',
     'Pass_score'      => '及格线',
-    'Limit_time'      => '考试限时',
+    'Limit_time'      => '答题限时',
     'Status'          => '状态',
     'Createtime'      => '创建时间',
     'Updatetime'      => '修改时间',
     'Worktype.name'   => '名称',
     'Random'          => '随机选题',
     'Fix'             => '固定选题',
-    'Day_limit_count' => '每日限制考试次数',
+    'Day_limit_count' => '每日限制答题次数',
     'Start_time'      => '使用开始时间',
     'End_time'        => '使用结束时间',
     'Is_only_room'    => '仅用于考场',
-    'Limit_count'     => '每人限制考试次数',
+    'Limit_count'     => '每人限制答题次数',
     'User_ids'        => '可参与人员',
 ];

application/admin/lang/zh-cn/unishop/order.php

@@ -37,7 +37,7 @@ return [
     'Delivere'          => '物流',
     'Comment'          => '评论',
     'Data had been update before saved, close windows and do it again' => '数据在保存之前有变动，请关闭窗口再试一次',
-    'Product'           => '商品',
+    'Product'           => '活动',
     'Delivery status'           => '发货状态',
     'Express number'           => '快递单号',
     'Confirm delivery'           => '确认发货',

application/admin/view/exam/paper/add.html

@@ -105,7 +105,7 @@
 
 
         <div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">每人限制考试次数:</label>
+            <label class="control-label col-xs-12 col-sm-2">每人限制答题次数:</label>
             <div class="col-xs-12 col-sm-8" style="line-height: 31px;">
                 <input id="c-limit_count" data-rule="required" class="form-control" name="row[limit_count]" type="number"
                        step="1" min="0" value="1" style="width: 200px" placeholder="考试限时，0不限制">

application/admin/view/exam/paper/edit.html

@@ -103,7 +103,7 @@
 
 
         <div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">每人限制考试次数:</label>
+            <label class="control-label col-xs-12 col-sm-2">每人限制答题次数:</label>
             <div class="col-xs-12 col-sm-8" style="line-height: 31px;">
                 <input id="c-limit_count" data-rule="required" class="form-control" name="row[limit_count]" type="number"
                        step="1" min="0" value="{$row.limit_count|default=1}" style="width: 200px" placeholder="考试限时，0不限制">

application/admin/view/kongjianyuyue/edit.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" disabled data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/admin/view/laorenguanhuai/edit.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" disabled data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/admin/view/topicdongtai/edit.html

@@ -7,7 +7,7 @@
             <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>-->
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
 
@@ -18,7 +18,7 @@
             </select>
 
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -40,7 +40,7 @@
             <ul class="row list-inline faupload-preview" id="p-images"></ul>
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Video_file')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
@@ -53,7 +53,7 @@
             </div>
             <ul class="row list-inline faupload-preview" id="p-video_file"></ul>
         </div>
-    </div>
+    </div>-->
 
     <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Goodnum')}:</label>

application/admin/view/unishop/order/product.html

@@ -2,10 +2,7 @@
 
     <ul class="list-group">
         <li class="list-group-item">
-            订单金额：￥{$order.order_price}
+            订单金额：￥{$order.total_price}元
-        </li>
-        <li class="list-group-item">
-            实付金额：￥{$order.total_price}元
         </li>
     </ul>
 
@@ -31,11 +28,10 @@
             </a>
         </div>
         <div class="media-body">
-            <div>活动ID:{$item.product_id}</div>
+
-            <h4 class="media-heading">{$item.title}</h4>
+            <h4 class="media-heading">活动标题{$item.title}</h4>
-            <div>规格：{$item.spec}</div>
+            <div>报名人数：{$item.number}</div>
-            <div>{$item.number} ✖ {$item.price}</div>
+            <div>单价：{$item.price} 元</div>
-            <div class="total-price">总共：{$item.price * $item.number} 元</div>
         </div>
 
     </div>

public/assets/js/backend/topicdongtai.js

@@ -59,7 +59,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             }
                             },
                             events: Table.api.events.image, formatter: Table.api.formatter.images},
-                        {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
+                        // {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
                         // {field: 'video_file', title: __('Video_file'), operate: false, formatter: Table.api.formatter.video},
                        {field: 'goodnum', title: __('Goodnum')},
                        // {field: 'answernum', title: __('Answernum')},