edit

app/shop/lib/Cron.php

@@ -130,7 +130,7 @@ class Cron
                 $msg_param['id'] = $v['id'];
                 $msg_param['coupon_id'] = $v['coupon_id'];
                 $msg_param = Dever::json_encode($msg_param);
-                Dever::load('message/lib/data')->push(-1, $v['uid'], '优惠劵到期提醒', $msg, 2, 1, false, $msg_param);
+                Dever::load('message/lib/data')->push(-1, $v['uid'], '优惠劵到期提醒', $msg, 4, 1, false, $msg_param);
 
 
                 if (Dever::load('wechat_applet') && $v['uid'] && $v['uid'] > 0) {

app/shop/lib/Sell.php

@@ -1319,7 +1319,7 @@ class Sell
                 $msg_param['name'] = $shop['name'];
                 $msg_param = Dever::json_encode($msg_param);
                 $msg = '您有一笔订单已签收，祝您用餐愉快~';
-                Dever::project('message') && Dever::project('message') && Dever::load('message/lib/data')->push(-1, $info['uid'], '订单完成通知', $msg, 1, 1, false, $msg_param);
+                Dever::project('message') && Dever::project('message') && Dever::load('message/lib/data')->push(-1, $info['uid'], '订单完成通知', $msg, 2, 1, false, $msg_param);
             }
             if ($info['method'] == 2) {
                 Dever::load('shop/lib/sell')->updatePs($info, 3);
@@ -1989,7 +1989,7 @@ class Sell
                 $wechat_msg = '您的商品已开始配送';
             }
             
-            Dever::project('message') && Dever::load('message/lib/data')->push(-1, $info['uid'], $name, $msg, 1, 1, false, $msg_param);
+            Dever::project('message') && Dever::load('message/lib/data')->push(-1, $info['uid'], $name, $msg, 2, 1, false, $msg_param);
 
             if (Dever::project('wechat_applet')) {
                 $user = Dever::db('passport/wechat')->one(array('uid' => $info['uid'], 'system_id' => 1, 'system_source' => 5));

service/agent/database/member_agreement.php

@@ -23,6 +23,17 @@ if (Dever::load('manage/auth')->checkFunc('agent.member_agreement', 'edit1', '
      $list_button['oper1'] = array('更新', '"agent/lib/manage.upAgreement?id={id}"', "{status} <= 2");
 }
 
+$agreement = function()
+{
+    $array = array();
+    $data = Dever::load('setting/agreement-state');
+    if($data)
+    {
+        $array += $data;
+    }
+    return $array;
+};
+
 return array
 (
     # 表名
@@ -112,10 +123,12 @@ return array
         'agreement_id'      => array
         (
             'type'      => 'int-11',
-            'name'      => '合同模板id',
+            'name'      => '合同模板',
             'default'   => '',
-            'desc'      => '合同模板id',
+            'desc'      => '合同模板',
             'match'     => 'is_numeric',
+            'option'    => $agreement,
+            'search'    => 'select',
         ),
 
         'agreement_name'      => array

service/agent/lib/Tool.php

@@ -467,4 +467,19 @@ class Tool
             }
         }
     }
+
+    # 更新合同内容
+    public function agreement_up_api()
+    {
+        $where['agreement_id'] = Dever::input('agreement_id', 6);
+        $data = Dever::db('agent/member_agreement')->select($where);
+        $test = Dever::input('test');
+        if ($data) {
+            if ($test == 1) {
+                print_r($data);die;
+            }
+        }
+
+        //Dever::load('agent/agreement')->upContent();
+    }
 }