Merge remote-tracking branch 'origin/master'

jiangping

2024-07-26 816d84a76c1a2f16f88dba70664397961f55caa1

 wechat_staff/pages/sets/protocol.js

@@ -15,9 +15,9 @@
  onLoad(options) {
    console.log(options.type)
    if(options.type == 1){
      wx.setNavigationBarTitle({title:'隐私协议'}) 
      wx.setNavigationBarTitle({title:'用户隐私协议'}) 
    }else{
      wx.setNavigationBarTitle({title:'用户协议'})  
      wx.setNavigationBarTitle({title:'用户服务协议'})  
    }
    this.loadDict(options.type); 
  },