Z1hgq 7 年 前
コミット
763e12a63c

+ 4 - 1
Furniture/app.js

xqd xqd
@@ -1,5 +1,7 @@
+var kyjplugin = requirePlugin("kyjplugin"); 
 App({
-  onLaunch: function () {
+  onLaunch: function (options) {
+    kyjplugin._init(options);
     var that = this
     console.log('App Launch')
     // 展示本地存储能力
@@ -35,6 +37,7 @@ App({
     })
   },
   onShow: function () {
+    kyjplugin._start();
     console.log('App Show')
   },
   onHide: function () {

+ 5 - 0
Furniture/app.json

xqd
@@ -26,6 +26,11 @@
     "pages/infor/detail_head",
     "pages/fc/fc"
   ],
+  "plugins": {
+    "kyjplugin": {
+    "version": "1.0.9", 
+    "provider": "wxcd59f21543131f65" } 
+    },
   "window": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "天天家居惠",

+ 1 - 1
Furniture/page/homePage/detail/detail.wxml

xqd
@@ -5,7 +5,7 @@
     <view class="weui-article">
       <view class="weui-article__h1" style='font-size:42rpx;word-break:break-all;'>{{news.title}}</view>
       <view class='container1' style='margin-left:0rpx;margin-top:0rpx'>
-        <image src='' style='width:80rpx;height:80rpx'></image>
+        <image src='{{news.avatar}}' style='width:80rpx;height:80rpx'></image>
       </view>
       <view class="weui-article__section">
         <view class="weui-article__title" style='margin-left:100rpx'>天天家居惠</view>

+ 5 - 1
Furniture/page/homePage/homePage.json

xqd
@@ -1 +1,5 @@
-{}
+{
+  "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk"
+  }
+}

+ 4 - 5
Furniture/page/homePage/homePage.wxml

xqd xqd xqd
@@ -15,9 +15,9 @@
       <view class="container1">
         现代简约沙发
       </view>
-      <view class="container1" style='width:2rpx;height:40rpx;background-color:#1E90FF;margin-left:540rpx;'>
+      <view class="container1" style='width:2rpx;height:40rpx;background-color:#1E90FF;margin-left:536rpx;'>
       </view>
-      <view class="container1" style="margin-left:560rpx;color:#1E90FF;margin-top:20rpx">
+      <view class="container1" style="margin-left:544rpx;color:#1E90FF;margin-top:20rpx">
         {{ weather }}
       </view>
       <view class='container1' style='margin-left:618rpx'>
@@ -30,8 +30,6 @@
         {{ temp }}°
       </view>
     </view>
-
-
     <!-- <view class='weui-flex' style='border-bottom: 2rpx #D3D3D3 solid'>
       <view class='weui-flex__item'>
        <navigator target="miniProgram" open-type="navigate" app-id="wx605448628d21d682" path="/pages/index/index" extra-data="" version="release">
@@ -140,4 +138,5 @@
 </view>
 <block>
    <template data="{{nav:nav}}" is="foot" />
-</block>
+</block>
+<minitalk />

+ 5 - 5
Furniture/pages/manager/manage.js

xqd
@@ -845,11 +845,11 @@ Page({
     wx.scanCode({
       scanType: ['qrCode'],
       success:(res)=>{
-        console.log(res.result)
-        var str = '' + res.result
-        // wx.navigateTo({
-        //    url: str,
-        // })
+        console.log(res.path)
+        var str = '/' + res.path
+        wx.navigateTo({
+           url: str,
+        })
       }
     })
   }

+ 3 - 0
Furniture/pages/search/search.wxml

xqd xqd
@@ -69,6 +69,8 @@
   </zan-cell-group>
 <zan-dialog id="zan-dialog-test"></zan-dialog>
 <zan-toast id="zan-toast-test"></zan-toast>
+
+<view wx:if='{{order_status!="待审核"}}'>
 <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
       配件清单
     </view>
@@ -90,6 +92,7 @@
       </zan-cell>
       <zan-cell title="备注" value="" style="color:#777;" wx:if='{{msg!=null}}'><text style='color:#2a2121'>{{msg}}</text></zan-cell>
     </zan-cell-group>
+</view>
 <zan-toast id="zan-toast-test"></zan-toast>