Merge pull request #10 from nkto/master

update

Author: a1liz

website/backend/apis/goods.py

@@ -0,0 +1,24 @@
+from django.views.decorators.csrf import csrf_exempt, ensure_csrf_cookie
+from django.http import HttpResponse, JsonResponse
+import json,hashlib,re, datetime, time
+from .. import models
+
+@ensure_csrf_cookie
+def new_item(request):
+    obj = models.NKTO_Goods.objects.order_by("time")[0:4]
+    items = []
+    for i in obj:
+        o = models.NKTO_GoodsDts.objects.filter(gid = i.gid, order = 1) #表示查找第一张图片
+        item = {}
+        item['src'] = o[0].pic
+        item['name'] = i.name
+        item['value'] = i.price
+        items.append(item)
+    return JsonResponse({'message': items})
+
+@ensure_csrf_cookie
+def generate(request):
+    info = json.loads(request.body.decode('utf8'))
+    form = info['formitem']
+    special = info['special']
+    return JsonResponse({'price': form['price']})

website/backend/apis/user.py

@@ -120,7 +120,7 @@ def user_validate(request):
 def user_modify(request):
     if hasattr(request, 'body'):
         info = json.loads(request.body.decode('utf8'))
-        obj = models.NKTO_User.filter(uid = info['id'])
+        obj = models.NKTO_User.objects.filter(uid = info['id'])
         if len(obj) > 0:
             if hasattr(info, 'icon'):
                 obj.update(icon = info['icon'])
@@ -146,4 +146,20 @@ def user_storeimage(request):
     with open('./static/upload/' + name, 'wb') as destination:
         for chunk in file.chunks():
             destination.write(chunk)
-    return JsonResponse({'url': '/static/upload/' + name})
+    return JsonResponse({'url': '/static/upload/' + name})
+
+@ensure_csrf_cookie
+def user_checkstate(request):
+    ''' 檢查用戶是否已經登錄，返回true或者false ''' 
+    # 檢查session中是否有uid
+    try:
+        uid = int(request.session['uid'])
+        print(uid)
+        # 檢查用戶狀態
+        obj = models.NKTO_User.objects.filter(uid=uid)
+        print(obj[0].icon)
+        if len(obj) == 0:
+            return JsonResponse({'flag': -2, 'msg': 'no such account'})
+        return JsonResponse({'flag': 1, 'msg': obj[0].icon})
+    except BaseException as e:
+        return JsonResponse({'flag': -1, 'msg': 'not logged'})

website/backend/migrations/0004_nkto_goods_time.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.3 on 2017-11-26 06:21
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('backend', '0003_auto_20171105_2211'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='nkto_goods',
+            name='time',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+    ]

website/backend/models.py

@@ -26,6 +26,7 @@ class NKTO_Goods(models.Model):
     eval_price = models.FloatField()
     category = models.IntegerField(default = 0)
     state = models.IntegerField(default = 0)
+    time = models.DateTimeField(auto_now_add = True)
     def __str__(self):
         return self.name
 

website/backend/socket.py

@@ -0,0 +1,45 @@
+from django.shortcuts import render
+import socketio
+from django.views.decorators.csrf import ensure_csrf_cookie,csrf_exempt
+import hashlib, time, datetime
+import urllib.parse
+
+async_mode = None
+sio = socketio.Server(async_mode = async_mode)
+slist = [1]*2
+thread = None
+"""
+talker_list以cid或uid为key存储sid customer_list以cid为key存储uid列表 conversation以uid为key存储聊天内容
+"""
+
+@csrf_exempt
+def model(request):
+    return render(request, 'nktoindex.html')
+
+def time2str():
+    date = datetime.datetime.now()
+    return date.strftime('%Y-%m-%d %H:%M:%S')
+
+def str2time(st):
+    t = time.strptime(st, '%Y-%m-%d %H:%M:%S')
+    return time.mktime(t)
+
+@sio.on('sendmessage', namespace = '/test')
+def send_message(sid, message):
+    uid = 1 - int(message['uid'])
+    sio.emit('getresponse', {'data': message['data'], 'time': message['time'], 'src': message['src']}, room = slist[uid], namespace = '/test')
+
+
+@sio.on('connected', namespace = '/test')
+def connected(sid, message):
+    uid = int(message['uid'])
+    print(uid)
+    slist[uid] = sid
+
+@sio.on('disconnect request', namespace = '/test')
+def disconnect_request(sid):
+    sio.disconnect(sid, namespace = '/test')
+
+@sio.on('disconnect', namespace = '/test')
+def test_disconnect(sid):
+    print('Client disconnected')

website/backend/urls.py

@@ -1,6 +1,7 @@
 from django.conf.urls import url
 from django.contrib import admin
-from .apis import user
+from .apis import user, goods
+from . import socket
 
 urlpatterns = [
 	#apis
@@ -9,4 +10,8 @@
     url(r'^api/user/logout/$', user.user_logout),
     url(r'^api/user/validate/$', user.user_validate),
     url(r'^api/user/storeimage/$', user.user_storeimage),
+    url(r'^api/goods/newitems/$', goods.new_item),
+    url(r'^api/user/checkstate/$', user.user_checkstate),
+    url(r'^api/goods/generate/$', goods.generate),
+    url(r'^socket.io/', socket.model),
 ]

website/frontend/src/components/CustomerTalk.vue

@@ -0,0 +1,92 @@
+<template>
+  <div class="customertalk">
+    <div id="app">
+      <div class="sidebar">
+        <card :name="name" :icon="icon"></card>
+      </div>
+      <div class="main">
+        <message :content="content"></message>
+        <text-input @onKeyup="send"></text-input>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import Card from './Card'
+  import TextInput from './TextInput'
+  import Message from './Message'
+  export default {
+    components: {Card, TextInput, Message},
+    props: {
+      content: {
+        type: Array
+      },
+      icon: {
+        type: String
+      },
+      name: {
+        type: String
+      },
+      uid: {
+        type: String
+      }
+    },
+    methods: {
+      send (message) {
+        this.$emit('send', message)
+      },
+      swit (item) {
+        this.$emit('swit', item)
+      },
+      close () {
+        this.$emit('close', true)
+      },
+      transfer () {
+        this.$emit('transfer', true)
+      }
+    }
+  }
+</script>
+<style scoped>
+.customertalk {
+  display: flex;
+}
+#app {
+  width: 100%;
+  height: 75vh;
+  overflow: hidden;
+  border-radius: 3px;
+}
+#app .sidebar, #app .main {
+  height: 100%;
+}
+#app .sidebar {
+  float: left;
+  width: 20%;
+  color: #f4f4f4;
+  background-color: #2d8cf0;
+}
+#app .main {
+  position: relative;
+  overflow: hidden;
+  background-color: #eee;
+}
+#app .text {
+  position: absolute;
+  width: 100%;
+  bottom: 0;
+  left: 0;
+}
+#app .message {
+  height: calc(100% - 160px);
+}
+.userinfo {
+  width: 30%;
+}
+.buttongroup {
+  margin-top: 20%;
+}
+.button {
+  margin-left: 10%;
+}
+</style>

website/frontend/src/components/TextInput.vue

@@ -0,0 +1,123 @@
+<template>
+  <div class="container">
+    <div class="text">
+      <textarea placeholder="按 Ctrl + Enter 发送" v-model="content" @keyup="onKeyup"></textarea>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    data () {
+      return {
+        content: '',
+      }
+    },
+    methods: {
+      onKeyup (e) {
+        if (e.ctrlKey && e.keyCode === 13 && this.content.length) {
+          this.$emit('onKeyup', this.html2Escape(this.content))
+          this.content = ''
+        }
+      },
+      html2Escape (sHtml) {
+        // 将html字符转义
+        return sHtml.replace(/[<>&"]/g, function (c) {
+          return {
+            '<': '&lt;', '>': '&gt;', '&': '&amp;', '"': '&quot;'
+          }[c]
+        })
+      },
+      dataURLtoFile (dataurl, filename) {
+        /* global File, atob: true */
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], filename, {type: mime})
+      },
+      getCookie (cName) {
+        if (document.cookie.length > 0) {
+          let cStart = document.cookie.indexOf(cName + '=')
+          if (cStart !== -1) {
+            cStart = cStart + cName.length + 1
+            let cEnd = document.cookie.indexOf(';', cStart)
+            if (cEnd === -1) {
+              cEnd = document.cookie.length
+            }
+            return unescape(document.cookie.substring(cStart, cEnd))
+          }
+        }
+        return ''
+      },
+      handleUpload (file) {
+        let image = new FormData()
+        image.append('image', file)
+        fetch('/storeimage/', {
+          method: 'post',
+          credentials: 'same-origin',
+          headers: {
+            'X-CSRFToken': this.getCookie('csrftoken'),
+            'Accept': 'application/json'
+          },
+          body: image
+        }).then((res) => res.json()).then((res) => {
+          console.log(res)
+          this.$emit('onKeyup', res['url'])
+        })
+        return false
+      }
+    },
+    mounted: function () {
+      // 由于在created和data中dom尚未渲染，所以无法在created和data中进行初始化
+      /* global wantEmoji: true */
+    }
+  }
+</script>
+<style type="text/css" scoped>
+.container {
+  position: relative;
+}
+.text {
+  height: 160px;
+  border-top: solid 1px #ddd;
+  padding-top: 3vh;
+}
+.text textarea {
+  padding: 10px;
+  height: 100%;
+  width: 100%;
+  border-bottom: 1px solid #2e3238;
+  border-right: 1px solid #243238;
+  outline: none;
+  font-family: "Micrsofot Yahei";
+  resize: none;
+}
+.wrapper {
+  position: absolute;
+  top: -150%;
+  height: 200px;
+  left: 0;
+  background-color: whitesmoke;
+}
+.icon {
+  position: absolute;
+  width: 100%;
+  top: -5%;
+  left: 0;
+  border-right: 1px solid black;
+  border-top: 1px solid lightgray;
+  background-color: white;
+  z-index: 10;
+}
+ .no-margin {
+   margin-left: -0.3vw;
+ }
+.upload {
+  display: inline-block;
+  margin-left: -0.3vw;
+}
+</style>