From 3a7da7f3c75f46ca85d92a10abf8133f5ce47d91 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Thu, 13 Feb 2020 16:11:12 +0800
Subject: [PATCH] =?UTF-8?q?yshop1.9.7,bug=E4=BF=AE=E5=A4=8D=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC,=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8B=BC=E5=9B=A2=E4=BA=A7=E5=93=81null=E3=80=81?=
 =?UTF-8?q?=E9=82=AE=E8=B4=B9=E9=97=AE=E9=A2=98=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/YshopInfo.vue   |  2 +-
 src/views/wechat/config/postage.vue | 66 +++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/views/wechat/config/postage.vue

diff --git a/src/views/dashboard/YshopInfo.vue b/src/views/dashboard/YshopInfo.vue
index f8cfca7..6e88e18 100644
--- a/src/views/dashboard/YshopInfo.vue
+++ b/src/views/dashboard/YshopInfo.vue
@@ -36,7 +36,7 @@
             <span style="font-weight: bolder">小程序演示：</span>关注上面公众号之后，选择yshop小程序体验即可
           </div>
           <div class="text item">
-            <span style="font-weight: bolder">H5演示：</span><a target="_blank" href="https://h5.dayouqiantu.cn">https://h5.dayouqiantu.cn</a> <br />
+            <span style="font-weight: bolder">H5演示：</span><a target="_blank" href="https://h5.yixiang.co">https://h5.yixiang.co</a> <br />
             <span style="font-weight: bolder">H5测试号</span>：hupeng/123456,也可以自行注册
           </div>
         </el-card>
diff --git a/src/views/wechat/config/postage.vue b/src/views/wechat/config/postage.vue
new file mode 100644
index 0000000..6d4cd4c
--- /dev/null
+++ b/src/views/wechat/config/postage.vue
@@ -0,0 +1,66 @@
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
+      <el-form-item label="邮费基础价">
+        <el-input v-model="form.store_postage" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="满额包邮">
+        <el-input v-model="form.store_free_postage" style="width: 370px;" />
+        <p style="color: red">0表示包邮,大于0表示满多少包邮</p>
+      </el-form-item>
+      <el-form-item label="">
+        <el-button type="primary" @click="doSubmit">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, add, get } from '@/api/yxSystemConfig'
+import eForm from './form'
+import picUpload from '@/components/pic-upload'
+import { Message } from 'element-ui'
+export default {
+  components: { eForm, picUpload },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      form: {
+        integral_ratio: ''
+      },
+      rules: {
+      }
+    }
+  },
+  created() {
+    get().then(rese => {
+      const newObj = {}
+      rese.content.map(function(key, value) {
+        const keyName = key.menuName
+        newObj[keyName] = key.value
+      })
+
+      this.form = newObj
+    })
+  },
+  methods: {
+    checkPermission,
+    doSubmit() {
+      add(this.form).then(res => {
+        Message({ message: '设置成功', type: 'success' })
+      }).catch(err => {
+        // this.loading = false
+        console.log(err.response.data.message)
+      })
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>